ooo-build r11982 - trunk/patches/dev300
- From: jholesovsky svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11982 - trunk/patches/dev300
- Date: Fri, 21 Mar 2008 18:23:29 +0000 (GMT)
Author: jholesovsky
Date: Fri Mar 21 18:23:28 2008
New Revision: 11982
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11982&view=rev
Log:
* patches/dev300/vba-workbook-worksheet-events.diff,
patches/dev300/sc-hacky-handle-boolean.diff,
patches/dev300/gstreamer-slideshow.diff,
patches/dev300/unittesting-basegfx.diff,
patches/dev300/apply: Make dev300 build [hopefully ;-)].
Added:
trunk/patches/dev300/sc-hacky-handle-boolean.diff (contents, props changed)
- copied, changed from r11978, /trunk/patches/vba/sc-hacky-handle-boolean.diff
Modified:
trunk/patches/dev300/apply
trunk/patches/dev300/gstreamer-slideshow.diff
trunk/patches/dev300/unittesting-basegfx.diff
trunk/patches/dev300/vba-workbook-worksheet-events.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Fri Mar 21 18:23:28 2008
@@ -160,8 +160,8 @@
testtool-more-defaults.diff, martink
#Fix plus/minus in to each heading in Navigator
-plus-minus-sw-navigator.diff, i#64886, n#129410, jianhua
-plus-minus-sw-navigator2.diff, i#64886, n#129410, jianhua
+#FIXME dev300: plus-minus-sw-navigator.diff, i#64886, n#129410, jianhua
+#FIXME dev300: plus-minus-sw-navigator2.diff, i#64886, n#129410, jianhua
#set default varchar lenght to 100.
dbaccess-default-varchar-lenght.diff, i#62664, jianhua
#make oovbaapi as a link
Modified: trunk/patches/dev300/gstreamer-slideshow.diff
==============================================================================
--- trunk/patches/dev300/gstreamer-slideshow.diff (original)
+++ trunk/patches/dev300/gstreamer-slideshow.diff Fri Mar 21 18:23:28 2008
@@ -1,6 +1,14 @@
diff -rup slideshow-orig/source/engine/viewmediashape.cxx slideshow/source/engine/viewmediashape.cxx
--- slideshow-orig/source/engine/shapes/viewmediashape.cxx 2006-08-17 16:15:39.000000000 +0200
+++ slideshow/source/engine/shapes/viewmediashape.cxx 2006-08-17 17:26:09.000000000 +0200
+@@ -48,6 +48,7 @@
+ #include <vcl/window.hxx>
+ #include <vcl/javachild.hxx>
+ #include <vcl/salbtype.hxx>
++#include <vcl/sysdata.hxx>
+
+ #include <basegfx/tools/canvastools.hxx>
+ #include <basegfx/numeric/ftools.hxx>
@@ -182,7 +193,11 @@ namespace presentation
mxPlayerWindow.clear();
}
Copied: trunk/patches/dev300/sc-hacky-handle-boolean.diff (from r11978, /trunk/patches/vba/sc-hacky-handle-boolean.diff)
==============================================================================
--- /trunk/patches/vba/sc-hacky-handle-boolean.diff (original)
+++ trunk/patches/dev300/sc-hacky-handle-boolean.diff Fri Mar 21 18:23:28 2008
@@ -20,7 +20,7 @@
diff -u -p -r1.18 column3.cxx
--- sc/source/core/data/column3.cxx 28 Sep 2005 11:29:59 -0000 1.18
+++ sc/source/core/data/column3.cxx 9 Nov 2005 17:53:11 -0000
-@@ -828,7 +849,17 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
+@@ -828,7 +849,18 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
case CELLTYPE_FORMULA:
{
ScFormulaCell* pForm = (ScFormulaCell*)pSource;
@@ -28,11 +28,12 @@
+ bool bForceFormula = false;
+ if ( nFlags & IDF_SPECIAL_BOOLEAN )
+ {
-+ String aVal;
++ rtl::OUStringBuffer aBuf;
+ // #TODO #FIXME do we have a localisation issue here?
-+ pForm->GetEnglishFormula( aVal );
-+ if ( aVal.EqualsAscii("=TRUE()" )
-+ || aVal.EqualsAscii("=FALSE()") )
++ pForm->GetFormula( aBuf );
++ rtl::OUString aVal( aBuf.makeStringAndClear() );
++ if ( aVal.equalsAscii( "=TRUE()" )
++ || aVal.equalsAscii( "=FALSE()" ) )
+ bForceFormula = true;
+ }
+ if ( bForceFormula || (nFlags & IDF_FORMULA) )
Modified: trunk/patches/dev300/unittesting-basegfx.diff
==============================================================================
--- trunk/patches/dev300/unittesting-basegfx.diff (original)
+++ trunk/patches/dev300/unittesting-basegfx.diff Fri Mar 21 18:23:28 2008
@@ -2,3 +2,10 @@
+++ basegfx/prj/tests.lst 2007-09-07 10:56:26.000000000 +0200
@@ -0,0 +1 @@
+fx basegfx\test nmake - all fx_test fx_util NULL
+--- basegfx/prj/build.lst 2008-02-12 17:24:53.000000000 +0100
++++ basegfx/prj/build.lst 2008-03-20 11:58:36.000000000 +0100
+@@ -12,4 +12,3 @@ fx basegfx\source\tuple nmake - all
+ fx basegfx\source\tools nmake - all fx_tools fx_inc NULL
+ fx basegfx\source\vector nmake - all fx_vector fx_inc NULL
+ fx basegfx\util nmake - all fx_util fx_curve fx_matrix fx_numeric fx_point fx_polygon fx_range fx_tuple fx_tools fx_vector NULL
+-fx basegfx\test nmake - all fx_tests fx_util NULL
Modified: trunk/patches/dev300/vba-workbook-worksheet-events.diff
==============================================================================
--- trunk/patches/dev300/vba-workbook-worksheet-events.diff (original)
+++ trunk/patches/dev300/vba-workbook-worksheet-events.diff Fri Mar 21 18:23:28 2008
@@ -336,9 +336,28 @@
+ bool bRaiseError = true
);
- BOOL DoMacroQuery( const String& rScriptType );
+ static ErrCode CallXScript(
+@@ -455,7 +455,8 @@ public:
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
+ ::com::sun::star::uno::Any& aRet,
+ ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
+- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam
++ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
++ bool bRaiseError = true
+ );
+
+ /** adjusts the internal macro mode, according to the current security settings
--- /data4/sles/ooo-mLnew/ooo-build/build/ooc680-m2/sfx2/source/doc/objmisc.cxx 2006-05-22 08:25:06.000000000 +0100
+++ sfx2/source/doc/objmisc.cxx 2006-06-02 13:29:02.000000000 +0100
+@@ -1515,7 +1515,7 @@
+ }
+
+ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const ::rtl::OUString& _rScriptURL,
+- const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
++ const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError )
+ {
+ OSL_TRACE( "in CallXScript" );
+ ErrCode nErr = ERRCODE_NONE;
@@ -1556,7 +1556,7 @@ ErrCode SfxObjectShell::CallXScript( con
nErr = ERRCODE_BASIC_INTERNAL_ERROR;
}
@@ -348,15 +367,18 @@
{
::std::auto_ptr< VclAbstractDialog > pScriptErrDlg;
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-@@ -1580,7 +1580,7 @@ ErrCode SfxObjectShell::CallXScript( con
+@@ -1580,9 +1580,9 @@ ErrCode SfxObjectShell::CallXScript( con
::com::sun::star::uno::Any& aRet,
::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
- aOutParam)
+ aOutParam, bool bRaiseError )
{
- return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam );
+- return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam );
++ return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError );
}
+
+ //-------------------------------------------------------------------------
--- backup/sc/source/ui/unoobj/viewuno.cxx 2007-11-26 14:43:13.000000000 +0000
+++ sc/source/ui/unoobj/viewuno.cxx 2008-01-23 17:29:08.000000000 +0000
@@ -85,9 +85,79 @@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]