[ooo-build-commit] 3 commits - patches/dev300 patches/vba scratch/sc-vba
Noel Power
noelp at kemper.freedesktop.org
Mon Sep 28 09:46:25 PDT 2009
patches/dev300/apply | 6
patches/vba/cws-vbasupportdev300-wae.diff | 481 ++++++++++
patches/vba/vba-control-api-vis-fix.diff | 26
patches/vba/vba-fix-errobj-errnum.diff | 63 +
patches/vba/vba-fix-isempty.diff | 34
patches/vba/vba-fix-wsfunction-booleanparam.diff | 22
scratch/sc-vba/testvba/TestDocuments/MiscOnErrorTests.xls |binary
scratch/sc-vba/testvba/TestDocuments/MiscRegressionTests.xls |binary
scratch/sc-vba/testvba/TestDocuments/logs/unix/MiscOnErrorTests.log | 16
scratch/sc-vba/testvba/TestDocuments/logs/unix/MiscRegressionTests.log | 16
10 files changed, 663 insertions(+), 1 deletion(-)
New commits:
commit 9627f22a4f2aad8864b41562e841ee352673aa65
Author: Noel Power <noel.power at novell.com>
Date: Mon Sep 28 17:45:26 2009 +0100
fix ( and testdoc ) for bnc#541755
* patches/dev300/apply:
* patches/vba/vba-fix-errobj-errnum.diff: bnc#541755
* scratch/sc-vba/testvba/TestDocuments/MiscOnErrorTests.xls:
* scratch/sc-vba/testvba/TestDocuments/logs/unix/MiscOnErrorTests.log:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4a9ee09..56869fe 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1633,7 +1633,7 @@ cws-vbasupportdev300-wae.diff
vba-control-api-vis-fix.diff, bnc#542132
vba-fix-isempty.diff, bnc#541749
vba-fix-wsfunction-booleanparam.diff, bnc#541735
-
+vba-fix-errobj-errnum.diff, bcn#541755
[VBAUntested]
SectionOwner => noelpwer
# doesn't work
diff --git a/patches/vba/vba-fix-errobj-errnum.diff b/patches/vba/vba-fix-errobj-errnum.diff
new file mode 100644
index 0000000..37caabd
--- /dev/null
+++ b/patches/vba/vba-fix-errobj-errnum.diff
@@ -0,0 +1,63 @@
+diff --git basic/source/runtime/runtime.cxx basic/source/runtime/runtime.cxx
+index 69c75b3..93a8afd 100644
+--- basic/source/runtime/runtime.cxx
++++ basic/source/runtime/runtime.cxx
+@@ -294,7 +294,6 @@ SbiInstance::SbiInstance( StarBASIC* p )
+ nErl = 0;
+ bReschedule = TRUE;
+ bCompatibility = FALSE;
+- SbxErrObject::getUnoErrObject()->Clear();
+ }
+
+ SbiInstance::~SbiInstance()
+diff --git basic/source/runtime/step0.cxx basic/source/runtime/step0.cxx
+index fa66194..c43931d 100644
+--- basic/source/runtime/step0.cxx
++++ basic/source/runtime/step0.cxx
+@@ -1132,6 +1132,7 @@ void SbiRuntime::StepNOERROR()
+ pInst->nErr = 0L;
+ pInst->nErl = 0;
+ nError = 0L;
++ SbxErrObject::getUnoErrObject()->Clear();
+ bError = FALSE;
+ }
+
+@@ -1140,6 +1141,9 @@ void SbiRuntime::StepNOERROR()
+ void SbiRuntime::StepLEAVE()
+ {
+ bRun = FALSE;
++ // If VBA and we are leaving an ErrorHandler then clear the error ( it's been processed )
++ if ( bInError && pError )
++ SbxErrObject::getUnoErrObject()->Clear();
+ }
+
+ void SbiRuntime::StepCHANNEL() // TOS = Kanalnummer
+diff --git basic/source/runtime/step1.cxx basic/source/runtime/step1.cxx
+index 57d7f02..d6dc7d0 100644
+--- basic/source/runtime/step1.cxx
++++ basic/source/runtime/step1.cxx
+@@ -38,6 +38,7 @@
+ #include "iosys.hxx"
+ #include "image.hxx"
+ #include "sbunoobj.hxx"
++#include "errobject.hxx"
+
+ bool checkUnoObjectType( SbUnoObject* refVal,
+ const String& aClass );
+@@ -374,6 +375,7 @@ void SbiRuntime::StepERRHDL( UINT32 nOp1 )
+ pInst->nErr = 0;
+ pInst->nErl = 0;
+ nError = 0;
++ SbxErrObject::getUnoErrObject()->Clear();
+ }
+
+ // Resume nach Fehlern (+0=statement, 1=next or Label)
+@@ -394,6 +396,8 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
+ }
+ else
+ pCode = pErrStmnt;
++ if ( pError ) // current in error handler ( and got a Resume Next statment )
++ SbxErrObject::getUnoErrObject()->Clear();
+
+ if( nOp1 > 1 )
+ StepJUMP( nOp1 );
diff --git a/scratch/sc-vba/testvba/TestDocuments/MiscOnErrorTests.xls b/scratch/sc-vba/testvba/TestDocuments/MiscOnErrorTests.xls
new file mode 100644
index 0000000..8d3acf7
Binary files /dev/null and b/scratch/sc-vba/testvba/TestDocuments/MiscOnErrorTests.xls differ
diff --git a/scratch/sc-vba/testvba/TestDocuments/logs/unix/MiscOnErrorTests.log b/scratch/sc-vba/testvba/TestDocuments/logs/unix/MiscOnErrorTests.log
new file mode 100644
index 0000000..6fd51a5
--- /dev/null
+++ b/scratch/sc-vba/testvba/TestDocuments/logs/unix/MiscOnErrorTests.log
@@ -0,0 +1,16 @@
+Test run started : 28/09/2009 17:35:02
+----------------------------------------------------------------
+MiscOnErrorTests
+ TEST START : MiscOnErrorTests
+ ITEM Assertion OK : test1: testing error handler clearing error
+ ITEM Assertion OK : test2: testing error handler clearing error ( mixed On Error Goto/Resume handling )
+ ITEM Assertion OK : test3: testing error handler clearing error when next resume ( resumes in the same procedure )
+Test Results
+============
+
+Tests passed: 3
+Tests failed: 0
+
+END 'MiscOnErrorTests
+ TEST OK : MiscOnErrorTests
+Test run finished : 28/09/2009 17:35:04
commit 4ae716d68491ecbe88f4f091ee4355e5b6a9e58d
Author: Noel Power <noel.power at novell.com>
Date: Fri Sep 25 13:12:31 2009 +0100
added fixes for bnc#542132, bnc#541749, bnc#541735
* patches/dev300/apply:
* patches/vba/vba-control-api-vis-fix.diff: fix for bnc#542132
* patches/vba/vba-fix-isempty.diff: fix for bnc#541749
* patches/vba/vba-fix-wsfunction-booleanparam.diff: fix for bnc#541735
* scratch/sc-vba/testvba/TestDocuments/MiscRegressionTests.xls: testdocument with rolled up tests for the above
* scratch/sc-vba/testvba/TestDocuments/logs/unix/MiscRegressionTests.log: associated log file
diff --git a/patches/dev300/apply b/patches/dev300/apply
index f2abbc2..4a9ee09 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1630,6 +1630,9 @@ cws-vbasupportdev300.diff
vba-reenable-rowsourcefixes.diff, bnc#540960
vba-basic-not-fix.diff, i#105321, Fong
cws-vbasupportdev300-wae.diff
+vba-control-api-vis-fix.diff, bnc#542132
+vba-fix-isempty.diff, bnc#541749
+vba-fix-wsfunction-booleanparam.diff, bnc#541735
[VBAUntested]
SectionOwner => noelpwer
diff --git a/patches/vba/vba-control-api-vis-fix.diff b/patches/vba/vba-control-api-vis-fix.diff
new file mode 100644
index 0000000..d286725
--- /dev/null
+++ b/patches/vba/vba-control-api-vis-fix.diff
@@ -0,0 +1,26 @@
+diff --git vbahelper/source/msforms/vbacontrol.cxx vbahelper/source/msforms/vbacontrol.cxx
+index 0989548..f51cf56 100644
+--- vbahelper/source/msforms/vbacontrol.cxx
++++ vbahelper/source/msforms/vbacontrol.cxx
+@@ -189,14 +189,17 @@ void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeE
+
+ sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
+ {
+- uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
+- return xWindow2->isVisible();
++ sal_Bool bVisible( sal_True );
++ m_xProps->getPropertyValue
++ (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) )) >>= bVisible;
++ return bVisible;
+ }
+
+ void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
+ {
+- uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
+- xWindow2->setVisible( bVisible );
++ uno::Any aValue( bVisible );
++ m_xProps->setPropertyValue
++ (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ), aValue);
+ }
+ double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException)
+ {
diff --git a/patches/vba/vba-fix-isempty.diff b/patches/vba/vba-fix-isempty.diff
new file mode 100644
index 0000000..4bf3aa2
--- /dev/null
+++ b/patches/vba/vba-fix-isempty.diff
@@ -0,0 +1,34 @@
+diff --git basic/source/classes/sbunoobj.cxx basic/source/classes/sbunoobj.cxx
+index b02dca2..6abb00c 100644
+--- basic/source/classes/sbunoobj.cxx
++++ basic/source/classes/sbunoobj.cxx
+@@ -139,16 +139,19 @@ bool SbUnoObject::getDefaultPropName( SbUnoObject* pUnoObj, String& sDfltProp )
+ SbxVariable* getDefaultProp( SbxVariable* pRef )
+ {
+ SbxVariable* pDefaultProp = NULL;
+- SbxObject* pObj = PTR_CAST(SbxObject,(SbxVariable*) pRef);
+- if ( !pObj )
++ if ( pRef->GetType() == SbxOBJECT )
+ {
+- SbxBase* pObjVarObj = pRef->GetObject();
+- pObj = PTR_CAST(SbxObject,pObjVarObj);
+- }
+- if ( pObj && pObj->ISA(SbUnoObject) )
+- {
+- SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj);
+- pDefaultProp = pUnoObj->GetDfltProperty();
++ SbxObject* pObj = PTR_CAST(SbxObject,(SbxVariable*) pRef);
++ if ( !pObj )
++ {
++ SbxBase* pObjVarObj = pRef->GetObject();
++ pObj = PTR_CAST(SbxObject,pObjVarObj);
++ }
++ if ( pObj && pObj->ISA(SbUnoObject) )
++ {
++ SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj);
++ pDefaultProp = pUnoObj->GetDfltProperty();
++ }
+ }
+ return pDefaultProp;
+ }
+
diff --git a/patches/vba/vba-fix-wsfunction-booleanparam.diff b/patches/vba/vba-fix-wsfunction-booleanparam.diff
new file mode 100644
index 0000000..7334744
--- /dev/null
+++ b/patches/vba/vba-fix-wsfunction-booleanparam.diff
@@ -0,0 +1,22 @@
+diff --git sc/source/ui/vba/vbawsfunction.cxx sc/source/ui/vba/vbawsfunction.cxx
+index d0e7ee3..ed3a749 100644
+--- sc/source/ui/vba/vbawsfunction.cxx
++++ sc/source/ui/vba/vbawsfunction.cxx
+@@ -81,6 +81,16 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence<
+ aArrayTemp[i] = myRange->getCellRange();
+ continue;
+ }
++ else if ( aArray[ i ].getValueType().getTypeClass() == uno::TypeClass_BOOLEAN )
++ {
++ sal_Bool bValue( sal_False );
++ aArray[ i ] >>= bValue;
++ if ( bValue )
++ aArrayTemp[ i ] <<= double( 1.0 );
++ else
++ aArrayTemp[ i ] <<= double( 0.0 );
++
++ }
+ else if ( aArray[ i ].getValueType().getTypeClass() == uno::TypeClass_SEQUENCE )
+ {
+ // the sheet.FunctionAccess service doesn't deal with Sequences, only Sequences of Sequence
+
diff --git a/scratch/sc-vba/testvba/TestDocuments/MiscRegressionTests.xls b/scratch/sc-vba/testvba/TestDocuments/MiscRegressionTests.xls
new file mode 100644
index 0000000..d87fe06
Binary files /dev/null and b/scratch/sc-vba/testvba/TestDocuments/MiscRegressionTests.xls differ
diff --git a/scratch/sc-vba/testvba/TestDocuments/logs/unix/MiscRegressionTests.log b/scratch/sc-vba/testvba/TestDocuments/logs/unix/MiscRegressionTests.log
new file mode 100644
index 0000000..197014a
--- /dev/null
+++ b/scratch/sc-vba/testvba/TestDocuments/logs/unix/MiscRegressionTests.log
@@ -0,0 +1,16 @@
+Test run started : 24/09/2009 12:54:22
+----------------------------------------------------------------
+TestMiscRegressions
+ TEST START : TestMiscRegressions
+ ITEM Assertion OK : test1: IsEmpty( string )
+ ITEM Assertion OK : test2: Check passing boolean to worksheet function
+ ITEM Assertion OK : test2: Check if errorobject number is cleared when entering new stack frame
+Test Results
+============
+
+Tests passed: 3
+Tests failed: 0
+
+END 'TestMiscRegressions
+ TEST OK : TestMiscRegressions
+Test run finished : 24/09/2009 12:54:25
commit 3d00fe55805aaae3bd7e0d3c6d43563783e7a1b1
Author: Noel Power <noel.power at novell.com>
Date: Thu Sep 24 11:17:39 2009 +0100
add some wae fixes
* patches/dev300/apply:
* patches/vba/cws-vbasupportdev300-wae.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3bcd4d1..f2abbc2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1629,6 +1629,7 @@ SectionOwner => noelpwer
cws-vbasupportdev300.diff
vba-reenable-rowsourcefixes.diff, bnc#540960
vba-basic-not-fix.diff, i#105321, Fong
+cws-vbasupportdev300-wae.diff
[VBAUntested]
SectionOwner => noelpwer
diff --git a/patches/vba/cws-vbasupportdev300-wae.diff b/patches/vba/cws-vbasupportdev300-wae.diff
new file mode 100644
index 0000000..4a0738b
--- /dev/null
+++ b/patches/vba/cws-vbasupportdev300-wae.diff
@@ -0,0 +1,481 @@
+Index: sc/source/ui/vba/vbafont.cxx
+===================================================================
+--- sc/source/ui/vba/vbafont.cxx (revision 276354)
++++ sc/source/ui/vba/vbafont.cxx (working copy)
+@@ -250,7 +250,6 @@
+ uno::Any SAL_CALL
+ ScVbaFont::getColorIndex() throw ( uno::RuntimeException )
+ {
+- sal_Int32 nColor = 0;
+ if ( GetDataSet() )
+ if ( GetDataSet()->GetItemState( ATTR_FONT_COLOR, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ return aNULL();
+Index: basic/source/classes/sbxmod.cxx
+===================================================================
+--- basic/source/classes/sbxmod.cxx (revision 276381)
++++ basic/source/classes/sbxmod.cxx (working copy)
+@@ -113,7 +113,7 @@
+ DECL_LINK( OnAsyncQuit, void* );
+ };
+
+-IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, pNull )
++IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, /*pNull*/ )
+ {
+ QuitApplication();
+ return 0L;
+Index: sw/source/ui/vba/vbaselection.cxx
+===================================================================
+--- sw/source/ui/vba/vbaselection.cxx (revision 276294)
++++ sw/source/ui/vba/vbaselection.cxx (working copy)
+@@ -188,7 +188,7 @@
+ }
+
+ void SAL_CALL
+-SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( uno::RuntimeException )
++SwVbaSelection::Delete( const uno::Any& /*_unit*/, const uno::Any& /*_count*/ ) throw ( uno::RuntimeException )
+ {
+ // FIXME: handle the arguments: _unit and _count
+ rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Delete"));
+Index: sw/source/ui/vba/vbatable.cxx
+===================================================================
+--- sw/source/ui/vba/vbatable.cxx (revision 276294)
++++ sw/source/ui/vba/vbatable.cxx (working copy)
+@@ -50,7 +50,7 @@
+ }
+
+ uno::Reference< word::XRange > SAL_CALL
+-SwVbaTable::ConvertToText( const uno::Any& Separator, const uno::Any& NestedTables ) throw (script::BasicErrorException, uno::RuntimeException)
++SwVbaTable::ConvertToText( const uno::Any& /*Separator*/, const uno::Any& /*NestedTables*/ ) throw (script::BasicErrorException, uno::RuntimeException)
+ {
+ // #FIXME the helper api uses the dreaded dispatch mechanism, holding off
+ // implementation while I look for alternative solution
+Index: sw/source/ui/vba/vbaoptions.cxx
+===================================================================
+--- sw/source/ui/vba/vbaoptions.cxx (revision 276294)
++++ sw/source/ui/vba/vbaoptions.cxx (working copy)
+@@ -141,7 +141,7 @@
+ return word::WdLineStyle::wdLineStyleSingle;
+ }
+
+-void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 /*_defaultborderlinestyle*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -151,7 +151,7 @@
+ return word::WdLineWidth::wdLineWidth050pt;
+ }
+
+-void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 /*_defaultborderlinewidth*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -161,7 +161,7 @@
+ return word::WdColorIndex::wdAuto;
+ }
+
+-void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 /*_defaultbordercolorindex*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -171,7 +171,7 @@
+ return sal_True;
+ }
+
+-void SAL_CALL SwVbaOptions::setReplaceSelection( ::sal_Bool _replaceselection ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setReplaceSelection( ::sal_Bool /*_replaceselection*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -181,7 +181,7 @@
+ return sal_False;
+ }
+
+-void SAL_CALL SwVbaOptions::setMapPaperSize( ::sal_Bool _mappapersize ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setMapPaperSize( ::sal_Bool /*_mappapersize*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -191,7 +191,7 @@
+ return sal_False;
+ }
+
+-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _autoformatasyoutypeapplyheadings ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool /*_autoformatasyoutypeapplyheadings*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -201,7 +201,7 @@
+ return sal_False;
+ }
+
+-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool /*_autoformatasyoutypeapplybulletedlists*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -211,7 +211,7 @@
+ return sal_False;
+ }
+
+-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool /*_autoformatasyoutypeapplynumberedlists*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -221,7 +221,7 @@
+ return sal_False;
+ }
+
+-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool /*_autoformatasyoutypeformatlistitembeginning*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -231,7 +231,7 @@
+ return sal_False;
+ }
+
+-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _autoformatasyoutypedefinestyles ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( ::sal_Bool /*_autoformatasyoutypedefinestyles*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -241,7 +241,7 @@
+ return sal_False;
+ }
+
+-void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( ::sal_Bool _autoformatapplyheadings ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( ::sal_Bool /*_autoformatapplyheadings*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -251,7 +251,7 @@
+ return sal_False;
+ }
+
+-void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( ::sal_Bool _autoformatapplylists ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( ::sal_Bool /*_autoformatapplylists*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -261,7 +261,7 @@
+ return sal_False;
+ }
+
+-void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool _autoformatapplybulletedlists ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool /*_autoformatapplybulletedlists*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+Index: sw/source/ui/vba/vbatables.cxx
+===================================================================
+--- sw/source/ui/vba/vbatables.cxx (revision 276294)
++++ sw/source/ui/vba/vbatables.cxx (working copy)
+@@ -58,7 +58,7 @@
+
+
+ uno::Reference< word::XTable > SAL_CALL
+-SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& DefaultTableBehavior, const uno::Any& AutoFitBehavior ) throw (script::BasicErrorException, uno::RuntimeException)
++SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& /*DefaultTableBehavior*/, const uno::Any& /*AutoFitBehavior*/ ) throw (script::BasicErrorException, uno::RuntimeException)
+ {
+ sal_Int32 nCols = 0;
+ sal_Int32 nRows = 0;
+Index: sw/source/ui/vba/vbapagesetup.cxx
+===================================================================
+--- sw/source/ui/vba/vbapagesetup.cxx (revision 276294)
++++ sw/source/ui/vba/vbapagesetup.cxx (working copy)
+@@ -249,7 +249,7 @@
+ return wdSectionStart;
+ }
+
+-void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 _sectionstart ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) throw (uno::RuntimeException)
+ {
+ // fail to find corresponding feature in Writer
+ // #FIXME:
+Index: sw/source/ui/vba/vbaborders.cxx
+===================================================================
+--- sw/source/ui/vba/vbaborders.cxx (revision 276294)
++++ sw/source/ui/vba/vbaborders.cxx (working copy)
+@@ -356,7 +356,7 @@
+ return ( aShadowFormat.Location != table::ShadowLocation_NONE );
+ }
+
+-void SAL_CALL SwVbaBorders::setShadow( sal_Bool _shadow ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::RuntimeException)
+ {
+ throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+ }
+Index: sw/source/ui/vba/vbaheaderfooter.cxx
+===================================================================
+--- sw/source/ui/vba/vbaheaderfooter.cxx (revision 276294)
++++ sw/source/ui/vba/vbaheaderfooter.cxx (working copy)
+@@ -55,7 +55,7 @@
+ return sal_False;
+ }
+
+-void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( ::sal_Bool _linktoprevious ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( ::sal_Bool /*_linktoprevious*/ ) throw (uno::RuntimeException)
+ {
+ // not support in Writer
+ }
+@@ -71,7 +71,7 @@
+ {
+ sPropsNameText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
+ }
+- if( mnIndex = word::WdHeaderFooterIndex::wdHeaderFooterEvenPages )
++ if( mnIndex == word::WdHeaderFooterIndex::wdHeaderFooterEvenPages )
+ {
+ sPropsNameText.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left") ) );
+ }
+Index: sw/source/ui/vba/vbastyles.cxx
+===================================================================
+--- sw/source/ui/vba/vbastyles.cxx (revision 276294)
++++ sw/source/ui/vba/vbastyles.cxx (working copy)
+@@ -315,7 +315,7 @@
+ sal_Int32 nIndex = 0;
+ if( ( Index1 >>= nIndex ) && ( nIndex < 0 ) )
+ {
+- for( const BuiltinStyleTable* pTable = aBuiltinStyleTable; pTable->wdBuiltinStyle != NULL; pTable++ )
++ for( const BuiltinStyleTable* pTable = aBuiltinStyleTable; pTable != NULL; pTable++ )
+ {
+ if( nIndex == pTable->wdBuiltinStyle )
+ {
+Index: sw/source/ui/vba/vbadocuments.cxx
+===================================================================
+--- sw/source/ui/vba/vbadocuments.cxx (revision 276294)
++++ sw/source/ui/vba/vbadocuments.cxx (working copy)
+@@ -116,7 +116,7 @@
+ }
+
+ uno::Any SAL_CALL
+-SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& NewTemplate, const uno::Any& DocumentType, const uno::Any& Visible ) throw (uno::RuntimeException)
++SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, const uno::Any& /*DocumentType*/, const uno::Any& /*Visible*/ ) throw (uno::RuntimeException)
+ {
+ rtl::OUString sFileName;
+ if( Template.hasValue() && ( Template >>= sFileName ) )
+@@ -132,14 +132,14 @@
+
+ // #TODO# #FIXME# can any of the unused params below be used?
+ void SAL_CALL
+-SwVbaDocuments::Close( const uno::Any& SaveChanges, const uno::Any& OriginalFormat, const uno::Any& RouteDocument ) throw (uno::RuntimeException)
++SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*OriginalFormat*/, const uno::Any& /*RouteDocument*/ ) throw (uno::RuntimeException)
+ {
+ VbaDocumentsBase::Close();
+ }
+
+ // #TODO# #FIXME# can any of the unused params below be used?
+ uno::Any SAL_CALL
+-SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToRecentFiles, const uno::Any& PasswordDocument, const uno::Any& PasswordTemplate, const uno::Any& Revert, const uno::Any& WritePasswordDocument, const uno::Any& WritePasswordTemplate, const uno::Any& Format, const uno::Any& Encoding, const uno::Any& Visible, const uno::Any& OpenAndRepair, const uno::Any& DocumentDirection, const uno::Any& NoEncodingDialog, const uno::Any& XMLTransform ) throw (uno::RuntimeException)
++SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) throw (uno::RuntimeException)
+ {
+ // we need to detect if this is a URL, if not then assume its a file path
+ rtl::OUString aURL;
+Index: sw/source/ui/vba/vbasection.cxx
+===================================================================
+--- sw/source/ui/vba/vbasection.cxx (revision 276294)
++++ sw/source/ui/vba/vbasection.cxx (working copy)
+@@ -49,7 +49,7 @@
+ return sal_False;
+ }
+
+-void SAL_CALL SwVbaSection::setProtectedForForms( ::sal_Bool _protectedforforms ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaSection::setProtectedForForms( ::sal_Bool /*_protectedforforms*/ ) throw (uno::RuntimeException)
+ {
+ }
+
+Index: sw/source/ui/vba/vbadocument.cxx
+===================================================================
+--- sw/source/ui/vba/vbadocument.cxx (revision 276294)
++++ sw/source/ui/vba/vbadocument.cxx (working copy)
+@@ -238,7 +238,6 @@
+ uno::Any SAL_CALL
+ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException)
+ {
+- SwDocShell* pDocShell = word::getDocShell( getModel() );
+ uno::Reference< word::XTemplate > xTemplate;
+ uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( getModel(), uno::UNO_QUERY_THROW );
+ uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
+@@ -250,7 +249,7 @@
+ }
+
+ void SAL_CALL
+-SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (uno::RuntimeException)
++SwVbaDocument::setAttachedTemplate( const css::uno::Any& /*_attachedtemplate*/ ) throw (uno::RuntimeException)
+ {
+ throw uno::RuntimeException();
+ }
+Index: sw/source/ui/vba/vbafind.cxx
+===================================================================
+--- sw/source/ui/vba/vbafind.cxx (revision 276294)
++++ sw/source/ui/vba/vbafind.cxx (working copy)
+@@ -84,7 +84,7 @@
+ mbReplace = sal_True;
+ }
+
+-rtl::OUString SwVbaFind::ReplaceWildcards( const rtl::OUString& rText ) throw ( uno::RuntimeException )
++rtl::OUString SwVbaFind::ReplaceWildcards( const rtl::OUString& /*rText*/ ) throw ( uno::RuntimeException )
+ {
+ // TODO:
+ return rtl::OUString();
+@@ -177,7 +177,7 @@
+ }
+ break;
+ }
+- defalut:
++ default:
+ {
+ result = sal_False;
+ }
+@@ -393,7 +393,7 @@
+
+ if( Replace.hasValue() )
+ {
+- sal_Int32 nValue;
++ sal_Int32 nValue(0);
+ Replace >>= nValue;
+ SetReplace( nValue );
+ }
+Index: sw/source/ui/vba/vbarange.cxx
+===================================================================
+--- sw/source/ui/vba/vbarange.cxx (revision 276294)
++++ sw/source/ui/vba/vbarange.cxx (working copy)
+@@ -56,7 +56,7 @@
+ initialize( rStart, rEnd );
+ }
+
+-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument ), mxText( rText )
++SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
+ {
+ initialize( rStart, rEnd );
+ }
+Index: sw/source/ui/vba/vbaautotextentry.cxx
+===================================================================
+--- sw/source/ui/vba/vbaautotextentry.cxx (revision 276294)
++++ sw/source/ui/vba/vbaautotextentry.cxx (working copy)
+@@ -44,7 +44,7 @@
+ {
+ }
+
+-uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& _richtext ) throw ( uno::RuntimeException )
++uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& /*_richtext*/ ) throw ( uno::RuntimeException )
+ {
+ SwVbaRange* pWhere = dynamic_cast<SwVbaRange*>( _where.get() );
+ if( pWhere )
+Index: sw/source/ui/vba/vbadialog.cxx
+===================================================================
+--- sw/source/ui/vba/vbadialog.cxx (revision 276294)
++++ sw/source/ui/vba/vbadialog.cxx (working copy)
+@@ -51,7 +51,7 @@
+ rtl::OUString
+ SwVbaDialog::mapIndexToName( sal_Int32 nIndex )
+ {
+- for( const WordDialogTable* pTable = aWordDialogTable; pTable->wdDialog != NULL; pTable++ )
++ for( const WordDialogTable* pTable = aWordDialogTable; pTable != NULL; pTable++ )
+ {
+ if( nIndex == pTable->wdDialog )
+ {
+Index: sw/source/ui/vba/vbatemplate.cxx
+===================================================================
+--- sw/source/ui/vba/vbatemplate.cxx (revision 276294)
++++ sw/source/ui/vba/vbatemplate.cxx (working copy)
+@@ -61,7 +61,8 @@
+
+ // the default template is "Normal.dot" in Word.
+ rtl::OUString sGroup( RTL_CONSTASCII_USTRINGPARAM("Normal") );
+- if( sal_Int32 nIndex = msName.lastIndexOf( sal_Unicode('.') ) > 0 )
++ sal_Int32 nIndex = msName.lastIndexOf( sal_Unicode('.') );
++ if( nIndex > 0 )
+ {
+ sGroup = msName.copy( 0, msName.lastIndexOf( sal_Unicode('.') ) );
+ // OSL_TRACE("SwVbaTemplate::AutoTextEntries: %s", rtl::OUStringToOString( sGroup, RTL_TEXTENCODING_UTF8 ).getStr() );
+Index: sw/source/ui/vba/vbaparagraphformat.cxx
+===================================================================
+--- sw/source/ui/vba/vbaparagraphformat.cxx (revision 276294)
++++ sw/source/ui/vba/vbaparagraphformat.cxx (working copy)
+@@ -203,7 +203,7 @@
+ return nLevel;
+ }
+
+-void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 /*_outlinelevel*/ ) throw (uno::RuntimeException)
+ {
+ throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+ }
+@@ -247,7 +247,7 @@
+
+ float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() throw (uno::RuntimeException)
+ {
+- sal_Int32 nSpace;
++ sal_Int32 nSpace = 0;
+ mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin") ) ) >>= nSpace;
+ return (float)( Millimeter::getInPoints( nSpace ) );
+ }
+@@ -302,7 +302,7 @@
+ throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+ }
+
+-void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& _tabstops ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) throw (uno::RuntimeException)
+ {
+ throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+ }
+@@ -484,7 +484,7 @@
+
+ sal_Int16 SwVbaParagraphFormat::getCharHeight() throw (uno::RuntimeException)
+ {
+- float fCharHeight;
++ float fCharHeight = 0.0;
+ mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharHeight") ) ) >>= fCharHeight;
+ return (sal_Int16)( Millimeter::getInHundredthsOfOneMillimeter( fCharHeight ) );
+ }
+Index: vbahelper/source/vbahelper/vbahelper.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbahelper.cxx (revision 276294)
++++ vbahelper/source/vbahelper/vbahelper.cxx (working copy)
+@@ -856,7 +856,7 @@
+ return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR;
+ }
+
+-ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape )
++ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& /*xContext*/, const css::uno::Reference< css::drawing::XShape >& xShape )
+ {
+ m_pShapeHelper.reset( new ShapeHelper( xShape ) );
+ }
+@@ -901,7 +901,6 @@
+ }
+ else
+ {
+- const uno::Reference< frame::XModel > xModel( xModel2, uno::UNO_QUERY );
+ if ( xModel.is() )
+ {
+ const uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
+Index: vbahelper/source/vbahelper/vbashapes.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbashapes.cxx (revision 276294)
++++ vbahelper/source/vbahelper/vbashapes.cxx (working copy)
+@@ -373,7 +373,7 @@
+ }
+
+ uno::Any
+-ScVbaShapes::AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
++ScVbaShapes::AddTextboxInWriter( sal_Int32 /*_nOrientation*/, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
+ {
+ rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.TextShape" ) );
+ sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( _nLeft );
+Index: vbahelper/source/vbahelper/vbafontbase.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbafontbase.cxx (revision 276294)
++++ vbahelper/source/vbahelper/vbafontbase.cxx (working copy)
+@@ -246,7 +246,7 @@
+ }
+
+ void SAL_CALL
+-VbaFontBase::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException )
++VbaFontBase::setUnderline( const uno::Any& /*aValue*/ ) throw ( uno::RuntimeException )
+ {
+ /*
+ // default
More information about the ooo-build-commit
mailing list