ooo-build r15105 - in trunk: . patches/dev300 patches/vba



Author: noelpwer
Date: Tue Jan 20 11:38:03 2009
New Revision: 15105
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15105&view=rev

Log:
2009-01-20  Noel Power  <noel power novell com>

        * patches/dev300/cws-npower11.diff: regenerated ( m36-m38 )
        * patches/vba/vba-fix-font-attribute-access.diff: removed
        * patches/vba/vba-font-api.diff: removed
        * patches/dev300/apply:



Removed:
   trunk/patches/vba/vba-fix-font-attribute-access.diff
   trunk/patches/vba/vba-font-api.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/cws-npower11.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 20 11:38:03 2009
@@ -1856,10 +1856,6 @@
 # fix treatment of NULL with
 # a) NOT operator b) comparison operators
 vba-null-not-treatment.diff
-# fix spurious core maniplulating font attributes
-vba-fix-font-attribute-access.diff, n#433292
-# add Font.FontStyle and Font.OutlineFont, fix Font.getItalic.
-vba-font-api.diff, Fong
 # fix core issue in Commandbar
 vba-commandbar-fix.diff, n#434214, n#437157, Fong
 

Modified: trunk/patches/dev300/cws-npower11.diff
==============================================================================
--- trunk/patches/dev300/cws-npower11.diff	(original)
+++ trunk/patches/dev300/cws-npower11.diff	Tue Jan 20 11:38:03 2009
@@ -1,7 +1,7 @@
 Index: oovbaapi/genconstidl/api-to-idl.pl
 ===================================================================
---- oovbaapi/genconstidl/api-to-idl.pl	ïrevision 264185ï
-+++ oovbaapi/genconstidl/api-to-idl.pl	ïrevision 265237ï
+--- oovbaapi/genconstidl/api-to-idl.pl	(revision 264185)
++++ oovbaapi/genconstidl/api-to-idl.pl	(revision 266505)
 @@ -131,12 +131,23 @@ sub generate_idls($) {
              my $fname = $path . "/" . $type . ".idl";
              open( IDL, ">$fname" ) || die "Cannot write $fname.";
@@ -29,8 +29,8 @@
          }
 Index: oovbaapi/prj/build.lst
 ===================================================================
---- oovbaapi/prj/build.lst	ïrevision 264185ï
-+++ oovbaapi/prj/build.lst	ïrevision 265237ï
+--- oovbaapi/prj/build.lst	(revision 264185)
++++ oovbaapi/prj/build.lst	(revision 266505)
 @@ -1,8 +1,8 @@
  ovba	oovbaapi	:	offapi solenv NULL
  ovba	oovbaapi									usr1	-	all	ovba_mkout NULL
@@ -46,8 +46,8 @@
  ovba   oovbaapi\util                             nmake   -   all ovba_util ovba_vba ovba_excel ovba_msforms ovba_constants ovba_genconstidl NULL
 Index: oovbaapi/ooo/vba/XGlobals.idl
 ===================================================================
---- oovbaapi/ooo/vba/XGlobals.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/XGlobals.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/XGlobals.idl	(revision 0)
++++ oovbaapi/ooo/vba/XGlobals.idl	(revision 266505)
 @@ -0,0 +1,67 @@
 +/*************************************************************************
 + *
@@ -118,8 +118,8 @@
 +
 Index: oovbaapi/ooo/vba/makefile.mk
 ===================================================================
---- oovbaapi/ooo/vba/makefile.mk	ïrevision 0ï
-+++ oovbaapi/ooo/vba/makefile.mk	ïrevision 265237ï
+--- oovbaapi/ooo/vba/makefile.mk	(revision 0)
++++ oovbaapi/ooo/vba/makefile.mk	(revision 266505)
 @@ -0,0 +1,64 @@
 +#*************************************************************************
 +#
@@ -187,8 +187,8 @@
 +.INCLUDE :  target.mk
 Index: oovbaapi/ooo/vba/XCommandBars.idl
 ===================================================================
---- oovbaapi/ooo/vba/XCommandBars.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/XCommandBars.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/XCommandBars.idl	(revision 0)
++++ oovbaapi/ooo/vba/XCommandBars.idl	(revision 266505)
 @@ -0,0 +1,61 @@
 +/*************************************************************************
 + *
@@ -253,8 +253,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/XCommandBarControls.idl
 ===================================================================
---- oovbaapi/ooo/vba/XCommandBarControls.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/XCommandBarControls.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/XCommandBarControls.idl	(revision 0)
++++ oovbaapi/ooo/vba/XCommandBarControls.idl	(revision 266505)
 @@ -0,0 +1,61 @@
 +/*************************************************************************
 + *
@@ -319,8 +319,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/msforms/XControl.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XControl.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XControl.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XControl.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XControl.idl	(revision 266505)
 @@ -0,0 +1,72 @@
 +/*************************************************************************
 + *
@@ -396,8 +396,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XImage.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XImage.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XImage.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XImage.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XImage.idl	(revision 266505)
 @@ -0,0 +1,51 @@
 +/*************************************************************************
 + *
@@ -452,8 +452,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XShapes.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XShapes.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XShapes.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XShapes.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XShapes.idl	(revision 266505)
 @@ -0,0 +1,58 @@
 +/*************************************************************************
 + *
@@ -515,8 +515,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/msforms/XScrollBar.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XScrollBar.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XScrollBar.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XScrollBar.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XScrollBar.idl	(revision 266505)
 @@ -0,0 +1,61 @@
 +/*************************************************************************
 + *
@@ -581,8 +581,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/makefile.mk
 ===================================================================
---- oovbaapi/ooo/vba/msforms/makefile.mk	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/makefile.mk	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/makefile.mk	(revision 0)
++++ oovbaapi/ooo/vba/msforms/makefile.mk	(revision 266505)
 @@ -0,0 +1,77 @@
 +#*************************************************************************
 +#
@@ -663,8 +663,8 @@
 +.INCLUDE :  target.mk
 Index: oovbaapi/ooo/vba/msforms/XListBox.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XListBox.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XListBox.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XListBox.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XListBox.idl	(revision 266505)
 @@ -0,0 +1,62 @@
 +/*************************************************************************
 + *
@@ -730,8 +730,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XPictureFormat.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XPictureFormat.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XPictureFormat.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XPictureFormat.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XPictureFormat.idl	(revision 266505)
 @@ -0,0 +1,48 @@
 +/*************************************************************************
 + *
@@ -783,8 +783,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/msforms/XColorFormat.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XColorFormat.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XColorFormat.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XColorFormat.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XColorFormat.idl	(revision 266505)
 @@ -0,0 +1,46 @@
 +/*************************************************************************
 + *
@@ -834,8 +834,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/msforms/XMultiPage.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XMultiPage.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XMultiPage.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XMultiPage.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XMultiPage.idl	(revision 266505)
 @@ -0,0 +1,58 @@
 +/*************************************************************************
 + *
@@ -897,8 +897,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XProgressBar.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XProgressBar.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XProgressBar.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XProgressBar.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XProgressBar.idl	(revision 266505)
 @@ -0,0 +1,57 @@
 +/*************************************************************************
 + *
@@ -959,8 +959,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XRadioButton.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XRadioButton.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XRadioButton.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XRadioButton.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XRadioButton.idl	(revision 266505)
 @@ -0,0 +1,53 @@
 +/*************************************************************************
 + *
@@ -1017,8 +1017,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XTextBox.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XTextBox.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XTextBox.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XTextBox.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XTextBox.idl	(revision 266505)
 @@ -0,0 +1,55 @@
 +/*************************************************************************
 + *
@@ -1077,8 +1077,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XFillFormat.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XFillFormat.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XFillFormat.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XFillFormat.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XFillFormat.idl	(revision 266505)
 @@ -0,0 +1,53 @@
 +/*************************************************************************
 + *
@@ -1135,8 +1135,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/msforms/XPages.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XPages.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XPages.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XPages.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XPages.idl	(revision 266505)
 @@ -0,0 +1,61 @@
 +/*************************************************************************
 + *
@@ -1201,8 +1201,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl	(revision 266505)
 @@ -0,0 +1,54 @@
 +/*************************************************************************
 + *
@@ -1260,8 +1260,8 @@
 +};
 Index: oovbaapi/ooo/vba/msforms/XLineFormat.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XLineFormat.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XLineFormat.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XLineFormat.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XLineFormat.idl	(revision 266505)
 @@ -0,0 +1,60 @@
 +/*************************************************************************
 + *
@@ -1325,8 +1325,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/msforms/XShape.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XShape.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XShape.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XShape.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XShape.idl	(revision 266505)
 @@ -0,0 +1,89 @@
 +/*************************************************************************
 + *
@@ -1419,8 +1419,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/msforms/XUserForm.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XUserForm.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XUserForm.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XUserForm.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XUserForm.idl	(revision 266505)
 @@ -0,0 +1,58 @@
 +/*************************************************************************
 + *
@@ -1482,8 +1482,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/msforms/XControls.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XControls.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XControls.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XControls.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XControls.idl	(revision 266505)
 @@ -0,0 +1,51 @@
 +/*************************************************************************
 + *
@@ -1538,8 +1538,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/msforms/XGroupBox.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XGroupBox.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XGroupBox.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XGroupBox.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XGroupBox.idl	(revision 266505)
 @@ -0,0 +1,56 @@
 +/*************************************************************************
 + *
@@ -1599,8 +1599,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XSpinButton.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XSpinButton.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XSpinButton.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XSpinButton.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XSpinButton.idl	(revision 266505)
 @@ -0,0 +1,59 @@
 +/*************************************************************************
 + *
@@ -1663,8 +1663,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XComboBox.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XComboBox.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XComboBox.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XComboBox.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XComboBox.idl	(revision 266505)
 @@ -0,0 +1,61 @@
 +/*************************************************************************
 + *
@@ -1729,8 +1729,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XButton.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XButton.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XButton.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XButton.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XButton.idl	(revision 266505)
 @@ -0,0 +1,52 @@
 +/*************************************************************************
 + *
@@ -1786,8 +1786,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XShapeRange.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XShapeRange.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XShapeRange.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XShapeRange.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XShapeRange.idl	(revision 266505)
 @@ -0,0 +1,58 @@
 +/*************************************************************************
 + *
@@ -1849,8 +1849,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/msforms/XToggleButton.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XToggleButton.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XToggleButton.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XToggleButton.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XToggleButton.idl	(revision 266505)
 @@ -0,0 +1,60 @@
 +/*************************************************************************
 + *
@@ -1914,8 +1914,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XTextBoxShape.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XTextBoxShape.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XTextBoxShape.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XTextBoxShape.idl	(revision 266505)
 @@ -0,0 +1,61 @@
 +/*************************************************************************
 + *
@@ -1980,8 +1980,8 @@
 +
 Index: oovbaapi/ooo/vba/msforms/XLabel.idl
 ===================================================================
---- oovbaapi/ooo/vba/msforms/XLabel.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/msforms/XLabel.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/msforms/XLabel.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XLabel.idl	(revision 266505)
 @@ -0,0 +1,53 @@
 +/*************************************************************************
 + *
@@ -2038,8 +2038,8 @@
 +
 Index: oovbaapi/ooo/vba/Globals.idl
 ===================================================================
---- oovbaapi/ooo/vba/Globals.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/Globals.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/Globals.idl	(revision 0)
++++ oovbaapi/ooo/vba/Globals.idl	(revision 266505)
 @@ -0,0 +1,48 @@
 +/*************************************************************************
 + *
@@ -2091,8 +2091,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/XCollection.idl
 ===================================================================
---- oovbaapi/ooo/vba/XCollection.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/XCollection.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/XCollection.idl	(revision 0)
++++ oovbaapi/ooo/vba/XCollection.idl	(revision 266505)
 @@ -0,0 +1,63 @@
 +/*************************************************************************
 + *
@@ -2159,8 +2159,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/XHelperInterface.idl
 ===================================================================
---- oovbaapi/ooo/vba/XHelperInterface.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/XHelperInterface.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/XHelperInterface.idl	(revision 0)
++++ oovbaapi/ooo/vba/XHelperInterface.idl	(revision 266505)
 @@ -0,0 +1,71 @@
 +/*************************************************************************
 + *
@@ -2235,8 +2235,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XWorkbooks.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XWorkbooks.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XWorkbooks.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XWorkbooks.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XWorkbooks.idl	(revision 266505)
 @@ -0,0 +1,59 @@
 +/*************************************************************************
 + *
@@ -2299,8 +2299,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/XPageBreak.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XPageBreak.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XPageBreak.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XPageBreak.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XPageBreak.idl	(revision 266505)
 @@ -0,0 +1,73 @@
 +/*************************************************************************
 + *
@@ -2377,8 +2377,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XWorksheetFunction.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XWorksheetFunction.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XWorksheetFunction.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XWorksheetFunction.idl	(revision 266505)
 @@ -0,0 +1,68 @@
 +/*************************************************************************
 + *
@@ -2450,8 +2450,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XFormatConditions.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XFormatConditions.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XFormatConditions.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XFormatConditions.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XFormatConditions.idl	(revision 266505)
 @@ -0,0 +1,71 @@
 +/*************************************************************************
 + *
@@ -2526,8 +2526,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/XDialogs.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XDialogs.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XDialogs.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XDialogs.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XDialogs.idl	(revision 266505)
 @@ -0,0 +1,63 @@
 +/*************************************************************************
 + *
@@ -2594,8 +2594,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/Worksheet.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/Worksheet.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/Worksheet.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/Worksheet.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/Worksheet.idl	(revision 266505)
 @@ -0,0 +1,53 @@
 +/*************************************************************************
 + *
@@ -2652,8 +2652,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/XPane.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XPane.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XPane.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XPane.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XPane.idl	(revision 266505)
 @@ -0,0 +1,56 @@
 +/*************************************************************************
 + *
@@ -2713,8 +2713,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/XPivotCache.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XPivotCache.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XPivotCache.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XPivotCache.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XPivotCache.idl	(revision 266505)
 @@ -0,0 +1,60 @@
 +/*************************************************************************
 + *
@@ -2778,8 +2778,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XFormat.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XFormat.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XFormat.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XFormat.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XFormat.idl	(revision 266505)
 @@ -0,0 +1,138 @@
 +/*************************************************************************
 + *
@@ -2921,8 +2921,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XChartObject.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XChartObject.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XChartObject.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XChartObject.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XChartObject.idl	(revision 266505)
 @@ -0,0 +1,64 @@
 +/*************************************************************************
 + *
@@ -2990,8 +2990,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XHPageBreak.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XHPageBreak.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XHPageBreak.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XHPageBreak.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XHPageBreak.idl	(revision 266505)
 @@ -0,0 +1,55 @@
 +/*************************************************************************
 + *
@@ -3050,8 +3050,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XOLEObjects.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XOLEObjects.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XOLEObjects.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XOLEObjects.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XOLEObjects.idl	(revision 266505)
 @@ -0,0 +1,54 @@
 +/*************************************************************************
 + *
@@ -3109,8 +3109,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XInterior.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XInterior.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XInterior.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XInterior.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XInterior.idl	(revision 266505)
 @@ -0,0 +1,65 @@
 +/*************************************************************************
 + *
@@ -3179,8 +3179,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XDataLabels.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XDataLabels.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XDataLabels.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XDataLabels.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XDataLabels.idl	(revision 266505)
 @@ -0,0 +1,59 @@
 +/*************************************************************************
 + *
@@ -3243,8 +3243,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XPivotTables.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XPivotTables.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XPivotTables.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XPivotTables.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XPivotTables.idl	(revision 266505)
 @@ -0,0 +1,62 @@
 +/*************************************************************************
 + *
@@ -3310,8 +3310,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XWorkbook.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XWorkbook.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XWorkbook.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XWorkbook.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XWorkbook.idl	(revision 266505)
 @@ -0,0 +1,83 @@
 +/*************************************************************************
 + *
@@ -3398,8 +3398,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/XPageSetup.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XPageSetup.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XPageSetup.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XPageSetup.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XPageSetup.idl	(revision 266505)
 @@ -0,0 +1,85 @@
 +/*************************************************************************
 + *
@@ -3488,8 +3488,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XWorksheets.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XWorksheets.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XWorksheets.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XWorksheets.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XWorksheets.idl	(revision 266505)
 @@ -0,0 +1,59 @@
 +/*************************************************************************
 + *
@@ -3552,8 +3552,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XTextFrame.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XTextFrame.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XTextFrame.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XTextFrame.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XTextFrame.idl	(revision 266505)
 @@ -0,0 +1,54 @@
 +/*************************************************************************
 + *
@@ -3611,8 +3611,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/XDialog.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XDialog.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XDialog.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XDialog.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XDialog.idl	(revision 266505)
 @@ -0,0 +1,60 @@
 +/*************************************************************************
 + *
@@ -3676,8 +3676,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XFormatCondition.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XFormatCondition.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XFormatCondition.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XFormatCondition.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XFormatCondition.idl	(revision 266505)
 @@ -0,0 +1,84 @@
 +/*************************************************************************
 + *
@@ -3765,8 +3765,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/XStyle.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XStyle.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XStyle.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XStyle.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XStyle.idl	(revision 266505)
 @@ -0,0 +1,102 @@
 +/*************************************************************************
 + *
@@ -3872,8 +3872,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XAxes.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XAxes.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XAxes.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XAxes.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XAxes.idl	(revision 266505)
 @@ -0,0 +1,59 @@
 +/*************************************************************************
 + *
@@ -3936,8 +3936,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XComment.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XComment.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XComment.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XComment.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XComment.idl	(revision 266505)
 @@ -0,0 +1,69 @@
 +/*************************************************************************
 + *
@@ -4010,8 +4010,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XChartTitle.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XChartTitle.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XChartTitle.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XChartTitle.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XChartTitle.idl	(revision 266505)
 @@ -0,0 +1,53 @@
 +/*************************************************************************
 + *
@@ -4068,8 +4068,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XAxis.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XAxis.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XAxis.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XAxis.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XAxis.idl	(revision 266505)
 @@ -0,0 +1,262 @@
 +/*************************************************************************
 + *
@@ -4335,8 +4335,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/Range.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/Range.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/Range.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/Range.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/Range.idl	(revision 266505)
 @@ -0,0 +1,49 @@
 +/*************************************************************************
 + *
@@ -4389,8 +4389,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/XSeriesCollection.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XSeriesCollection.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XSeriesCollection.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XSeriesCollection.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XSeriesCollection.idl	(revision 266505)
 @@ -0,0 +1,60 @@
 +/*************************************************************************
 + *
@@ -4454,8 +4454,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XAxisTitle.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XAxisTitle.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XAxisTitle.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XAxisTitle.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XAxisTitle.idl	(revision 266505)
 @@ -0,0 +1,52 @@
 +/*************************************************************************
 + *
@@ -4511,8 +4511,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XFont.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XFont.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XFont.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XFont.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XFont.idl	(revision 266505)
 @@ -0,0 +1,74 @@
 +/*************************************************************************
 + *
@@ -4590,8 +4590,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XPivotTable.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XPivotTable.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XPivotTable.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XPivotTable.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XPivotTable.idl	(revision 266505)
 @@ -0,0 +1,64 @@
 +/*************************************************************************
 + *
@@ -4659,8 +4659,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XDataLabel.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XDataLabel.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XDataLabel.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XDataLabel.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XDataLabel.idl	(revision 266505)
 @@ -0,0 +1,62 @@
 +/*************************************************************************
 + *
@@ -4726,8 +4726,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XChartObjects.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XChartObjects.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XChartObjects.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XChartObjects.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XChartObjects.idl	(revision 266505)
 @@ -0,0 +1,63 @@
 +/*************************************************************************
 + *
@@ -4794,8 +4794,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XWorksheet.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XWorksheet.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XWorksheet.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XWorksheet.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XWorksheet.idl	(revision 266505)
 @@ -0,0 +1,117 @@
 +/*************************************************************************
 + *
@@ -4916,8 +4916,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/Hyperlink.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/Hyperlink.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/Hyperlink.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/Hyperlink.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/Hyperlink.idl	(revision 266505)
 @@ -0,0 +1,54 @@
 +/*************************************************************************
 + *
@@ -4975,8 +4975,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/Window.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/Window.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/Window.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/Window.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/Window.idl	(revision 266505)
 @@ -0,0 +1,54 @@
 +/*************************************************************************
 + *
@@ -5034,8 +5034,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/XCharacters.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XCharacters.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XCharacters.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XCharacters.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XCharacters.idl	(revision 266505)
 @@ -0,0 +1,65 @@
 +/*************************************************************************
 + *
@@ -5104,8 +5104,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XName.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XName.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XName.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XName.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XName.idl	(revision 266505)
 @@ -0,0 +1,69 @@
 +/*************************************************************************
 + *
@@ -5178,8 +5178,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XTitle.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XTitle.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XTitle.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XTitle.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XTitle.idl	(revision 266505)
 @@ -0,0 +1,119 @@
 +/*************************************************************************
 + *
@@ -5302,8 +5302,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XlBuildInDialog.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XlBuildInDialog.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XlBuildInDialog.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XlBuildInDialog.idl	(revision 266505)
 @@ -0,0 +1,280 @@
 +/*************************************************************************
 + *
@@ -5587,8 +5587,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/XStyles.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XStyles.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XStyles.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XStyles.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XStyles.idl	(revision 266505)
 @@ -0,0 +1,71 @@
 +/*************************************************************************
 + *
@@ -5663,8 +5663,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XCharts.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XCharts.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XCharts.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XCharts.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XCharts.idl	(revision 266505)
 @@ -0,0 +1,63 @@
 +/*************************************************************************
 + *
@@ -5731,8 +5731,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/makefile.mk
 ===================================================================
---- oovbaapi/ooo/vba/excel/makefile.mk	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/makefile.mk	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/makefile.mk	(revision 0)
++++ oovbaapi/ooo/vba/excel/makefile.mk	(revision 266505)
 @@ -0,0 +1,111 @@
 +#*************************************************************************
 +#
@@ -5847,8 +5847,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XComments.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XComments.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XComments.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XComments.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XComments.idl	(revision 266505)
 @@ -0,0 +1,58 @@
 +/*************************************************************************
 + *
@@ -5910,8 +5910,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XSeries.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XSeries.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XSeries.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XSeries.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XSeries.idl	(revision 266505)
 @@ -0,0 +1,63 @@
 +/*************************************************************************
 + *
@@ -5978,8 +5978,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XValidation.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XValidation.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XValidation.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XValidation.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XValidation.idl	(revision 266505)
 @@ -0,0 +1,71 @@
 +/*************************************************************************
 + *
@@ -6054,8 +6054,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XWindows.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XWindows.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XWindows.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XWindows.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XWindows.idl	(revision 266505)
 @@ -0,0 +1,59 @@
 +/*************************************************************************
 + *
@@ -6118,8 +6118,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XRange.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XRange.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XRange.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XRange.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XRange.idl	(revision 266505)
 @@ -0,0 +1,179 @@
 +/*************************************************************************
 + *
@@ -6302,8 +6302,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XBorders.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XBorders.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XBorders.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XBorders.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XBorders.idl	(revision 266505)
 @@ -0,0 +1,62 @@
 +/*************************************************************************
 + *
@@ -6369,8 +6369,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XChart.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XChart.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XChart.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XChart.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XChart.idl	(revision 266505)
 @@ -0,0 +1,90 @@
 +/*************************************************************************
 + *
@@ -6464,8 +6464,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XApplication.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XApplication.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XApplication.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XApplication.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XApplication.idl	(revision 266505)
 @@ -0,0 +1,119 @@
 +/*************************************************************************
 + *
@@ -6588,8 +6588,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XNames.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XNames.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XNames.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XNames.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XNames.idl	(revision 266505)
 @@ -0,0 +1,57 @@
 +/*************************************************************************
 + *
@@ -6650,8 +6650,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XHyperlink.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XHyperlink.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XHyperlink.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XHyperlink.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XHyperlink.idl	(revision 266505)
 @@ -0,0 +1,65 @@
 +/*************************************************************************
 + *
@@ -6720,8 +6720,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/Workbook.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/Workbook.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/Workbook.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/Workbook.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/Workbook.idl	(revision 266505)
 @@ -0,0 +1,49 @@
 +/*************************************************************************
 + *
@@ -6774,8 +6774,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/excel/XOLEObject.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XOLEObject.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XOLEObject.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XOLEObject.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XOLEObject.idl	(revision 266505)
 @@ -0,0 +1,66 @@
 +/*************************************************************************
 + *
@@ -6845,8 +6845,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XWindow.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XWindow.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XWindow.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XWindow.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XWindow.idl	(revision 266505)
 @@ -0,0 +1,107 @@
 +/*************************************************************************
 + *
@@ -6957,8 +6957,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XHPageBreaks.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XHPageBreaks.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XHPageBreaks.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XHPageBreaks.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XHPageBreaks.idl	(revision 266505)
 @@ -0,0 +1,70 @@
 +/*************************************************************************
 + *
@@ -7032,8 +7032,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XBorder.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XBorder.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XBorder.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XBorder.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XBorder.idl	(revision 266505)
 @@ -0,0 +1,62 @@
 +/*************************************************************************
 + *
@@ -7099,8 +7099,8 @@
 +
 Index: oovbaapi/ooo/vba/excel/XOutline.idl
 ===================================================================
---- oovbaapi/ooo/vba/excel/XOutline.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/excel/XOutline.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/excel/XOutline.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XOutline.idl	(revision 266505)
 @@ -0,0 +1,64 @@
 +/*************************************************************************
 + *
@@ -7168,8 +7168,8 @@
 +
 Index: oovbaapi/ooo/vba/XCommandBar.idl
 ===================================================================
---- oovbaapi/ooo/vba/XCommandBar.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/XCommandBar.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/XCommandBar.idl	(revision 0)
++++ oovbaapi/ooo/vba/XCommandBar.idl	(revision 266505)
 @@ -0,0 +1,64 @@
 +/*************************************************************************
 + *
@@ -7237,8 +7237,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/XCommandBarControl.idl
 ===================================================================
---- oovbaapi/ooo/vba/XCommandBarControl.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/XCommandBarControl.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/XCommandBarControl.idl	(revision 0)
++++ oovbaapi/ooo/vba/XCommandBarControl.idl	(revision 266505)
 @@ -0,0 +1,64 @@
 +/*************************************************************************
 + *
@@ -7306,8 +7306,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
 ===================================================================
---- oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl	(revision 0)
++++ oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl	(revision 266505)
 @@ -0,0 +1,49 @@
 +/*************************************************************************
 + *
@@ -7360,8 +7360,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/XAssistant.idl
 ===================================================================
---- oovbaapi/ooo/vba/XAssistant.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/XAssistant.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/XAssistant.idl	(revision 0)
++++ oovbaapi/ooo/vba/XAssistant.idl	(revision 266505)
 @@ -0,0 +1,65 @@
 +/*************************************************************************
 + *
@@ -7430,8 +7430,8 @@
 +#endif
 Index: oovbaapi/ooo/vba/XPropValue.idl
 ===================================================================
---- oovbaapi/ooo/vba/XPropValue.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/XPropValue.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/XPropValue.idl	(revision 0)
++++ oovbaapi/ooo/vba/XPropValue.idl	(revision 266505)
 @@ -0,0 +1,55 @@
 +/*************************************************************************
 + *
@@ -7490,8 +7490,8 @@
 +
 Index: oovbaapi/ooo/vba/constants/makefile.mk
 ===================================================================
---- oovbaapi/ooo/vba/constants/makefile.mk	ïrevision 0ï
-+++ oovbaapi/ooo/vba/constants/makefile.mk	ïrevision 265237ï
+--- oovbaapi/ooo/vba/constants/makefile.mk	(revision 0)
++++ oovbaapi/ooo/vba/constants/makefile.mk	(revision 266505)
 @@ -0,0 +1,69 @@
 +#*************************************************************************
 +#
@@ -7564,8 +7564,8 @@
 +
 Index: oovbaapi/ooo/vba/XErrObject.idl
 ===================================================================
---- oovbaapi/ooo/vba/XErrObject.idl	ïrevision 0ï
-+++ oovbaapi/ooo/vba/XErrObject.idl	ïrevision 265237ï
+--- oovbaapi/ooo/vba/XErrObject.idl	(revision 0)
++++ oovbaapi/ooo/vba/XErrObject.idl	(revision 266505)
 @@ -0,0 +1,58 @@
 +/*************************************************************************
 + *
@@ -7627,8 +7627,8 @@
 +#endif
 Index: scripting/source/dlgprov/dlgevtatt.cxx
 ===================================================================
---- scripting/source/dlgprov/dlgevtatt.cxx	ïrevision 264185ï
-+++ scripting/source/dlgprov/dlgevtatt.cxx	ïrevision 265237ï
+--- scripting/source/dlgprov/dlgevtatt.cxx	(revision 264185)
++++ scripting/source/dlgprov/dlgevtatt.cxx	(revision 266505)
 @@ -54,7 +54,7 @@
  #include <com/sun/star/beans/MethodConcept.hpp>
  #include <com/sun/star/beans/XMaterialHolder.hpp>
@@ -7658,8 +7658,8 @@
              
 Index: sc/source/filter/excel/excimp8.cxx
 ===================================================================
---- sc/source/filter/excel/excimp8.cxx	ïrevision 264185ï
-+++ sc/source/filter/excel/excimp8.cxx	ïrevision 265237ï
+--- sc/source/filter/excel/excimp8.cxx	(revision 264185)
++++ sc/source/filter/excel/excimp8.cxx	(revision 266505)
 @@ -254,7 +254,7 @@ bool lcl_hasVBAEnabled()
  	uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY);
  		// test if vba service is present
@@ -7671,8 +7671,8 @@
  }
 Index: sc/source/core/tool/compiler.cxx
 ===================================================================
---- sc/source/core/tool/compiler.cxx	ïrevision 264185ï
-+++ sc/source/core/tool/compiler.cxx	ïrevision 265237ï
+--- sc/source/core/tool/compiler.cxx	(revision 264185)
++++ sc/source/core/tool/compiler.cxx	(revision 266505)
 @@ -580,7 +580,34 @@ OpCode ScCompiler::GetEnglishOpCode( const String&
      return bFound ? (*iLook).second : OpCode(ocNone);
  }
@@ -7719,8 +7719,8 @@
          if ( pArr->nIndex
 Index: sc/source/ui/vba/vbapivotcache.cxx
 ===================================================================
---- sc/source/ui/vba/vbapivotcache.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapivotcache.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapivotcache.cxx	(revision 264185)
++++ sc/source/ui/vba/vbapivotcache.cxx	(revision 266505)
 @@ -31,9 +31,9 @@
  
  
@@ -7744,8 +7744,8 @@
  }
 Index: sc/source/ui/vba/vbaname.hxx
 ===================================================================
---- sc/source/ui/vba/vbaname.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaname.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaname.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaname.hxx	(revision 266505)
 @@ -30,13 +30,13 @@
  #ifndef SC_VBA_NAME_HXX
  #define SC_VBA_NAME_HXX
@@ -7788,8 +7788,8 @@
  	virtual void SAL_CALL Delete() throw (css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbaworkbooks.hxx
 ===================================================================
---- sc/source/ui/vba/vbaworkbooks.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaworkbooks.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaworkbooks.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaworkbooks.hxx	(revision 266505)
 @@ -32,26 +32,26 @@
  
  
@@ -7824,8 +7824,8 @@
  	// XEnumerationAccess
 Index: sc/source/ui/vba/vbacomments.hxx
 ===================================================================
---- sc/source/ui/vba/vbacomments.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacomments.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacomments.hxx	(revision 264185)
++++ sc/source/ui/vba/vbacomments.hxx	(revision 266505)
 @@ -32,18 +32,18 @@
  
  #include <cppuhelper/implbase1.hxx>
@@ -7850,8 +7850,8 @@
  
 Index: sc/source/ui/vba/vbaframe.hxx
 ===================================================================
---- sc/source/ui/vba/vbaframe.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbaframe.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaframe.hxx	(revision 0)
++++ sc/source/ui/vba/vbaframe.hxx	(revision 266505)
 @@ -0,0 +1,58 @@
 +/*************************************************************************
 + *
@@ -7913,8 +7913,8 @@
 +#endif //SC_VBA_LABEL_HXX
 Index: sc/source/ui/vba/vbafillformat.cxx
 ===================================================================
---- sc/source/ui/vba/vbafillformat.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbafillformat.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbafillformat.cxx	(revision 264185)
++++ sc/source/ui/vba/vbafillformat.cxx	(revision 266505)
 @@ -30,14 +30,14 @@
  #include <com/sun/star/beans/XPropertySet.hpp>
  #include <com/sun/star/awt/Gradient.hpp>
@@ -7944,8 +7944,8 @@
  }
 Index: sc/source/ui/vba/vbastyle.cxx
 ===================================================================
---- sc/source/ui/vba/vbastyle.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbastyle.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbastyle.cxx	(revision 264185)
++++ sc/source/ui/vba/vbastyle.cxx	(revision 266505)
 @@ -31,7 +31,7 @@
  #include "vbastyle.hxx"
  #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -7984,8 +7984,8 @@
  }
 Index: sc/source/ui/vba/vbacontrols.cxx
 ===================================================================
---- sc/source/ui/vba/vbacontrols.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacontrols.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacontrols.cxx	(revision 0)
++++ sc/source/ui/vba/vbacontrols.cxx	(revision 266505)
 @@ -0,0 +1,227 @@
 +/*************************************************************************
 + *
@@ -8073,7 +8073,7 @@
 +    
 +    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) 
 +    {
-+        return mControls.size();
++        return ( mControls.size() > 0 );
 +    }
 +    
 +    // XNameAcess 
@@ -8216,8 +8216,8 @@
 +}
 Index: sc/source/ui/vba/vbalineformat.hxx
 ===================================================================
---- sc/source/ui/vba/vbalineformat.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbalineformat.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbalineformat.hxx	(revision 264185)
++++ sc/source/ui/vba/vbalineformat.hxx	(revision 266505)
 @@ -32,10 +32,10 @@
  
  #include <com/sun/star/drawing/XShape.hpp>
@@ -8253,8 +8253,8 @@
  #endif//SC_VBA_XLINEFORMAT_HXX
 Index: sc/source/ui/vba/vbaseriescollection.cxx
 ===================================================================
---- sc/source/ui/vba/vbaseriescollection.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaseriescollection.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaseriescollection.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaseriescollection.cxx	(revision 266505)
 @@ -28,14 +28,14 @@
   *
   ************************************************************************/
@@ -8284,8 +8284,8 @@
  }
 Index: sc/source/ui/vba/vbacombobox.hxx
 ===================================================================
---- sc/source/ui/vba/vbacombobox.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacombobox.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacombobox.hxx	(revision 264185)
++++ sc/source/ui/vba/vbacombobox.hxx	(revision 266505)
 @@ -33,33 +33,30 @@
  #include <com/sun/star/uno/XComponentContext.hpp>
  #include <com/sun/star/beans/XPropertySet.hpp>
@@ -8349,8 +8349,8 @@
  #endif //
 Index: sc/source/ui/vba/vbatogglebutton.cxx
 ===================================================================
---- sc/source/ui/vba/vbatogglebutton.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbatogglebutton.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbatogglebutton.cxx	(revision 0)
++++ sc/source/ui/vba/vbatogglebutton.cxx	(revision 266505)
 @@ -0,0 +1,108 @@
 +/*************************************************************************
 + *
@@ -8462,8 +8462,8 @@
 +
 Index: sc/source/ui/vba/vbapivottable.hxx
 ===================================================================
---- sc/source/ui/vba/vbapivottable.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapivottable.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapivottable.hxx	(revision 264185)
++++ sc/source/ui/vba/vbapivottable.hxx	(revision 266505)
 @@ -32,18 +32,18 @@
  #include <cppuhelper/implbase1.hxx>
  #include <com/sun/star/uno/XComponentContext.hpp>
@@ -8488,8 +8488,8 @@
  	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
 Index: sc/source/ui/vba/vbalabel.cxx
 ===================================================================
---- sc/source/ui/vba/vbalabel.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbalabel.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbalabel.cxx	(revision 264185)
++++ sc/source/ui/vba/vbalabel.cxx	(revision 266505)
 @@ -31,11 +31,11 @@
  #include <vector>
  
@@ -8543,8 +8543,8 @@
 +}
 Index: sc/source/ui/vba/vbachartobjects.hxx
 ===================================================================
---- sc/source/ui/vba/vbachartobjects.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbachartobjects.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbachartobjects.hxx	(revision 264185)
++++ sc/source/ui/vba/vbachartobjects.hxx	(revision 266505)
 @@ -29,8 +29,8 @@
   ************************************************************************/
  #ifndef SC_VBA_CHARTOBJECTS_HXX
@@ -8583,8 +8583,8 @@
  	void removeByName(const rtl::OUString& _sChartName);
 Index: sc/source/ui/vba/vbaworksheet.hxx
 ===================================================================
---- sc/source/ui/vba/vbaworksheet.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaworksheet.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaworksheet.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaworksheet.hxx	(revision 266505)
 @@ -35,35 +35,37 @@
  
  #include <com/sun/star/sheet/XSpreadsheet.hpp>
@@ -8683,8 +8683,8 @@
  	virtual css::uno::Sequence<rtl::OUString> getServiceNames();	
 Index: sc/source/ui/vba/vbapagebreak.cxx
 ===================================================================
---- sc/source/ui/vba/vbapagebreak.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbapagebreak.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapagebreak.cxx	(revision 0)
++++ sc/source/ui/vba/vbapagebreak.cxx	(revision 266505)
 @@ -0,0 +1,141 @@
 +/*************************************************************************
 + *
@@ -8829,8 +8829,8 @@
 +
 Index: sc/source/ui/vba/vbashapes.cxx
 ===================================================================
---- sc/source/ui/vba/vbashapes.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbashapes.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbashapes.cxx	(revision 264185)
++++ sc/source/ui/vba/vbashapes.cxx	(revision 266505)
 @@ -30,14 +30,14 @@
  #include <com/sun/star/container/XNamed.hpp>
  #include <com/sun/star/view/XSelectionSupplier.hpp>
@@ -8896,8 +8896,8 @@
      uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW );
 Index: sc/source/ui/vba/vbapane.cxx
 ===================================================================
---- sc/source/ui/vba/vbapane.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapane.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapane.cxx	(revision 264185)
++++ sc/source/ui/vba/vbapane.cxx	(revision 266505)
 @@ -31,7 +31,7 @@
  #include<vbapane.hxx>
  
@@ -8909,9 +8909,9 @@
  ScVbaPane::ScVbaPane( uno::Reference< uno::XComponentContext > xContext, uno::Refrence< sheet::XViewPane > xViewPane )
 Index: sc/source/ui/vba/vbahelper.hxx
 ===================================================================
---- sc/source/ui/vba/vbahelper.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbahelper.hxx	ïrevision 265237ï
-@@ -31,20 +31,24 @@
+--- sc/source/ui/vba/vbahelper.hxx	(revision 264185)
++++ sc/source/ui/vba/vbahelper.hxx	(revision 266505)
+@@ -31,20 +31,25 @@
  #define SC_VBA_HELPER_HXX
  
  #include <com/sun/star/drawing/XShape.hpp>
@@ -8927,6 +8927,7 @@
  #include <docsh.hxx>
 +#include <sfx2/dispatch.hxx>
 +#include <ooo/vba/msforms/XShape.hpp>
++#include "cellsuno.hxx"
  
  namespace css = ::com::sun::star;
  
@@ -8938,7 +8939,7 @@
  	{
  		template < class T > 
  		css::uno::Reference< T > getXSomethingFromArgs( css::uno::Sequence< css::uno::Any > const & args, sal_Int32 nPos, bool bCanBeNull = true ) throw (css::lang::IllegalArgumentException)
-@@ -56,10 +60,12 @@ namespace css = ::com::sun::star;
+@@ -56,10 +61,12 @@ namespace css = ::com::sun::star;
  				throw css::lang::IllegalArgumentException();
  			return aSomething;
  		}
@@ -8951,7 +8952,7 @@
  		void implnCopy();
  		void implnPaste();
  		void implnCut();
-@@ -79,6 +85,7 @@ namespace css = ::com::sun::star;
+@@ -79,6 +86,7 @@ namespace css = ::com::sun::star;
  		// contains an empty object reference
  		const css::uno::Any& aNULL();
  		void PrintOutHelper( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, css::uno::Reference< css::frame::XModel >& xModel, sal_Bool bSelection  );
@@ -8959,7 +8960,21 @@
  
  		rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException );
  		rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic )
-@@ -136,6 +143,80 @@ class Millimeter
+@@ -86,6 +94,13 @@ namespace css = ::com::sun::star;
+ 	double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
+ 	double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
+ 
++
++class ScVbaCellRangeAccess
++{
++public:
++    static SfxItemSet* GetDataSet( ScCellRangeObj* pRangeObj );
++};
++
+ class Millimeter
+ {
+ //Factor to translate between points and hundredths of millimeters:
+@@ -136,6 +151,80 @@ class Millimeter
  		return points;
  	}
  };
@@ -9040,7 +9055,7 @@
  class ShapeHelper
  {
  protected:
-@@ -250,7 +331,7 @@ class DebugHelper
+@@ -250,7 +339,7 @@ class DebugHelper
  	} // openoffice
  } // org
  
@@ -9051,8 +9066,8 @@
  #  define SC_VBA_FIXME(a) OSL_TRACE( a )
 Index: sc/source/ui/vba/vbapictureformat.cxx
 ===================================================================
---- sc/source/ui/vba/vbapictureformat.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapictureformat.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapictureformat.cxx	(revision 264185)
++++ sc/source/ui/vba/vbapictureformat.cxx	(revision 266505)
 @@ -29,10 +29,10 @@
   ************************************************************************/
  #include "vbapictureformat.hxx"
@@ -9077,8 +9092,8 @@
  }
 Index: sc/source/ui/vba/vbacontrol.hxx
 ===================================================================
---- sc/source/ui/vba/vbacontrol.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacontrol.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacontrol.hxx	(revision 264185)
++++ sc/source/ui/vba/vbacontrol.hxx	(revision 266505)
 @@ -35,40 +35,34 @@
  #include <com/sun/star/uno/XComponentContext.hpp>
  #include <com/sun/star/script/XDefaultProperty.hpp>
@@ -9182,8 +9197,8 @@
  #endif//SC_VBA_CONTROL_HXX
 Index: sc/source/ui/vba/vbacommandbars.cxx
 ===================================================================
---- sc/source/ui/vba/vbacommandbars.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacommandbars.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacommandbars.cxx	(revision 0)
++++ sc/source/ui/vba/vbacommandbars.cxx	(revision 266505)
 @@ -0,0 +1,247 @@
 +/*************************************************************************
 + *
@@ -9357,7 +9372,7 @@
 +    {
 +        sName = rtl::OUString::createFromAscii("Custom1");
 +    }
-+    sal_Bool bTemporary;
++    sal_Bool bTemporary = false;
 +    if( !( Temporary >>= bTemporary ) )
 +    {
 +        bTemporary = sal_True;
@@ -9434,8 +9449,8 @@
 +
 Index: sc/source/ui/vba/vbaformat.cxx
 ===================================================================
---- sc/source/ui/vba/vbaformat.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaformat.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaformat.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaformat.cxx	(revision 266505)
 @@ -28,11 +28,11 @@
   *
   ************************************************************************/
@@ -9490,8 +9505,8 @@
  }
 Index: sc/source/ui/vba/makefile.mk
 ===================================================================
---- sc/source/ui/vba/makefile.mk	ïrevision 264185ï
-+++ sc/source/ui/vba/makefile.mk	ïrevision 265237ï
+--- sc/source/ui/vba/makefile.mk	(revision 264185)
++++ sc/source/ui/vba/makefile.mk	(revision 266505)
 @@ -83,13 +83,16 @@ SLOFILES= \
  		$(SLO)$/vbacombobox.obj \
  		$(SLO)$/vbavalidation.obj \
@@ -9541,8 +9556,8 @@
  .INCLUDE :	target.mk
 Index: sc/source/ui/vba/vbapivottables.cxx
 ===================================================================
---- sc/source/ui/vba/vbapivottables.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapivottables.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapivottables.cxx	(revision 264185)
++++ sc/source/ui/vba/vbapivottables.cxx	(revision 266505)
 @@ -30,11 +30,11 @@
  #include "vbapivottables.hxx"
  #include "vbapivottable.hxx"
@@ -9577,8 +9592,8 @@
  }
 Index: sc/source/ui/vba/vbapagesetup.cxx
 ===================================================================
---- sc/source/ui/vba/vbapagesetup.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbapagesetup.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapagesetup.cxx	(revision 0)
++++ sc/source/ui/vba/vbapagesetup.cxx	(revision 266505)
 @@ -0,0 +1,892 @@
 +/*************************************************************************
 + *
@@ -10474,8 +10489,8 @@
 +}
 Index: sc/source/ui/vba/vbaborders.cxx
 ===================================================================
---- sc/source/ui/vba/vbaborders.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaborders.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaborders.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaborders.cxx	(revision 266505)
 @@ -30,10 +30,10 @@
  #include "vbaborders.hxx"
  
@@ -10537,8 +10552,8 @@
  }
 Index: sc/source/ui/vba/vbarange.hxx
 ===================================================================
---- sc/source/ui/vba/vbarange.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbarange.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbarange.hxx	(revision 264185)
++++ sc/source/ui/vba/vbarange.hxx	(revision 266505)
 @@ -33,13 +33,13 @@
  #include <cppuhelper/implbase4.hxx>
  #include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -10559,9 +10574,11 @@
  
  #include <comphelper/proparrhlp.hxx>
  #include <comphelper/propertycontainer.hxx>
-@@ -59,8 +59,8 @@
+@@ -58,9 +58,10 @@
+ 
  class ScTableSheetsObj;
  class ScCellRangesBase;
++class ScCellRangeObj;
  
 -//typedef InheritedHelperInterfaceImpl1< oo::excel::XRange >  ScVbaRange_BASE;
 -typedef ScVbaFormat< oo::excel::XRange > ScVbaRange_BASE;
@@ -10570,7 +10587,7 @@
  
  class ArrayVisitor
  {
-@@ -89,18 +89,18 @@ class ValueGetter : public ArrayVisitor
+@@ -89,18 +90,18 @@ class ValueGetter : public ArrayVisitor
  
  class ScVbaRange : public ScVbaRange_BASE
  {
@@ -10593,13 +10610,14 @@
  
  	void fillSeries(  css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( css::uno::RuntimeException );	 
  
-@@ -109,27 +109,26 @@ class ScVbaRange : public ScVbaRange_BASE
+@@ -109,27 +110,27 @@ class ScVbaRange : public ScVbaRange_BASE
  	virtual css::uno::Any getValue( ValueGetter& rValueGetter ) throw (css::uno::RuntimeException);
  	virtual css::uno::Any getFormulaValue( ScGrammar::Grammar ) throw (css::uno::RuntimeException);
  	virtual void   setFormulaValue( const css::uno::Any& aValue, ScGrammar::Grammar ) throw ( css::uno::RuntimeException);
 -	css::uno::Reference< oo::excel::XRange > getArea( sal_Int32 nIndex  ) throw( css::uno::RuntimeException );
 +	css::uno::Reference< ov::excel::XRange > getArea( sal_Int32 nIndex  ) throw( css::uno::RuntimeException );
  	ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException );
++	ScCellRangeObj* getCellRangeObj( )  throw ( css::uno::RuntimeException );
  	SfxItemSet* getCurrentDataSet( )  throw ( css::uno::RuntimeException );
 -	css::uno::Reference< oo::vba::XCollection >& getBorders();
 +	css::uno::Reference< ov::XCollection >& getBorders();
@@ -10629,7 +10647,7 @@
  
      // Attributes
  	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-@@ -151,9 +150,9 @@ class ScVbaRange : public ScVbaRange_BASE
+@@ -151,9 +152,9 @@ class ScVbaRange : public ScVbaRange_BASE
  	virtual css::uno::Any SAL_CALL getMergeCells() throw (css::script::BasicErrorException, css::uno::RuntimeException);
  	virtual void SAL_CALL setWrapText( const css::uno::Any& bIsWrapped ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
  	virtual css::uno::Any SAL_CALL getWrapText() throw (css::script::BasicErrorException, css::uno::RuntimeException);
@@ -10642,7 +10660,7 @@
  	virtual css::uno::Any SAL_CALL getHidden() throw (css::uno::RuntimeException);
  	virtual void SAL_CALL setHidden( const css::uno::Any& _hidden ) throw (css::uno::RuntimeException);
  	virtual css::uno::Any SAL_CALL getColumnWidth() throw (css::uno::RuntimeException);
-@@ -165,16 +164,20 @@ class ScVbaRange : public ScVbaRange_BASE
+@@ -165,16 +166,20 @@ class ScVbaRange : public ScVbaRange_BASE
  	virtual css::uno::Any SAL_CALL getTop() throw (css::uno::RuntimeException);
  	virtual css::uno::Any SAL_CALL getLeft() throw (css::uno::RuntimeException);
  	
@@ -10666,7 +10684,7 @@
  	virtual void SAL_CALL Clear() throw (css::uno::RuntimeException);
  	virtual void SAL_CALL ClearComments() throw (css::uno::RuntimeException);
  	virtual void SAL_CALL ClearContents() throw (css::uno::RuntimeException);
-@@ -184,35 +187,36 @@ class ScVbaRange : public ScVbaRange_BASE
+@@ -184,35 +189,36 @@ class ScVbaRange : public ScVbaRange_BASE
  	virtual void SAL_CALL FillRight() throw (css::uno::RuntimeException);
  	virtual void SAL_CALL FillUp() throw (css::uno::RuntimeException);
  	virtual void SAL_CALL FillDown() throw (css::uno::RuntimeException);
@@ -10716,7 +10734,7 @@
  	virtual void SAL_CALL Delete( const css::uno::Any& Shift ) throw (css::uno::RuntimeException);
  	virtual css::uno::Any SAL_CALL Areas( const css::uno::Any& ) throw (css::uno::RuntimeException);
  	virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& ) throw ( css::script::BasicErrorException, css::uno::RuntimeException);
-@@ -227,10 +231,10 @@ class ScVbaRange : public ScVbaRange_BASE
+@@ -227,10 +233,10 @@ class ScVbaRange : public ScVbaRange_BASE
  	virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) throw (css::uno::RuntimeException);
  	virtual void SAL_CALL Autofit() throw (css::uno::RuntimeException);
  	virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException);
@@ -10729,7 +10747,7 @@
  	virtual void SAL_CALL ClearOutline(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
  	virtual void SAL_CALL Ungroup(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
  	virtual void SAL_CALL Group(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-@@ -238,16 +242,17 @@ class ScVbaRange : public ScVbaRange_BASE
+@@ -238,16 +244,17 @@ class ScVbaRange : public ScVbaRange_BASE
  	virtual void SAL_CALL UnMerge(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
  	virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException);
  	virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException);
@@ -10750,7 +10768,7 @@
  
  	}
  	virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException);
-@@ -264,9 +269,9 @@ class ScVbaRange : public ScVbaRange_BASE
+@@ -264,9 +271,9 @@ class ScVbaRange : public ScVbaRange_BASE
  //     * or a list of address ( multi-area )
  //     * object should be a lightweight as possible
  //     * we shouldn't need hacks like this below
@@ -10765,8 +10783,8 @@
  	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
 Index: sc/source/ui/vba/vbaworkbook.hxx
 ===================================================================
---- sc/source/ui/vba/vbaworkbook.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaworkbook.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaworkbook.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaworkbook.hxx	(revision 266505)
 @@ -31,12 +31,12 @@
  #define SC_VBA_WORKBOOK_HXX
  
@@ -10814,8 +10832,8 @@
  	virtual void SAL_CALL ResetColors(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbatextbox.hxx
 ===================================================================
---- sc/source/ui/vba/vbatextbox.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbatextbox.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbatextbox.hxx	(revision 264185)
++++ sc/source/ui/vba/vbatextbox.hxx	(revision 266505)
 @@ -30,24 +30,28 @@
  #ifndef SC_VBA_TEXTBOX_HXX
  #define SC_VBA_TEXTBOX_HXX
@@ -10852,8 +10870,8 @@
  #endif //SC_VBA_TEXTBOX_HXX
 Index: sc/source/ui/vba/vbaformatcondition.hxx
 ===================================================================
---- sc/source/ui/vba/vbaformatcondition.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaformatcondition.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaformatcondition.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaformatcondition.hxx	(revision 266505)
 @@ -29,9 +29,9 @@
   ************************************************************************/
  #ifndef SC_VBA_FORMATCONDITION_HXX
@@ -10904,8 +10922,8 @@
  	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
 Index: sc/source/ui/vba/vbaaxis.cxx
 ===================================================================
---- sc/source/ui/vba/vbaaxis.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaaxis.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaaxis.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaaxis.cxx	(revision 266505)
 @@ -29,21 +29,21 @@
   ************************************************************************/
  
@@ -10990,8 +11008,8 @@
  }
 Index: sc/source/ui/vba/vbashape.hxx
 ===================================================================
---- sc/source/ui/vba/vbashape.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbashape.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbashape.hxx	(revision 264185)
++++ sc/source/ui/vba/vbashape.hxx	(revision 266505)
 @@ -30,38 +30,39 @@
  #ifndef SC_VBA_SHAPE_HXX
  #define SC_VBA_SHAPE_HXX
@@ -11058,8 +11076,8 @@
      virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException);
 Index: sc/source/ui/vba/service.cxx
 ===================================================================
---- sc/source/ui/vba/service.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/service.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/service.cxx	(revision 264185)
++++ sc/source/ui/vba/service.cxx	(revision 266505)
 @@ -53,13 +53,23 @@ namespace  worksheet
  {
  extern sdecl::ServiceDecl const serviceDecl;
@@ -11118,8 +11136,8 @@
      }
 Index: sc/source/ui/vba/vbauserform.hxx
 ===================================================================
---- sc/source/ui/vba/vbauserform.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbauserform.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbauserform.hxx	(revision 0)
++++ sc/source/ui/vba/vbauserform.hxx	(revision 266505)
 @@ -0,0 +1,78 @@
 +/*************************************************************************
 + *
@@ -11201,8 +11219,8 @@
 +#endif
 Index: sc/source/ui/vba/vbanames.hxx
 ===================================================================
---- sc/source/ui/vba/vbanames.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbanames.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbanames.hxx	(revision 264185)
++++ sc/source/ui/vba/vbanames.hxx	(revision 266505)
 @@ -30,13 +30,13 @@
  #ifndef SC_VBA_NAMES_HXX
  #define SC_VBA_NAMES_HXX
@@ -11231,8 +11249,8 @@
  	ScDocShell* getScDocShell();
 Index: sc/source/ui/vba/vbacommandbarcontrol.hxx
 ===================================================================
---- sc/source/ui/vba/vbacommandbarcontrol.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacommandbarcontrol.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacommandbarcontrol.hxx	(revision 0)
++++ sc/source/ui/vba/vbacommandbarcontrol.hxx	(revision 266505)
 @@ -0,0 +1,90 @@
 +/*************************************************************************
 + *
@@ -11326,8 +11344,8 @@
 +#endif//SC_VBA_COMMANDBARCONTROL_HXX
 Index: sc/source/ui/vba/vbaaxistitle.hxx
 ===================================================================
---- sc/source/ui/vba/vbaaxistitle.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaaxistitle.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaaxistitle.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaaxistitle.hxx	(revision 266505)
 @@ -32,14 +32,14 @@
  
  #include "vbatitle.hxx"
@@ -11348,8 +11366,8 @@
          virtual css::uno::Sequence<rtl::OUString> getServiceNames();
 Index: sc/source/ui/vba/vbacharacters.cxx
 ===================================================================
---- sc/source/ui/vba/vbacharacters.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacharacters.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacharacters.cxx	(revision 264185)
++++ sc/source/ui/vba/vbacharacters.cxx	(revision 266505)
 @@ -33,10 +33,10 @@
  #include "vbafont.hxx"
  
@@ -11363,19 +11381,20 @@
  {
  	Start >>= nStart;
  	if ( nStart < 1 )
-@@ -46,7 +46,11 @@ using namespace ::com::sun::star;
+@@ -46,7 +46,12 @@ using namespace ::com::sun::star;
  	uno::Reference< text::XTextCursor > xTextCursor( m_xSimpleText->createTextCursor(), uno::UNO_QUERY_THROW );
  	xTextCursor->collapseToStart();
  	if ( nStart )
 +	{
-+		if ( ( nStart + 1 ) > xRange->getString().getLength() )
-+			nStart = xRange->getString().getLength();
++		if ( ( nStart + 1 ) > m_xSimpleText->getString().getLength() )
++			//nStart = m_xSimpleText->getString().getLength();
++			xTextCursor->gotoEnd( sal_False );
  		xTextCursor->goRight( nStart, sal_False );
 +	}
  	if ( nLength < 0 ) // expand to end
  		xTextCursor->gotoEnd( sal_True );
  	else
-@@ -127,7 +131,7 @@ ScVbaCharacters::getServiceNames()
+@@ -127,7 +132,7 @@ ScVbaCharacters::getServiceNames()
  	if ( aServiceNames.getLength() == 0 )
  	{
  		aServiceNames.realloc( 1 );
@@ -11386,8 +11405,8 @@
  }
 Index: sc/source/ui/vba/vbapropvalue.hxx
 ===================================================================
---- sc/source/ui/vba/vbapropvalue.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapropvalue.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapropvalue.hxx	(revision 264185)
++++ sc/source/ui/vba/vbapropvalue.hxx	(revision 266505)
 @@ -29,12 +29,12 @@
   ************************************************************************/
  #ifndef SC_VBA_PROPVALULE_HXX
@@ -11405,8 +11424,8 @@
  {
 Index: sc/source/ui/vba/vbastyles.cxx
 ===================================================================
---- sc/source/ui/vba/vbastyles.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbastyles.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbastyles.cxx	(revision 264185)
++++ sc/source/ui/vba/vbastyles.cxx	(revision 266505)
 @@ -30,12 +30,12 @@
  #include "vbastyles.hxx"
  #include "vbastyle.hxx"
@@ -11458,8 +11477,8 @@
  }
 Index: sc/source/ui/vba/vbaformatconditions.hxx
 ===================================================================
---- sc/source/ui/vba/vbaformatconditions.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaformatconditions.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaformatconditions.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaformatconditions.hxx	(revision 266505)
 @@ -29,33 +29,33 @@
   ************************************************************************/
  #ifndef SC_VBA_FORMATCONDITIONS_HXX
@@ -11505,8 +11524,8 @@
  	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);	
 Index: sc/source/ui/vba/vbaprogressbar.cxx
 ===================================================================
---- sc/source/ui/vba/vbaprogressbar.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbaprogressbar.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaprogressbar.cxx	(revision 0)
++++ sc/source/ui/vba/vbaprogressbar.cxx	(revision 266505)
 @@ -0,0 +1,78 @@
 +/*************************************************************************
 + *
@@ -11588,8 +11607,8 @@
 +}
 Index: sc/source/ui/vba/vbaoleobjects.cxx
 ===================================================================
---- sc/source/ui/vba/vbaoleobjects.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaoleobjects.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaoleobjects.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaoleobjects.cxx	(revision 266505)
 @@ -31,13 +31,13 @@
  #include <com/sun/star/container/XEnumerationAccess.hpp>
  #include <com/sun/star/drawing/XControlShape.hpp>
@@ -11668,8 +11687,8 @@
  }
 Index: sc/source/ui/vba/vbacharts.hxx
 ===================================================================
---- sc/source/ui/vba/vbacharts.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacharts.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacharts.hxx	(revision 264185)
++++ sc/source/ui/vba/vbacharts.hxx	(revision 266505)
 @@ -29,30 +29,30 @@
   ************************************************************************/
  #ifndef SC_VBA_CHARTS_HXX
@@ -11709,8 +11728,8 @@
  	// Charts_BASE or HelperInterface
 Index: sc/source/ui/vba/vbapivotcache.hxx
 ===================================================================
---- sc/source/ui/vba/vbapivotcache.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapivotcache.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapivotcache.hxx	(revision 264185)
++++ sc/source/ui/vba/vbapivotcache.hxx	(revision 266505)
 @@ -33,16 +33,16 @@
  #include <com/sun/star/uno/XComponentContext.hpp>
  #include <com/sun/star/sheet/XDataPilotTable.hpp>
@@ -11733,8 +11752,8 @@
  	virtual rtl::OUString& getServiceImplName();
 Index: sc/source/ui/vba/vbapalette.cxx
 ===================================================================
---- sc/source/ui/vba/vbapalette.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapalette.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapalette.cxx	(revision 264185)
++++ sc/source/ui/vba/vbapalette.cxx	(revision 266505)
 @@ -33,7 +33,7 @@
  
  
@@ -11746,8 +11765,8 @@
  #define EXC_PALETTE_EGA_COLORS_LIGHT \
 Index: sc/source/ui/vba/vbawsfunction.cxx
 ===================================================================
---- sc/source/ui/vba/vbawsfunction.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbawsfunction.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbawsfunction.cxx	(revision 264185)
++++ sc/source/ui/vba/vbawsfunction.cxx	(revision 266505)
 @@ -42,13 +42,14 @@
  #include <comphelper/anytostring.hxx>
  
@@ -11816,8 +11835,8 @@
  }
 Index: sc/source/ui/vba/vbacomment.cxx
 ===================================================================
---- sc/source/ui/vba/vbacomment.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacomment.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacomment.cxx	(revision 264185)
++++ sc/source/ui/vba/vbacomment.cxx	(revision 266505)
 @@ -29,7 +29,7 @@
   ************************************************************************/
  #include "vbacomment.hxx"
@@ -11860,8 +11879,8 @@
  }
 Index: sc/source/ui/vba/vbafillformat.hxx
 ===================================================================
---- sc/source/ui/vba/vbafillformat.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbafillformat.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbafillformat.hxx	(revision 264185)
++++ sc/source/ui/vba/vbafillformat.hxx	(revision 266505)
 @@ -32,17 +32,17 @@
  
  #include <com/sun/star/drawing/XShape.hpp>
@@ -11905,8 +11924,8 @@
  
 Index: sc/source/ui/vba/vbastyle.hxx
 ===================================================================
---- sc/source/ui/vba/vbastyle.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbastyle.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbastyle.hxx	(revision 264185)
++++ sc/source/ui/vba/vbastyle.hxx	(revision 266505)
 @@ -29,14 +29,14 @@
   ************************************************************************/
  #ifndef SC_VBA_STYLE_HXX
@@ -11954,8 +11973,8 @@
  	virtual void SAL_CALL setNumberFormatLocal( const css::uno::Any& NumberFormatLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
 Index: sc/source/ui/vba/vbaoleobject.cxx
 ===================================================================
---- sc/source/ui/vba/vbaoleobject.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaoleobject.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaoleobject.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaoleobject.cxx	(revision 266505)
 @@ -37,7 +37,7 @@
  #include "vbaoleobject.hxx"
  
@@ -11985,8 +12004,8 @@
  }
 Index: sc/source/ui/vba/vbawindow.cxx
 ===================================================================
---- sc/source/ui/vba/vbawindow.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbawindow.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbawindow.cxx	(revision 264185)
++++ sc/source/ui/vba/vbawindow.cxx	(revision 266505)
 @@ -27,6 +27,7 @@
   * for a copy of the LGPLv3 License.
   *
@@ -12349,8 +12368,8 @@
 +}
 Index: sc/source/ui/vba/vbacontrols.hxx
 ===================================================================
---- sc/source/ui/vba/vbacontrols.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacontrols.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacontrols.hxx	(revision 0)
++++ sc/source/ui/vba/vbacontrols.hxx	(revision 266505)
 @@ -0,0 +1,62 @@
 +/*************************************************************************
 + *
@@ -12416,8 +12435,8 @@
 +
 Index: sc/source/ui/vba/vbaseriescollection.hxx
 ===================================================================
---- sc/source/ui/vba/vbaseriescollection.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaseriescollection.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaseriescollection.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaseriescollection.hxx	(revision 266505)
 @@ -30,20 +30,20 @@
  #ifndef SC_VBA_SERIESCOLLECTION_HXX
  #define SC_VBA_SERIESCOLLECTION_HXX
@@ -12444,8 +12463,8 @@
  	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbalistcontrolhelper.cxx
 ===================================================================
---- sc/source/ui/vba/vbalistcontrolhelper.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbalistcontrolhelper.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbalistcontrolhelper.cxx	(revision 0)
++++ sc/source/ui/vba/vbalistcontrolhelper.cxx	(revision 266505)
 @@ -0,0 +1,145 @@
 +#include <vbalistcontrolhelper.hxx>
 +
@@ -12594,8 +12613,8 @@
 +}
 Index: sc/source/ui/vba/vbacollectionimpl.cxx
 ===================================================================
---- sc/source/ui/vba/vbacollectionimpl.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacollectionimpl.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacollectionimpl.cxx	(revision 264185)
++++ sc/source/ui/vba/vbacollectionimpl.cxx	(revision 266505)
 @@ -30,7 +30,7 @@
  #include <vbacollectionimpl.hxx>
  #include "vbaglobals.hxx"
@@ -12607,8 +12626,8 @@
  ScVbaCollectionBaseImpl::ScVbaCollectionBaseImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : m_xContext( xContext ), m_xIndexAccess( xIndexAccess )
 Index: sc/source/ui/vba/vbatogglebutton.hxx
 ===================================================================
---- sc/source/ui/vba/vbatogglebutton.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbatogglebutton.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbatogglebutton.hxx	(revision 0)
++++ sc/source/ui/vba/vbatogglebutton.hxx	(revision 266505)
 @@ -0,0 +1,63 @@
 +/*************************************************************************
 + *
@@ -12675,8 +12694,8 @@
 +#endif //SC_VBA_TOGGLEBUTTON_HXX
 Index: sc/source/ui/vba/vbalistbox.cxx
 ===================================================================
---- sc/source/ui/vba/vbalistbox.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbalistbox.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbalistbox.cxx	(revision 264185)
++++ sc/source/ui/vba/vbalistbox.cxx	(revision 266505)
 @@ -33,35 +33,54 @@
  #include "vbapropvalue.hxx"
  #include <vector>
@@ -12766,7 +12785,7 @@
  	return result;
  }
  
-@@ -125,106 +143,43 @@ ScVbaListBox::setMultiSelect( sal_Bool _multiselec
+@@ -125,106 +143,45 @@ ScVbaListBox::setMultiSelect( sal_Bool _multiselec
  {
      m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ), uno::makeAny( _multiselect ) );
  }
@@ -12801,12 +12820,15 @@
      sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
 -    sal_Int16 nIndex = m_nIndex;
 -    if( 0 > nIndex && nLength < nIndex )
-+    sal_Int16 nIndex( index );
++    // no choice but to do a horror cast as internally
++    // the indices are but sal_Int16 
++    sal_Int16 nIndex = static_cast< sal_Int16 >( index );
 +    if( nIndex < 0 || nIndex >= nLength )
          throw uno::RuntimeException( rtl::OUString::createFromAscii(
                      "Error Number." ), uno::Reference< uno::XInterface >() );
-     m_nIndex = static_cast< sal_Int16 >( index );
+-    m_nIndex = static_cast< sal_Int16 >( index );
 -    return uno::makeAny( uno::Reference< vba::XPropValue > ( new ScVbaPropValue( this ) ) );
++    m_nIndex = nIndex;
 +    return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
  }
  
@@ -12886,7 +12908,7 @@
  //PropListener
  void 
  ScVbaListBox::setValueEvent( const uno::Any& value )
-@@ -234,7 +189,7 @@ ScVbaListBox::setValueEvent( const uno::Any& value
+@@ -234,7 +191,7 @@ ScVbaListBox::setValueEvent( const uno::Any& value
          throw uno::RuntimeException( rtl::OUString::createFromAscii(
                      "Invalid type\n. need boolean." ), uno::Reference< uno::XInterface >() );
      uno::Sequence< sal_Int16 > nList;
@@ -12895,7 +12917,7 @@
      sal_Int16 nLength = static_cast<sal_Int16>( nList.getLength() );
      sal_Int16 nIndex = m_nIndex;
      for( sal_Int16 i = 0; i < nLength; i++ )
-@@ -250,7 +205,8 @@ ScVbaListBox::setValueEvent( const uno::Any& value
+@@ -250,7 +207,8 @@ ScVbaListBox::setValueEvent( const uno::Any& value
                      nList[i] = nList[i + 1];
                  }
                  nList.realloc( nLength - 1 );
@@ -12905,7 +12927,7 @@
                  return;
              }
          }
-@@ -271,6 +227,10 @@ ScVbaListBox::setValueEvent( const uno::Any& value
+@@ -271,6 +229,10 @@ ScVbaListBox::setValueEvent( const uno::Any& value
      }
  }
  
@@ -12916,7 +12938,7 @@
  css::uno::Any 
  ScVbaListBox::getValueEvent()
  {
-@@ -287,3 +247,41 @@ ScVbaListBox::getValueEvent()
+@@ -287,3 +249,41 @@ ScVbaListBox::getValueEvent()
  
      return uno::makeAny( sal_False );
  }
@@ -12960,8 +12982,8 @@
 +}
 Index: sc/source/ui/vba/vbalabel.hxx
 ===================================================================
---- sc/source/ui/vba/vbalabel.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbalabel.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbalabel.hxx	(revision 264185)
++++ sc/source/ui/vba/vbalabel.hxx	(revision 266505)
 @@ -30,20 +30,27 @@
  #ifndef SC_VBA_LABEL_HXX
  #define SC_VBA_LABEL_HXX
@@ -12996,8 +13018,8 @@
  #endif //SC_VBA_LABEL_HXX
 Index: sc/source/ui/vba/vbapagebreak.hxx
 ===================================================================
---- sc/source/ui/vba/vbapagebreak.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbapagebreak.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapagebreak.hxx	(revision 0)
++++ sc/source/ui/vba/vbapagebreak.hxx	(revision 266505)
 @@ -0,0 +1,87 @@
 +/*************************************************************************
 + *
@@ -13088,8 +13110,8 @@
 +#endif
 Index: sc/source/ui/vba/vbamultipage.cxx
 ===================================================================
---- sc/source/ui/vba/vbamultipage.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbamultipage.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbamultipage.cxx	(revision 0)
++++ sc/source/ui/vba/vbamultipage.cxx	(revision 266505)
 @@ -0,0 +1,132 @@
 +/*************************************************************************
 + *
@@ -13225,8 +13247,8 @@
 +}
 Index: sc/source/ui/vba/vbashapes.hxx
 ===================================================================
---- sc/source/ui/vba/vbashapes.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbashapes.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbashapes.hxx	(revision 264185)
++++ sc/source/ui/vba/vbashapes.hxx	(revision 266505)
 @@ -33,13 +33,13 @@
  #include <com/sun/star/drawing/XShapes.hpp>
  #include <com/sun/star/drawing/XDrawPage.hpp>
@@ -13267,8 +13289,8 @@
      virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbapane.hxx
 ===================================================================
---- sc/source/ui/vba/vbapane.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapane.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapane.hxx	(revision 264185)
++++ sc/source/ui/vba/vbapane.hxx	(revision 266505)
 @@ -32,11 +32,11 @@
  
  #include<cppuhelper/implbase1.hxx>
@@ -13285,8 +13307,8 @@
  {
 Index: sc/source/ui/vba/vbapictureformat.hxx
 ===================================================================
---- sc/source/ui/vba/vbapictureformat.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapictureformat.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapictureformat.hxx	(revision 264185)
++++ sc/source/ui/vba/vbapictureformat.hxx	(revision 266505)
 @@ -32,10 +32,10 @@
  
  #include <com/sun/star/drawing/XShape.hpp>
@@ -13311,8 +13333,8 @@
      virtual double SAL_CALL getBrightness() throw (css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbawindows.cxx
 ===================================================================
---- sc/source/ui/vba/vbawindows.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbawindows.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbawindows.cxx	(revision 264185)
++++ sc/source/ui/vba/vbawindows.cxx	(revision 266505)
 @@ -40,16 +40,16 @@
  //#include "vbaworkbook.hxx"
  
@@ -13376,8 +13398,8 @@
  }
 Index: sc/source/ui/vba/vbaradiobutton.cxx
 ===================================================================
---- sc/source/ui/vba/vbaradiobutton.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaradiobutton.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaradiobutton.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaradiobutton.cxx	(revision 266505)
 @@ -31,12 +31,12 @@
  #include <vector>
  
@@ -13455,8 +13477,8 @@
 +}
 Index: sc/source/ui/vba/vbacommandbars.hxx
 ===================================================================
---- sc/source/ui/vba/vbacommandbars.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacommandbars.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacommandbars.hxx	(revision 0)
++++ sc/source/ui/vba/vbacommandbars.hxx	(revision 266505)
 @@ -0,0 +1,79 @@
 +/*************************************************************************
 + *
@@ -13539,8 +13561,8 @@
 +#endif//SC_VBA_COMMANDBARS_HXX
 Index: sc/source/ui/vba/vbaformat.hxx
 ===================================================================
---- sc/source/ui/vba/vbaformat.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaformat.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaformat.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaformat.hxx	(revision 266505)
 @@ -29,7 +29,7 @@
   ************************************************************************/
  #ifndef SC_VBA_FORMAT_HXX
@@ -13573,8 +13595,8 @@
  	virtual void SAL_CALL setNumberFormatLocal( const css::uno::Any& NumberFormatLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbaworksheets.cxx
 ===================================================================
---- sc/source/ui/vba/vbaworksheets.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaworksheets.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaworksheets.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaworksheets.cxx	(revision 266505)
 @@ -48,7 +48,7 @@
  #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
  #include <com/sun/star/beans/XPropertySet.hpp>
@@ -13639,8 +13661,8 @@
  }
 Index: sc/source/ui/vba/vbatextframe.cxx
 ===================================================================
---- sc/source/ui/vba/vbatextframe.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbatextframe.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbatextframe.cxx	(revision 264185)
++++ sc/source/ui/vba/vbatextframe.cxx	(revision 266505)
 @@ -32,10 +32,10 @@
  #include "vbatextframe.hxx"
  #include "vbacharacters.hxx"
@@ -13682,8 +13704,8 @@
  }
 Index: sc/source/ui/vba/vbadialog.cxx
 ===================================================================
---- sc/source/ui/vba/vbadialog.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbadialog.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbadialog.cxx	(revision 264185)
++++ sc/source/ui/vba/vbadialog.cxx	(revision 266505)
 @@ -31,7 +31,7 @@
  
  #include <com/sun/star/lang/XMultiComponentFactory.hpp>
@@ -13713,8 +13735,8 @@
  }
 Index: sc/source/ui/vba/vbapages.cxx
 ===================================================================
---- sc/source/ui/vba/vbapages.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbapages.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapages.cxx	(revision 0)
++++ sc/source/ui/vba/vbapages.cxx	(revision 266505)
 @@ -0,0 +1,81 @@
 +/*************************************************************************
 + *
@@ -13799,8 +13821,8 @@
 +}
 Index: sc/source/ui/vba/vbapivottables.hxx
 ===================================================================
---- sc/source/ui/vba/vbapivottables.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapivottables.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapivottables.hxx	(revision 264185)
++++ sc/source/ui/vba/vbapivottables.hxx	(revision 266505)
 @@ -32,7 +32,7 @@
  
  #include <cppuhelper/implbase1.hxx>
@@ -13829,8 +13851,8 @@
  	// XEnumerationAccess
 Index: sc/source/ui/vba/vbapagesetup.hxx
 ===================================================================
---- sc/source/ui/vba/vbapagesetup.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbapagesetup.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapagesetup.hxx	(revision 0)
++++ sc/source/ui/vba/vbapagesetup.hxx	(revision 266505)
 @@ -0,0 +1,104 @@
 +/*************************************************************************
 + *
@@ -13938,8 +13960,8 @@
 +#endif
 Index: sc/source/ui/vba/vbaapplication.cxx
 ===================================================================
---- sc/source/ui/vba/vbaapplication.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaapplication.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaapplication.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaapplication.cxx	(revision 266505)
 @@ -34,14 +34,15 @@
  #include <com/sun/star/sheet/XSpreadsheets.hpp>
  #include<com/sun/star/view/XSelectionSupplier.hpp>
@@ -14539,8 +14561,8 @@
  }
 Index: sc/source/ui/vba/vbapagebreaks.cxx
 ===================================================================
---- sc/source/ui/vba/vbapagebreaks.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbapagebreaks.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapagebreaks.cxx	(revision 0)
++++ sc/source/ui/vba/vbapagebreaks.cxx	(revision 266505)
 @@ -0,0 +1,269 @@
 +/*************************************************************************
 + *
@@ -14813,8 +14835,8 @@
 +
 Index: sc/source/ui/vba/vbaspinbutton.cxx
 ===================================================================
---- sc/source/ui/vba/vbaspinbutton.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbaspinbutton.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaspinbutton.cxx	(revision 0)
++++ sc/source/ui/vba/vbaspinbutton.cxx	(revision 266505)
 @@ -0,0 +1,109 @@
 +/*************************************************************************
 + *
@@ -14927,8 +14949,8 @@
 +}
 Index: sc/source/ui/vba/vbaborders.hxx
 ===================================================================
---- sc/source/ui/vba/vbaborders.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaborders.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaborders.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaborders.hxx	(revision 266505)
 @@ -31,7 +31,7 @@
  #define SC_VBA_BORDERS_HXX
  
@@ -14958,8 +14980,8 @@
  	// XEnumerationAccess
 Index: sc/source/ui/vba/vbahyperlink.cxx
 ===================================================================
---- sc/source/ui/vba/vbahyperlink.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbahyperlink.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbahyperlink.cxx	(revision 0)
++++ sc/source/ui/vba/vbahyperlink.cxx	(revision 266505)
 @@ -0,0 +1,139 @@
 +/*************************************************************************
 + *
@@ -15102,9 +15124,9 @@
 +}
 Index: sc/source/ui/vba/vbafont.cxx
 ===================================================================
---- sc/source/ui/vba/vbafont.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbafont.cxx	ïrevision 265237ï
-@@ -32,13 +32,17 @@
+--- sc/source/ui/vba/vbafont.cxx	(revision 264185)
++++ sc/source/ui/vba/vbafont.cxx	(revision 266505)
+@@ -32,13 +32,18 @@
  #include <com/sun/star/awt/FontUnderline.hpp>
  #include <com/sun/star/awt/FontStrikeout.hpp>
  #include <com/sun/star/awt/FontSlant.hpp>
@@ -15119,21 +15141,34 @@
  #include <svtools/itemset.hxx>
  #include "vbafont.hxx"
  #include "scitems.hxx"
++#include "cellsuno.hxx"
  
 -using namespace ::org::openoffice;
 +using namespace ::ooo::vba;
  using namespace ::com::sun::star;
  
  // use local constants there is no need to expose these constants
-@@ -64,14 +68,46 @@ const sal_Int8 SUBSCRIPTHEIGHT = 58;
+@@ -64,14 +69,58 @@ const sal_Int8 SUBSCRIPTHEIGHT = 58;
  // specifies a hight of normal font
  const short NORMALHEIGHT = 100;
  
 -ScVbaFont::ScVbaFont( const uno::Reference< vba::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, uno::Reference< beans::XPropertySet > xPropertySet, SfxItemSet* pDataSet  ) throw ( uno::RuntimeException ) : ScVbaFont_BASE( xParent, xContext ), mxFont( xPropertySet, css::uno::UNO_QUERY_THROW ), mPalette( dPalette ),  mpDataSet( pDataSet )
-+ScVbaFont::ScVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, uno::Reference< beans::XPropertySet > xPropertySet, SfxItemSet* pDataSet  ) throw ( uno::RuntimeException ) : ScVbaFont_BASE( xParent, xContext ), mxFont( xPropertySet, css::uno::UNO_QUERY_THROW ), mPalette( dPalette ),  mpDataSet( pDataSet )
++ScVbaFont::ScVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, uno::Reference< beans::XPropertySet > xPropertySet, ScCellRangeObj* pRangeObj  ) throw ( uno::RuntimeException ) : ScVbaFont_BASE( xParent, xContext ), mxFont( xPropertySet, css::uno::UNO_QUERY_THROW ), mPalette( dPalette ),  mpRangeObj( pRangeObj )
  {
  }
  
++SfxItemSet*  
++ScVbaFont::GetDataSet()
++{
++    SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( mpRangeObj );
++    return pDataSet;
++}
++
++ScVbaFont::~ScVbaFont()
++{
++}
++
++
 +uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table::XCell >& xIf ) throw ( uno::RuntimeException )
 +{
 +	uno::Reference< text::XTextRange > xTxtRange( xIf, uno::UNO_QUERY_THROW );
@@ -15173,7 +15208,7 @@
  	sal_Bool bValue = sal_False;
  	aValue >>= bValue;
  	sal_Int16 nValue = NORMAL;
-@@ -82,21 +118,68 @@ ScVbaFont::setSuperscript( const uno::Any& aValue
+@@ -82,21 +131,68 @@ ScVbaFont::setSuperscript( const uno::Any& aValue
  		nValue = SUPERSCRIPT;
  	        nValue2 = SUPERSCRIPTHEIGHT;
  	}
@@ -15245,7 +15280,7 @@
  	sal_Bool bValue = sal_False;
  	aValue >>= bValue;
  	sal_Int16 nValue = NORMAL;
-@@ -108,16 +191,42 @@ ScVbaFont::setSubscript( const uno::Any& aValue )
+@@ -108,16 +204,42 @@ ScVbaFont::setSubscript( const uno::Any& aValue )
  	        nValue2 = SUBSCRIPTHEIGHT;
  	}
  
@@ -15291,7 +15326,191 @@
  	return uno::makeAny( ( nValue == SUBSCRIPT ) );
  }
  
-@@ -430,7 +539,7 @@ ScVbaFont::getServiceNames()
+@@ -130,8 +252,8 @@ ScVbaFont::setSize( const uno::Any& aValue ) throw
+ uno::Any SAL_CALL
+ ScVbaFont::getSize() throw ( uno::RuntimeException )
+ {
+-	if ( mpDataSet )
+-		if (  mpDataSet->GetItemState( ATTR_FONT_HEIGHT, TRUE, NULL) == SFX_ITEM_DONTCARE )
++	if ( GetDataSet() )
++		if (  GetDataSet()->GetItemState( ATTR_FONT_HEIGHT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+         return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ) );
+ }
+@@ -159,8 +281,8 @@ uno::Any SAL_CALL
+ ScVbaFont::getColorIndex() throw ( uno::RuntimeException )
+ {
+ 	sal_Int32 nColor = 0;
+-	if ( mpDataSet )
+-		if (  mpDataSet->GetItemState( ATTR_FONT_COLOR, TRUE, NULL) == SFX_ITEM_DONTCARE )
++	if ( GetDataSet() )
++		if (  GetDataSet()->GetItemState( ATTR_FONT_COLOR, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+ 
+ 	// getColor returns Xl ColorValue, need to convert it to OO val
+@@ -224,23 +346,55 @@ ScVbaFont::getStandardFont() throw ( uno::RuntimeE
+ }
+ 
+ void SAL_CALL
+-ScVbaFont::setFontStyle( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException )
++ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException )
+ {
+-//XXX #TODO# #FIXME#
+-	//mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharSize" ) ), ( uno::Any )aValue );
+-	throw uno::RuntimeException(
+-		rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setFontStyle not supported") ), uno::Reference< uno::XInterface >() );
++    sal_Bool bBold = sal_False;
++    sal_Bool bItalic = sal_False;
++
++    rtl::OUString aStyles;
++    aValue >>= aStyles;
++
++    std::vector< rtl::OUString > aTokens;
++    sal_Int32 nIndex = 0;
++    do
++    {
++        rtl::OUString aToken = aStyles.getToken( 0, ' ', nIndex );
++        aTokens.push_back( aToken );
++    }while( nIndex >= 0 );
++    
++    std::vector< rtl::OUString >::iterator it;
++    for( it = aTokens.begin(); it != aTokens.end(); ++it )
++    {
++        if( (*it).equalsIgnoreAsciiCaseAscii( "Bold" ) )
++            bBold = sal_True;
++
++        if( (*it).equalsIgnoreAsciiCaseAscii( "Italic" ) )
++            bItalic = sal_True;
+ }
+ 
++    setBold( uno::makeAny( bBold ) );
++    setItalic( uno::makeAny( bItalic ) );
++}
+ 
++
+ uno::Any SAL_CALL
+ ScVbaFont::getFontStyle() throw ( uno::RuntimeException )
+ {
+-//XXX
+-	throw uno::RuntimeException(
+-		rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getFontStyle not supported") ), uno::Reference< uno::XInterface >() );
+-	// return uno::Any();
++    rtl::OUStringBuffer aStyles;
++    sal_Bool bValue = sal_False;
++    getBold() >>= bValue;
++    if( bValue )
++        aStyles.appendAscii("Bold");
++    
++    getItalic() >>= bValue;
++    if( bValue )
++    {
++        if( aStyles.getLength() )
++            aStyles.appendAscii(" ");
++        aStyles.appendAscii("Italic");
+ }
++    return uno::makeAny( aStyles.makeStringAndClear() );
++}
+ 
+ void SAL_CALL
+ ScVbaFont::setBold( const uno::Any& aValue ) throw( uno::RuntimeException )
+@@ -257,8 +411,8 @@ ScVbaFont::setBold( const uno::Any& aValue ) throw
+ uno::Any SAL_CALL
+ ScVbaFont::getBold() throw ( uno::RuntimeException )
+ {
+-	if ( mpDataSet )
+-		if (  mpDataSet->GetItemState( ATTR_FONT_WEIGHT, TRUE, NULL) == SFX_ITEM_DONTCARE )
++	if ( GetDataSet() )
++		if (  GetDataSet()->GetItemState( ATTR_FONT_WEIGHT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+ 
+ 	double fValue = 0.0;
+@@ -303,8 +457,8 @@ ScVbaFont::setUnderline( const uno::Any& aValue )
+ uno::Any SAL_CALL
+ ScVbaFont::getUnderline() throw ( uno::RuntimeException )
+ {
+-	if ( mpDataSet )
+-		if (  mpDataSet->GetItemState( ATTR_FONT_UNDERLINE, TRUE, NULL) == SFX_ITEM_DONTCARE )
++	if ( GetDataSet() )
++		if (  GetDataSet()->GetItemState( ATTR_FONT_UNDERLINE, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+ 
+ 	sal_Int32 nValue = awt::FontUnderline::NONE;
+@@ -341,8 +495,8 @@ ScVbaFont::setStrikethrough( const uno::Any& aValu
+ uno::Any SAL_CALL
+ ScVbaFont::getStrikethrough() throw ( uno::RuntimeException )
+ {
+-	if ( mpDataSet )
+-		if (  mpDataSet->GetItemState( ATTR_FONT_CROSSEDOUT, TRUE, NULL) == SFX_ITEM_DONTCARE )
++	if ( GetDataSet() )
++		if (  GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+ 	short nValue = 0;
+ 	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharStrikeout" ) ) ) >>= nValue;
+@@ -358,8 +512,8 @@ ScVbaFont::setShadow( const uno::Any& aValue ) thr
+ uno::Any SAL_CALL
+ ScVbaFont::getShadow() throw (uno::RuntimeException)
+ {
+-	if ( mpDataSet )
+-		if (  mpDataSet->GetItemState( ATTR_FONT_SHADOWED, TRUE, NULL) == SFX_ITEM_DONTCARE )
++	if ( GetDataSet() )
++		if (  GetDataSet()->GetItemState( ATTR_FONT_SHADOWED, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+ 	return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ) );
+ }
+@@ -378,13 +532,13 @@ ScVbaFont::setItalic( const uno::Any& aValue ) thr
+ uno::Any SAL_CALL
+ ScVbaFont::getItalic() throw ( uno::RuntimeException )
+ {
+-	if ( mpDataSet )
+-		if (  mpDataSet->GetItemState( ATTR_FONT_POSTURE, TRUE, NULL) == SFX_ITEM_DONTCARE )
++	if ( GetDataSet() )
++		if (  GetDataSet()->GetItemState( ATTR_FONT_POSTURE, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+ 
+-	short nValue = 0;
+-	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ) ) >>= nValue;
+-	return uno::makeAny( nValue == awt::FontSlant_ITALIC );
++    awt::FontSlant aFS;
++	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ) ) >>= aFS;
++	return uno::makeAny( aFS == awt::FontSlant_ITALIC );
+ }
+ 
+ void  SAL_CALL
+@@ -398,8 +552,8 @@ ScVbaFont::setName( const uno::Any& aValue ) throw
+ uno::Any SAL_CALL
+ ScVbaFont::getName() throw ( uno::RuntimeException )
+ {
+-	if ( mpDataSet )
+-		if (  mpDataSet->GetItemState( ATTR_FONT, TRUE, NULL) == SFX_ITEM_DONTCARE )
++	if ( GetDataSet() )
++		if (  GetDataSet()->GetItemState( ATTR_FONT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+ 	return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ) );
+ }
+@@ -416,6 +570,22 @@ ScVbaFont::setColor( const uno::Any& _color  ) thr
+ {
+ 	mxFont->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) , XLRGBToOORGB(_color));
+ }
++
++void  SAL_CALL
++ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException )
++{
++	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ), aValue );
++}
++
++uno::Any SAL_CALL
++ScVbaFont::getOutlineFont() throw (uno::RuntimeException)
++{
++	if ( GetDataSet() )
++		if (  GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, TRUE, NULL) == SFX_ITEM_DONTCARE )
++			return aNULL();
++	return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ) );
++}
++
+ rtl::OUString&
+ ScVbaFont::getServiceImplName()
+ {
+@@ -430,7 +600,7 @@ ScVbaFont::getServiceNames()
  	if ( aServiceNames.getLength() == 0 )
  	{
  		aServiceNames.realloc( 1 );
@@ -15302,8 +15521,8 @@
  }
 Index: sc/source/ui/vba/vbaaxis.hxx
 ===================================================================
---- sc/source/ui/vba/vbaaxis.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaaxis.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaaxis.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaaxis.hxx	(revision 266505)
 @@ -30,15 +30,15 @@
  #ifndef SC_VBA_AXIS_HXX
  #define SC_VBA_AXOS_HXX
@@ -15343,8 +15562,8 @@
  	virtual void SAL_CALL setCrosses( ::sal_Int32 Crosses ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbaassistant.cxx
 ===================================================================
---- sc/source/ui/vba/vbaassistant.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbaassistant.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaassistant.cxx	(revision 0)
++++ sc/source/ui/vba/vbaassistant.cxx	(revision 266505)
 @@ -0,0 +1,140 @@
 +/*************************************************************************
 + *
@@ -15488,8 +15707,8 @@
 +}
 Index: sc/source/ui/vba/vbabutton.cxx
 ===================================================================
---- sc/source/ui/vba/vbabutton.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbabutton.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbabutton.cxx	(revision 264185)
++++ sc/source/ui/vba/vbabutton.cxx	(revision 266505)
 @@ -31,11 +31,11 @@
  #include <vector>
  
@@ -15529,8 +15748,8 @@
 +}
 Index: sc/source/ui/vba/vbashaperange.cxx
 ===================================================================
---- sc/source/ui/vba/vbashaperange.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbashaperange.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbashaperange.cxx	(revision 264185)
++++ sc/source/ui/vba/vbashaperange.cxx	(revision 266505)
 @@ -33,16 +33,16 @@
  #include "vbashaperange.hxx"
  #include "vbashape.hxx"
@@ -15580,8 +15799,8 @@
  }
 Index: sc/source/ui/vba/vbadialogs.cxx
 ===================================================================
---- sc/source/ui/vba/vbadialogs.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbadialogs.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbadialogs.cxx	(revision 264185)
++++ sc/source/ui/vba/vbadialogs.cxx	(revision 266505)
 @@ -31,8 +31,8 @@
  
  #include <com/sun/star/lang/XMultiComponentFactory.hpp>
@@ -15622,8 +15841,8 @@
  }
 Index: sc/source/ui/vba/vbascrollbar.cxx
 ===================================================================
---- sc/source/ui/vba/vbascrollbar.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbascrollbar.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbascrollbar.cxx	(revision 0)
++++ sc/source/ui/vba/vbascrollbar.cxx	(revision 266505)
 @@ -0,0 +1,139 @@
 +/*************************************************************************
 + *
@@ -15766,8 +15985,8 @@
 +}
 Index: sc/source/ui/vba/vbaglobals.cxx
 ===================================================================
---- sc/source/ui/vba/vbaglobals.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaglobals.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaglobals.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaglobals.cxx	(revision 266505)
 @@ -41,7 +41,7 @@
  #include <cppuhelper/bootstrap.hxx>
  using namespace ::com::sun::star;
@@ -15815,8 +16034,8 @@
  
 Index: sc/source/ui/vba/vbacharacters.hxx
 ===================================================================
---- sc/source/ui/vba/vbacharacters.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacharacters.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacharacters.hxx	(revision 264185)
++++ sc/source/ui/vba/vbacharacters.hxx	(revision 266505)
 @@ -32,13 +32,13 @@
  
  #include <cppuhelper/implbase1.hxx>
@@ -15855,8 +16074,8 @@
  	virtual void SAL_CALL Insert( const ::rtl::OUString& String ) throw (css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbacheckbox.cxx
 ===================================================================
---- sc/source/ui/vba/vbacheckbox.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacheckbox.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacheckbox.cxx	(revision 0)
++++ sc/source/ui/vba/vbacheckbox.cxx	(revision 266505)
 @@ -0,0 +1,110 @@
 +/*************************************************************************
 + *
@@ -15970,8 +16189,8 @@
 +}
 Index: sc/source/ui/vba/vbastyles.hxx
 ===================================================================
---- sc/source/ui/vba/vbastyles.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbastyles.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbastyles.hxx	(revision 264185)
++++ sc/source/ui/vba/vbastyles.hxx	(revision 266505)
 @@ -29,25 +29,25 @@
   ************************************************************************/
  #ifndef SC_VBA_STYLES_HXX
@@ -16005,8 +16224,8 @@
  	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);	
 Index: sc/source/ui/vba/vbavalidation.cxx
 ===================================================================
---- sc/source/ui/vba/vbavalidation.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbavalidation.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbavalidation.cxx	(revision 264185)
++++ sc/source/ui/vba/vbavalidation.cxx	(revision 266505)
 @@ -32,13 +32,13 @@
  #include <com/sun/star/sheet/ValidationType.hpp>
  #include <com/sun/star/sheet/ValidationAlertStyle.hpp>
@@ -16036,8 +16255,8 @@
  }
 Index: sc/source/ui/vba/vbaoleobjects.hxx
 ===================================================================
---- sc/source/ui/vba/vbaoleobjects.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaoleobjects.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaoleobjects.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaoleobjects.hxx	(revision 266505)
 @@ -31,12 +31,12 @@
  #define SC_VBA_OLEOBJECTS_HXX
  
@@ -16064,8 +16283,8 @@
      // XEnumerationAccess
 Index: sc/source/ui/vba/vbaprogressbar.hxx
 ===================================================================
---- sc/source/ui/vba/vbaprogressbar.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbaprogressbar.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaprogressbar.hxx	(revision 0)
++++ sc/source/ui/vba/vbaprogressbar.hxx	(revision 266505)
 @@ -0,0 +1,59 @@
 +/*************************************************************************
 + *
@@ -16128,8 +16347,8 @@
 +#endif //SC_VBA_LABEL_HXX
 Index: sc/source/ui/vba/vbacommandbar.cxx
 ===================================================================
---- sc/source/ui/vba/vbacommandbar.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacommandbar.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacommandbar.cxx	(revision 0)
++++ sc/source/ui/vba/vbacommandbar.cxx	(revision 266505)
 @@ -0,0 +1,329 @@
 +/*************************************************************************
 + *
@@ -16462,8 +16681,8 @@
 +}
 Index: sc/source/ui/vba/vbacharttitle.cxx
 ===================================================================
---- sc/source/ui/vba/vbacharttitle.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacharttitle.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacharttitle.cxx	(revision 264185)
++++ sc/source/ui/vba/vbacharttitle.cxx	(revision 266505)
 @@ -29,10 +29,10 @@
   ************************************************************************/
  #include "vbacharttitle.hxx"
@@ -16488,8 +16707,8 @@
  	}
 Index: sc/source/ui/vba/vbawsfunction.hxx
 ===================================================================
---- sc/source/ui/vba/vbawsfunction.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbawsfunction.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbawsfunction.hxx	(revision 264185)
++++ sc/source/ui/vba/vbawsfunction.hxx	(revision 266505)
 @@ -30,20 +30,19 @@
  #ifndef SC_VBA_INTERIOR_HXX
  #define SC_VBA_INTERIOR_HXX
@@ -16516,8 +16735,8 @@
  	virtual css::uno::Reference< css::beans::XIntrospectionAccess >  SAL_CALL getIntrospection(void)  throw(css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbacomment.hxx
 ===================================================================
---- sc/source/ui/vba/vbacomment.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacomment.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacomment.hxx	(revision 264185)
++++ sc/source/ui/vba/vbacomment.hxx	(revision 266505)
 @@ -32,8 +32,8 @@
  
  #include <cppuhelper/implbase1.hxx>
@@ -16563,8 +16782,8 @@
      virtual rtl::OUString& getServiceImplName();
 Index: sc/source/ui/vba/vbaoleobject.hxx
 ===================================================================
---- sc/source/ui/vba/vbaoleobject.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaoleobject.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaoleobject.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaoleobject.hxx	(revision 266505)
 @@ -33,11 +33,11 @@
  #include <cppuhelper/implbase1.hxx>
  #include <com/sun/star/drawing/XControlShape.hpp>
@@ -16590,8 +16809,8 @@
      // XOLEObject Attributes
 Index: sc/source/ui/vba/vbawindow.hxx
 ===================================================================
---- sc/source/ui/vba/vbawindow.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbawindow.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbawindow.hxx	(revision 264185)
++++ sc/source/ui/vba/vbawindow.hxx	(revision 266505)
 @@ -30,19 +30,19 @@
  #ifndef SC_VBA_WINDOW_HXX
  #define SC_VBA_WINDOW_HXX
@@ -16681,8 +16900,8 @@
  	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
 Index: sc/source/ui/vba/vbatextboxshape.cxx
 ===================================================================
---- sc/source/ui/vba/vbatextboxshape.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbatextboxshape.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbatextboxshape.cxx	(revision 0)
++++ sc/source/ui/vba/vbatextboxshape.cxx	(revision 266505)
 @@ -0,0 +1,74 @@
 +/*************************************************************************
 + *
@@ -16760,8 +16979,8 @@
 +}
 Index: sc/source/ui/vba/vbalistcontrolhelper.hxx
 ===================================================================
---- sc/source/ui/vba/vbalistcontrolhelper.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbalistcontrolhelper.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbalistcontrolhelper.hxx	(revision 0)
++++ sc/source/ui/vba/vbalistcontrolhelper.hxx	(revision 266505)
 @@ -0,0 +1,20 @@
 +#ifndef SC_VBA_LISTCONTROLHELPER
 +#define SC_VBA_LISTCONTROLHELPER
@@ -16774,7 +16993,7 @@
 +
 +public:
 +	ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){}
-+
++	virtual ~ListControlHelper() {}
 +	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
 +	virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);   
 +    	virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
@@ -16785,8 +17004,8 @@
 +#endif
 Index: sc/source/ui/vba/vbacollectionimpl.hxx
 ===================================================================
---- sc/source/ui/vba/vbacollectionimpl.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacollectionimpl.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacollectionimpl.hxx	(revision 264185)
++++ sc/source/ui/vba/vbacollectionimpl.hxx	(revision 266505)
 @@ -30,8 +30,8 @@
  #ifndef SC_VBA_COLLECTION_IMPL_HXX
  #define SC_VBA_COLLECTION_IMPL_HXX
@@ -16835,8 +17054,8 @@
  
 Index: sc/source/ui/vba/vbaimage.cxx
 ===================================================================
---- sc/source/ui/vba/vbaimage.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbaimage.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaimage.cxx	(revision 0)
++++ sc/source/ui/vba/vbaimage.cxx	(revision 266505)
 @@ -0,0 +1,59 @@
 +/*************************************************************************
 + *
@@ -16899,8 +17118,8 @@
 +}
 Index: sc/source/ui/vba/helperdecl.hxx
 ===================================================================
---- sc/source/ui/vba/helperdecl.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/helperdecl.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/helperdecl.hxx	(revision 264185)
++++ sc/source/ui/vba/helperdecl.hxx	(revision 266505)
 @@ -28,7 +28,7 @@
   *
   ************************************************************************/
@@ -16930,8 +17149,8 @@
  	return xIf;
 Index: sc/source/ui/vba/vbacondition.cxx
 ===================================================================
---- sc/source/ui/vba/vbacondition.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacondition.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacondition.cxx	(revision 264185)
++++ sc/source/ui/vba/vbacondition.cxx	(revision 266505)
 @@ -29,18 +29,18 @@
   ************************************************************************/
  
@@ -16957,8 +17176,8 @@
  }
 Index: sc/source/ui/vba/vbacommandbarcontrols.cxx
 ===================================================================
---- sc/source/ui/vba/vbacommandbarcontrols.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacommandbarcontrols.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacommandbarcontrols.cxx	(revision 0)
++++ sc/source/ui/vba/vbacommandbarcontrols.cxx	(revision 266505)
 @@ -0,0 +1,247 @@
 +/*************************************************************************
 + *
@@ -17145,7 +17364,7 @@
 +    {
 +        return createCollectionObject( aIndex );
 +    } 
-+    sal_Int32 nIndex;
++    sal_Int32 nIndex = 0;
 +    if( aIndex >>= nIndex )
 +    {
 +        return createCollectionObject( uno::makeAny( GetControlNameByIndex( nIndex ) ) );
@@ -17209,8 +17428,8 @@
 +
 Index: sc/source/ui/vba/vbacolorformat.cxx
 ===================================================================
---- sc/source/ui/vba/vbacolorformat.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacolorformat.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacolorformat.cxx	(revision 264185)
++++ sc/source/ui/vba/vbacolorformat.cxx	(revision 266505)
 @@ -28,10 +28,10 @@
   *
   ************************************************************************/
@@ -17251,8 +17470,8 @@
  }
 Index: sc/source/ui/vba/vbachartobject.cxx
 ===================================================================
---- sc/source/ui/vba/vbachartobject.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbachartobject.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbachartobject.cxx	(revision 264185)
++++ sc/source/ui/vba/vbachartobject.cxx	(revision 266505)
 @@ -37,12 +37,12 @@
  #include "vbachartobjects.hxx"
  
@@ -17279,8 +17498,8 @@
  }
 Index: sc/source/ui/vba/vbalistbox.hxx
 ===================================================================
---- sc/source/ui/vba/vbalistbox.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbalistbox.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbalistbox.hxx	(revision 264185)
++++ sc/source/ui/vba/vbalistbox.hxx	(revision 266505)
 @@ -32,31 +32,31 @@
  #include <cppuhelper/implbase2.hxx>
  #include <com/sun/star/uno/XComponentContext.hpp>
@@ -17344,8 +17563,8 @@
      virtual css::uno::Any getValueEvent();
 Index: sc/source/ui/vba/vbainterior.cxx
 ===================================================================
---- sc/source/ui/vba/vbainterior.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbainterior.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbainterior.cxx	(revision 264185)
++++ sc/source/ui/vba/vbainterior.cxx	(revision 266505)
 @@ -34,8 +34,11 @@
  #include <com/sun/star/beans/XIntrospectionAccess.hpp>
  #include <com/sun/star/reflection/XIdlMethod.hpp>
@@ -17430,7 +17649,7 @@
  ScVbaInterior::setColor( const uno::Any& _color  ) throw (uno::RuntimeException)
  {
 -	m_xProps->setPropertyValue( BACKCOLOR , XLRGBToOORGB(_color));
-+    sal_Int32 nColor;
++    sal_Int32 nColor = 0;
 +    if( _color >>= nColor )
 +    {
 +        SetUserDefinedAttributes( BACKCOLOR, SetAttributeData( XLRGBToOORGB( nColor ) ) );
@@ -17633,7 +17852,7 @@
 +Color
 +ScVbaInterior::GetBackColor()
 +{
-+    sal_Int32 nColor;
++    sal_Int32 nColor = 0;
 +    Color aBackColor;
 +    uno::Any aColor = GetUserDefinedAttributes( BACKCOLOR ); 
 +    if( aColor.hasValue() )
@@ -17669,7 +17888,7 @@
 +void SAL_CALL 
 +ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::RuntimeException)
 +{
-+    sal_Int32 nPattColor;
++    sal_Int32 nPattColor = 0;
 +    if( _patterncolor >>= nPattColor )
 +    {
 +        SetUserDefinedAttributes( PATTERNCOLOR, SetAttributeData( XLRGBToOORGB( nPattColor ) ) );
@@ -17716,8 +17935,8 @@
  }
 Index: sc/source/ui/vba/vbamultipage.hxx
 ===================================================================
---- sc/source/ui/vba/vbamultipage.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbamultipage.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbamultipage.hxx	(revision 0)
++++ sc/source/ui/vba/vbamultipage.hxx	(revision 266505)
 @@ -0,0 +1,65 @@
 +/*************************************************************************
 + *
@@ -17774,7 +17993,7 @@
 +    ScVbaMultiPage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, const css::uno::Reference< css::uno::XInterface >& xDialog );
 +   // Attributes
 +    virtual sal_Int32 SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const sal_Int32 _value ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( sal_Int32 _value ) throw (css::uno::RuntimeException);
 +    virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) throw (css::uno::RuntimeException);
 +
 +    //XHelperInterface
@@ -17786,8 +18005,8 @@
 +#endif //SC_VBA_LABEL_HXX
 Index: sc/source/ui/vba/vbawindows.hxx
 ===================================================================
---- sc/source/ui/vba/vbawindows.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbawindows.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbawindows.hxx	(revision 264185)
++++ sc/source/ui/vba/vbawindows.hxx	(revision 266505)
 @@ -31,7 +31,7 @@
  #define SC_VBA_WINDOWS_HXX
  
@@ -17823,8 +18042,8 @@
  	virtual rtl::OUString& getServiceImplName();
 Index: sc/source/ui/vba/vbaradiobutton.hxx
 ===================================================================
---- sc/source/ui/vba/vbaradiobutton.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaradiobutton.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaradiobutton.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaradiobutton.hxx	(revision 266505)
 @@ -29,24 +29,27 @@
   ************************************************************************/
  #ifndef SC_VBA_RADIOBUTTON_HXX
@@ -17863,8 +18082,8 @@
  #endif //SC_VBA_RADIOBUTTON_HXX
 Index: sc/source/ui/vba/vbaaxes.cxx
 ===================================================================
---- sc/source/ui/vba/vbaaxes.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaaxes.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaaxes.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaaxes.cxx	(revision 266505)
 @@ -31,15 +31,15 @@
  #include "vbaaxes.hxx"
  #include "vbaaxis.hxx"
@@ -17916,8 +18135,8 @@
  }
 Index: sc/source/ui/vba/vbachart.cxx
 ===================================================================
---- sc/source/ui/vba/vbachart.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbachart.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbachart.cxx	(revision 264185)
++++ sc/source/ui/vba/vbachart.cxx	(revision 266505)
 @@ -40,10 +40,10 @@
  #include <com/sun/star/chart/ChartSolidType.hpp>
  #include <com/sun/star/chart/ChartDataRowSource.hpp>
@@ -17997,8 +18216,8 @@
  }
 Index: sc/source/ui/vba/vbaworksheets.hxx
 ===================================================================
---- sc/source/ui/vba/vbaworksheets.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaworksheets.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaworksheets.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaworksheets.hxx	(revision 266505)
 @@ -32,18 +32,18 @@
  
  #include <cppuhelper/implbase1.hxx>
@@ -18034,8 +18253,8 @@
  	bool isSelectedSheets();
 Index: sc/source/ui/vba/vbatextframe.hxx
 ===================================================================
---- sc/source/ui/vba/vbatextframe.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbatextframe.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbatextframe.hxx	(revision 264185)
++++ sc/source/ui/vba/vbatextframe.hxx	(revision 266505)
 @@ -31,18 +31,18 @@
  #define SC_VBA_TEXTFRAME_HXX
  #include <com/sun/star/drawing/XShape.hpp>
@@ -18079,8 +18298,8 @@
  
 Index: sc/source/ui/vba/vbadialog.hxx
 ===================================================================
---- sc/source/ui/vba/vbadialog.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbadialog.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbadialog.hxx	(revision 264185)
++++ sc/source/ui/vba/vbadialog.hxx	(revision 266505)
 @@ -33,20 +33,20 @@
  #include <cppuhelper/implbase1.hxx>
  
@@ -18109,8 +18328,8 @@
  	// Methods
 Index: sc/source/ui/vba/vbapages.hxx
 ===================================================================
---- sc/source/ui/vba/vbapages.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbapages.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapages.hxx	(revision 0)
++++ sc/source/ui/vba/vbapages.hxx	(revision 266505)
 @@ -0,0 +1,64 @@
 +/*************************************************************************
 + *
@@ -18178,8 +18397,8 @@
 +#endif//SC_VBA_SHAPE_HXX
 Index: sc/source/ui/vba/vbahelperinterface.hxx
 ===================================================================
---- sc/source/ui/vba/vbahelperinterface.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbahelperinterface.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbahelperinterface.hxx	(revision 264185)
++++ sc/source/ui/vba/vbahelperinterface.hxx	(revision 266505)
 @@ -31,7 +31,7 @@
  #define SC_VBA_HELPERINTERFACE_HXX
  
@@ -18230,8 +18449,8 @@
  #endif
 Index: sc/source/ui/vba/vbaapplication.hxx
 ===================================================================
---- sc/source/ui/vba/vbaapplication.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaapplication.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaapplication.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaapplication.hxx	(revision 266505)
 @@ -31,13 +31,13 @@
  #define SC_VBA_APPLICATION_HXX
  
@@ -18300,8 +18519,8 @@
  	// XHelperInterface
 Index: sc/source/ui/vba/vbapagebreaks.hxx
 ===================================================================
---- sc/source/ui/vba/vbapagebreaks.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbapagebreaks.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapagebreaks.hxx	(revision 0)
++++ sc/source/ui/vba/vbapagebreaks.hxx	(revision 266505)
 @@ -0,0 +1,71 @@
 +/*************************************************************************
 + *
@@ -18376,8 +18595,8 @@
 +#endif
 Index: sc/source/ui/vba/vbaspinbutton.hxx
 ===================================================================
---- sc/source/ui/vba/vbaspinbutton.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbaspinbutton.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaspinbutton.hxx	(revision 0)
++++ sc/source/ui/vba/vbaspinbutton.hxx	(revision 266505)
 @@ -0,0 +1,61 @@
 +/*************************************************************************
 + *
@@ -18442,8 +18661,8 @@
 +#endif //SC_VBA_SPINBUTTON_HXX
 Index: sc/source/ui/vba/vbahyperlink.hxx
 ===================================================================
---- sc/source/ui/vba/vbahyperlink.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbahyperlink.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbahyperlink.hxx	(revision 0)
++++ sc/source/ui/vba/vbahyperlink.hxx	(revision 266505)
 @@ -0,0 +1,72 @@
 +/*************************************************************************
 + *
@@ -18519,9 +18738,9 @@
 +
 Index: sc/source/ui/vba/vbafont.hxx
 ===================================================================
---- sc/source/ui/vba/vbafont.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbafont.hxx	ïrevision 265237ï
-@@ -32,14 +32,14 @@
+--- sc/source/ui/vba/vbafont.hxx	(revision 264185)
++++ sc/source/ui/vba/vbafont.hxx	(revision 266505)
+@@ -32,23 +32,25 @@
  
  #include <cppuhelper/implbase1.hxx>
  
@@ -18532,25 +18751,39 @@
  #include "vbapalette.hxx"
  
  class ScTableSheetsObj;
++class ScCellRangeObj;
  
 -typedef  InheritedHelperInterfaceImpl1< oo::excel::XFont > ScVbaFont_BASE;
 +typedef  InheritedHelperInterfaceImpl1< ov::excel::XFont > ScVbaFont_BASE;
  
  class ScVbaFont : public ScVbaFont_BASE
  {
-@@ -47,7 +47,7 @@ class ScVbaFont : public ScVbaFont_BASE
+     css::uno::Reference< css::beans::XPropertySet > mxFont;
      ScVbaPalette mPalette;
-     SfxItemSet* mpDataSet;
+-    SfxItemSet* mpDataSet;
++    ScCellRangeObj* mpRangeObj;
++    SfxItemSet*  GetDataSet();
  public:
 -	ScVbaFont( const css::uno::Reference< oo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, css::uno::Reference< css::beans::XPropertySet > xPropertySet, SfxItemSet* pDataSet = NULL ) throw ( css::uno::RuntimeException );
-+	ScVbaFont( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, css::uno::Reference< css::beans::XPropertySet > xPropertySet, SfxItemSet* pDataSet = NULL ) throw ( css::uno::RuntimeException );
- 	virtual ~ScVbaFont() {}
+-	virtual ~ScVbaFont() {}
++	ScVbaFont( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, css::uno::Reference< css::beans::XPropertySet > xPropertySet, ScCellRangeObj* pRangeObj = NULL ) throw ( css::uno::RuntimeException );
++	virtual ~ScVbaFont();// {}
  
  	// Attributes
+     virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException);
+@@ -79,6 +81,8 @@ class ScVbaFont : public ScVbaFont_BASE
+     virtual void SAL_CALL setName( const css::uno::Any& _name ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException) ;
+     virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException) ;
++    virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException) ;
++    virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException) ;
+     // XHelperInterface
+     virtual rtl::OUString& getServiceImplName();
+     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
 Index: sc/source/ui/vba/vbaassistant.hxx
 ===================================================================
---- sc/source/ui/vba/vbaassistant.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbaassistant.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaassistant.hxx	(revision 0)
++++ sc/source/ui/vba/vbaassistant.hxx	(revision 266505)
 @@ -0,0 +1,78 @@
 +/*************************************************************************
 + *
@@ -18632,8 +18865,8 @@
 +#endif//SC_VBA_ASSISTANT_HXX
 Index: sc/source/ui/vba/vbaoutline.cxx
 ===================================================================
---- sc/source/ui/vba/vbaoutline.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaoutline.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaoutline.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaoutline.cxx	(revision 266505)
 @@ -29,7 +29,7 @@
   ************************************************************************/
  #include "vbaoutline.hxx"
@@ -18654,8 +18887,8 @@
  }
 Index: sc/source/ui/vba/vbaname.cxx
 ===================================================================
---- sc/source/ui/vba/vbaname.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaname.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaname.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaname.cxx	(revision 266505)
 @@ -31,6 +31,7 @@
  
  #include <com/sun/star/table/XCellRange.hpp>
@@ -18805,8 +19038,8 @@
  }
 Index: sc/source/ui/vba/vbabutton.hxx
 ===================================================================
---- sc/source/ui/vba/vbabutton.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbabutton.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbabutton.hxx	(revision 264185)
++++ sc/source/ui/vba/vbabutton.hxx	(revision 266505)
 @@ -30,20 +30,22 @@
  #ifndef SC_VBA_BUTTON_HXX
  #define SC_VBA_BUTTON_HXX
@@ -18836,8 +19069,8 @@
  #endif //SC_VBA_BUTTON_HXX
 Index: sc/source/ui/vba/vbaworkbooks.cxx
 ===================================================================
---- sc/source/ui/vba/vbaworkbooks.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaworkbooks.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaworkbooks.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaworkbooks.cxx	(revision 266505)
 @@ -60,7 +60,7 @@
  
  #include <hash_map>
@@ -18876,8 +19109,8 @@
  }
 Index: sc/source/ui/vba/vbashaperange.hxx
 ===================================================================
---- sc/source/ui/vba/vbashaperange.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbashaperange.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbashaperange.hxx	(revision 264185)
++++ sc/source/ui/vba/vbashaperange.hxx	(revision 266505)
 @@ -31,11 +31,11 @@
  #define SC_VBA_SHAPERANGE_HXX
  
@@ -18908,8 +19141,8 @@
      virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbacomments.cxx
 ===================================================================
---- sc/source/ui/vba/vbacomments.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacomments.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacomments.cxx	(revision 264185)
++++ sc/source/ui/vba/vbacomments.cxx	(revision 266505)
 @@ -34,7 +34,7 @@
  
  #include "vbaglobals.hxx"
@@ -18948,8 +19181,8 @@
  }
 Index: sc/source/ui/vba/vbadialogs.hxx
 ===================================================================
---- sc/source/ui/vba/vbadialogs.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbadialogs.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbadialogs.hxx	(revision 264185)
++++ sc/source/ui/vba/vbadialogs.hxx	(revision 266505)
 @@ -33,18 +33,18 @@
  #include <cppuhelper/implbase1.hxx>
  
@@ -18975,8 +19208,8 @@
  	// XCollection
 Index: sc/source/ui/vba/vbaglobals.hxx
 ===================================================================
---- sc/source/ui/vba/vbaglobals.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaglobals.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaglobals.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaglobals.hxx	(revision 266505)
 @@ -33,7 +33,7 @@
  #include <com/sun/star/lang/XServiceInfo.hpp>
  #include <com/sun/star/lang/XInitialization.hpp>
@@ -19029,8 +19262,8 @@
  #endif // 
 Index: sc/source/ui/vba/vbascrollbar.hxx
 ===================================================================
---- sc/source/ui/vba/vbascrollbar.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbascrollbar.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbascrollbar.hxx	(revision 0)
++++ sc/source/ui/vba/vbascrollbar.hxx	(revision 266505)
 @@ -0,0 +1,66 @@
 +/*************************************************************************
 + *
@@ -19100,8 +19333,8 @@
 +#endif //SC_VBA_LABEL_HXX
 Index: sc/source/ui/vba/vbaframe.cxx
 ===================================================================
---- sc/source/ui/vba/vbaframe.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbaframe.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaframe.cxx	(revision 0)
++++ sc/source/ui/vba/vbaframe.cxx	(revision 266505)
 @@ -0,0 +1,93 @@
 +/*************************************************************************
 + *
@@ -19198,8 +19431,8 @@
 +}
 Index: sc/source/ui/vba/vbacheckbox.hxx
 ===================================================================
---- sc/source/ui/vba/vbacheckbox.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacheckbox.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacheckbox.hxx	(revision 0)
++++ sc/source/ui/vba/vbacheckbox.hxx	(revision 266505)
 @@ -0,0 +1,60 @@
 +/*************************************************************************
 + *
@@ -19263,8 +19496,8 @@
 +#endif //SC_VBA_CHECKBOX_HXX
 Index: sc/source/ui/vba/vbavalidation.hxx
 ===================================================================
---- sc/source/ui/vba/vbavalidation.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbavalidation.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbavalidation.hxx	(revision 264185)
++++ sc/source/ui/vba/vbavalidation.hxx	(revision 266505)
 @@ -31,18 +31,18 @@
  #define SC_VBA_VALIDATION_HXX
  #include <cppuhelper/implbase1.hxx>
@@ -19289,8 +19522,8 @@
      virtual void SAL_CALL setIgnoreBlank( ::sal_Bool _ignoreblank ) throw (css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbalineformat.cxx
 ===================================================================
---- sc/source/ui/vba/vbalineformat.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbalineformat.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbalineformat.cxx	(revision 264185)
++++ sc/source/ui/vba/vbalineformat.cxx	(revision 266505)
 @@ -27,19 +27,19 @@
   * for a copy of the LGPLv3 License.
   *
@@ -19328,8 +19561,8 @@
  }
 Index: sc/source/ui/vba/vbacharttitle.hxx
 ===================================================================
---- sc/source/ui/vba/vbacharttitle.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacharttitle.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacharttitle.hxx	(revision 264185)
++++ sc/source/ui/vba/vbacharttitle.hxx	(revision 266505)
 @@ -31,15 +31,15 @@
  #define SC_VBA_CHARTTITLE_HXX
  #include "vbatitle.hxx"
@@ -19351,8 +19584,8 @@
  	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
 Index: sc/source/ui/vba/vbacombobox.cxx
 ===================================================================
---- sc/source/ui/vba/vbacombobox.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacombobox.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacombobox.cxx	(revision 264185)
++++ sc/source/ui/vba/vbacombobox.cxx	(revision 266505)
 @@ -31,25 +31,29 @@
  #include <vector>
  
@@ -19544,8 +19777,8 @@
 +}
 Index: sc/source/ui/vba/vbacommandbar.hxx
 ===================================================================
---- sc/source/ui/vba/vbacommandbar.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacommandbar.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacommandbar.hxx	(revision 0)
++++ sc/source/ui/vba/vbacommandbar.hxx	(revision 266505)
 @@ -0,0 +1,105 @@
 +/*************************************************************************
 + *
@@ -19654,8 +19887,8 @@
 +#endif//SC_VBA_COMMANDBAR_HXX
 Index: sc/source/ui/vba/vbapivottable.cxx
 ===================================================================
---- sc/source/ui/vba/vbapivottable.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbapivottable.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbapivottable.cxx	(revision 264185)
++++ sc/source/ui/vba/vbapivottable.cxx	(revision 266505)
 @@ -32,9 +32,9 @@
  
  
@@ -19688,8 +19921,8 @@
  }
 Index: sc/source/ui/vba/vbachartobjects.cxx
 ===================================================================
---- sc/source/ui/vba/vbachartobjects.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbachartobjects.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbachartobjects.cxx	(revision 264185)
++++ sc/source/ui/vba/vbachartobjects.cxx	(revision 266505)
 @@ -33,7 +33,7 @@
  #include <com/sun/star/table/XTableChartsSupplier.hpp>
  #include <com/sun/star/table/XTableChart.hpp>
@@ -19740,8 +19973,8 @@
  }
 Index: sc/source/ui/vba/vbaworksheet.cxx
 ===================================================================
---- sc/source/ui/vba/vbaworksheet.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaworksheet.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaworksheet.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaworksheet.cxx	(revision 266505)
 @@ -47,6 +47,7 @@
  #include <com/sun/star/sheet/XSheetPastable.hpp>
  #include <com/sun/star/sheet/XCellAddressable.hpp>
@@ -20070,8 +20303,8 @@
  }
 Index: sc/source/ui/vba/testvba/TestVBA.java
 ===================================================================
---- sc/source/ui/vba/testvba/TestVBA.java	ïrevision 264185ï
-+++ sc/source/ui/vba/testvba/TestVBA.java	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestVBA.java	(revision 264185)
++++ sc/source/ui/vba/testvba/TestVBA.java	(revision 266505)
 @@ -1,198 +0,0 @@
 -//package org.openoffice.vba;
 -import com.sun.star.uno.UnoRuntime;
@@ -20273,8 +20506,8 @@
 -}
 Index: sc/source/ui/vba/testvba/build.xml
 ===================================================================
---- sc/source/ui/vba/testvba/build.xml	ïrevision 264185ï
-+++ sc/source/ui/vba/testvba/build.xml	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/build.xml	(revision 264185)
++++ sc/source/ui/vba/testvba/build.xml	(revision 266505)
 @@ -1,95 +0,0 @@
 -<!--
 -
@@ -20373,204 +20606,204 @@
 -</project>
 Index: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 ___________________________________________________________________
-ååå: svn:executable
+Added: svn:executable
    + *
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/replace.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 ___________________________________________________________________
-ååå: svn:executable
+Added: svn:executable
    + *
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/Template.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 ___________________________________________________________________
-ååå: svn:executable
+Added: svn:executable
    + *
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 ___________________________________________________________________
-ååå: svn:executable
+Added: svn:executable
    + *
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/format.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/format.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/format.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/window2.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 ___________________________________________________________________
-ååå: svn:executable
+Added: svn:executable
    + *
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 ___________________________________________________________________
-ååå: svn:executable
+Added: svn:executable
    + *
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 ___________________________________________________________________
-ååå: svn:executable
+Added: svn:executable
    + *
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 ___________________________________________________________________
-ååå: svn:executable
+Added: svn:executable
    + *
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges-3.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges-3.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges-3.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges-3.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges-3.log	(revision 266505)
 @@ -0,0 +1,8 @@
 +Test run started : 19/06/2007 11:21:42
 +----------------------------------------------------------------
@@ -20582,8 +20815,8 @@
 +Test run finished : 19/06/2007 11:21:42
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges.log	(revision 266505)
 @@ -0,0 +1,280 @@
 +Test run started : 01/06/2007 11:28:58
 +----------------------------------------------------------------
@@ -20867,8 +21100,8 @@
 +Test run finished : 01/06/2007 11:29:00
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestCalc_Rangetest2.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestCalc_Rangetest2.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestCalc_Rangetest2.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestCalc_Rangetest2.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestCalc_Rangetest2.log	(revision 266505)
 @@ -0,0 +1,64 @@
 +Test run started : 31/05/2007 11:02:10
 +BEGIN TestCalc
@@ -20936,8 +21169,8 @@
 +Test run finished : 31/05/2007 11:02:12
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestAddress.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestAddress.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestAddress.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestAddress.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestAddress.log	(revision 266505)
 @@ -0,0 +1,62 @@
 +Test run started : 17/07/2007 15:25:17
 +----------------------------------------------------------------
@@ -21003,8 +21236,8 @@
 +Test run finished : 17/07/2007 15:25:19
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/MiscRangeTests.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/excel/MiscRangeTests.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/MiscRangeTests.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/excel/MiscRangeTests.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/MiscRangeTests.log	(revision 266505)
 @@ -0,0 +1,45 @@
 +Test run started : 17/07/2007 15:01:37
 +----------------------------------------------------------------
@@ -21053,8 +21286,8 @@
 +Test run finished : 17/07/2007 15:01:39
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log	(revision 266505)
 @@ -0,0 +1,20 @@
 +Test run started : 17/07/2007 17:36:22
 +----------------------------------------------------------------
@@ -21078,8 +21311,8 @@
 +Test run finished : 17/07/2007 17:36:23
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges-2.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges-2.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges-2.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges-2.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/Ranges-2.log	(revision 266505)
 @@ -0,0 +1,68 @@
 +Test run started : 18/06/2007 17:50:04
 +----------------------------------------------------------------
@@ -21151,8 +21384,8 @@
 +Test run finished : 18/06/2007 17:50:04
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestCalc_Rangetest.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestCalc_Rangetest.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestCalc_Rangetest.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestCalc_Rangetest.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/excel/TestCalc_Rangetest.log	(revision 266505)
 @@ -0,0 +1,60 @@
 +Test run started : 30/05/2007 11:33:13
 +BEGIN TestCalc
@@ -21216,8 +21449,8 @@
 +Test run finished : 30/05/2007 11:33:14
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest2.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest2.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest2.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest2.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest2.log	(revision 266505)
 @@ -0,0 +1,65 @@
 +Test run started : 10/03/2008 15:15:19
 +BEGIN TestCalc
@@ -21286,8 +21519,8 @@
 +Test run finished : 10/03/2008 15:15:21
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/PageBreaks.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/PageBreaks.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/PageBreaks.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/PageBreaks.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/PageBreaks.log	(revision 266505)
 @@ -0,0 +1,10 @@
 +Test run started : 07/24/2008 05:06:12 PM
 +----------------------------------------------------------------
@@ -21301,8 +21534,8 @@
 +Test run finished : 07/24/2008 05:06:13 PM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/stringplusdouble.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/stringplusdouble.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/stringplusdouble.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/stringplusdouble.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/stringplusdouble.log	(revision 266505)
 @@ -0,0 +1,62 @@
 +Test run started : 05/29/2008 02:51:22 PM
 +BEGIN String Plus Double
@@ -21368,8 +21601,8 @@
 +Test run finished : 05/29/2008 02:51:22 PM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/Window.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Window.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Window.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Window.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Window.log	(revision 266505)
 @@ -0,0 +1,46 @@
 +Test run started : 05/29/2008 02:55:00 PM
 +----------------------------------------------------------------
@@ -21419,8 +21652,8 @@
 +Test run finished : 05/29/2008 02:55:01 PM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/partition.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/partition.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/partition.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/partition.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/partition.log	(revision 266505)
 @@ -0,0 +1,11 @@
 +Test run started : 12/10/2007 11:26:43 AM
 +BEGIN Partition
@@ -21435,8 +21668,8 @@
 +Test run finished : 12/10/2007 11:26:43 AM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/datevalue.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/datevalue.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/datevalue.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/datevalue.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/datevalue.log	(revision 266505)
 @@ -0,0 +1,8 @@
 +Test run started : 01/24/2008 01:24:41 PM
 +BEGIN DateValue
@@ -21448,10 +21681,10 @@
 +Test run finished : 01/24/2008 01:24:41 PM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log	(revision 266505)
 @@ -0,0 +1,14 @@
-+Test run started : 11/20/2007 05:15:30 PM
++Test run started : 17/12/2008 13:53:49
 +BEGIN Replace
 + TEST START : Test Replace function
 +  ITEM Assertion OK : common string:aefefdBc
@@ -21461,14 +21694,14 @@
 +  ITEM Assertion OK : text compare:aefefdef
 +  ITEM Assertion OK : start = 3:cefdBc
 +  ITEM Assertion OK : count = 2: aefefdBc
-+  ITEM Assertion FAIL : start = 1, count = 0, not support in Unix: aefefdBc
++  ITEM Assertion OK : start = 1, count = 0, not support in Unix: abcbcdBc
 + TEST OK : Test Replace function
 +END  Replace
-+Test run finished : 11/20/2007 05:15:30 PM
++Test run finished : 17/12/2008 13:53:49
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/StrConv-test.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/StrConv-test.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/StrConv-test.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/StrConv-test.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/StrConv-test.log	(revision 266505)
 @@ -0,0 +1,9 @@
 +Test run started : 05/29/2008 02:51:03 PM
 +BEGIN StrConv
@@ -21481,8 +21714,8 @@
 +Test run finished : 05/29/2008 02:51:03 PM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/Template.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Template.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Template.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Template.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Template.log	(revision 266505)
 @@ -0,0 +1,14 @@
 +Test run started : 2008ï07ï10 11:57:05
 +----------------------------------------------------------------
@@ -21500,8 +21733,8 @@
 +Test run finished : 2008ï07ï10 11:57:05
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/dateserial.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/dateserial.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/dateserial.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/dateserial.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/dateserial.log	(revision 266505)
 @@ -0,0 +1,9 @@
 +Test run started : 01/24/2008 01:24:50 PM
 +BEGIN DateSerial
@@ -21514,8 +21747,8 @@
 +Test run finished : 01/24/2008 01:24:50 PM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log	(revision 266505)
 @@ -0,0 +1,20 @@
 +Test run started : 18/07/2007 10:56:38
 +----------------------------------------------------------------
@@ -21539,8 +21772,8 @@
 +Test run finished : 18/07/2007 10:56:44
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-2.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-2.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-2.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-2.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-2.log	(revision 266505)
 @@ -0,0 +1,68 @@
 +Test run started : 19/06/2007 11:14:01
 +----------------------------------------------------------------
@@ -21612,8 +21845,8 @@
 +Test run finished : 19/06/2007 11:14:02
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest.log	(revision 266505)
 @@ -0,0 +1,60 @@
 +Test run started : 30/05/2007 15:59:40
 +BEGIN TestCalc
@@ -21677,8 +21910,8 @@
 +Test run finished : 30/05/2007 15:59:42
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-3.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-3.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-3.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-3.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-3.log	(revision 266505)
 @@ -0,0 +1,8 @@
 +Test run started : 19/06/2007 11:26:09
 +----------------------------------------------------------------
@@ -21690,10 +21923,10 @@
 +Test run finished : 19/06/2007 11:26:10
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log	(revision 266505)
 @@ -0,0 +1,280 @@
-+Test run started : 10/03/2008 15:15:11
++Test run started : 17/12/2008 14:18:34
 +----------------------------------------------------------------
 +ApplicationMethods
 + TEST START : ApplicationMethods
@@ -21702,8 +21935,8 @@
 +  ITEM Assertion OK :  Address of Application.Rows is: $1:$1
 +  ITEM Assertion OK :  Address of Application.Range is: $1:$1,$5:$7
 +  ITEM Assertion OK :  Please check manually: DefaultFilePath is: /data4/home/npower/Documents
-+  ITEM Assertion OK :  Please check manually: Library Path is: /data4/home/npower/.ooo-2.0/user/basic
-+  ITEM Assertion OK :  Please check manually: Template Path is: /data4/home/npower/.ooo-2.0/user/template
++  ITEM Assertion OK :  Please check manually: Library Path is: /media/disk/BUILD-related/CWS/my_working_copy/INSTALL_FOR_TEST/opt/UserInstallation/user/basic
++  ITEM Assertion OK :  Please check manually: Template Path is: /media/disk/BUILD-related/CWS/my_working_copy/INSTALL_FOR_TEST/opt/UserInstallation/user/template
 +  ITEM Assertion OK :  FileSeparator is /
 +  ITEM Assertion OK :  Name of ActiveWorkbook is: Ranges.xls
 +END 'ApplicationMethods' Symbol
@@ -21806,8 +22039,8 @@
 +----------------------------------------------------------------
 +AutoFit issue
 + TEST START : AutoFit issue
-+  ITEM Assertion OK :  Columns.AutoFit: CurrentWidth is 680
-+  ITEM Assertion OK :  Rows.AutoFit: CurrentHeight is 554
++  ITEM Assertion OK :  Columns.AutoFit: CurrentWidth is 679
++  ITEM Assertion OK :  Rows.AutoFit: CurrentHeight is 546
 +END 'AutoFit issue' Symbol
 + TEST OK : AutoFit issue
 +----------------------------------------------------------------
@@ -21899,11 +22132,11 @@
 +  ITEM Assertion OK : Range RowHeight is 40
 +  ITEM Assertion OK : Range ColumnWidth is 50
 +  ITEM Assertion OK : Range Height is 240
-+  ITEM Assertion OK : Range Width is 795
++  ITEM Assertion OK : Range Width is 787.5
 +  ITEM Assertion OK : Range RowHeight is 50
 +  ITEM Assertion OK : Range ColumnWidth is 50
 +  ITEM Assertion OK : Range Height is 300
-+  ITEM Assertion OK : Range Width is 795
++  ITEM Assertion OK : Range Width is 787.5
 +  ITEM Assertion OK : RowHeight is null: True
 +  ITEM Assertion OK : ColumnWidth is null: True
 +END 'Heights and Widths' Symbol
@@ -21913,7 +22146,7 @@
 + TEST START : RangeRowColumn-Issue
 +  ITEM Assertion OK : Row is: 8
 +  ITEM Assertion OK : Column is: 5
-+  ITEM Assertion OK : EntireRow.Columns.Count = 256
++  ITEM Assertion OK : EntireRow.Columns.Count = 1024
 +  ITEM Assertion OK : EntireColumn.Rows.Count = 131072
 +END 'RangeRowColumn-Issue' Symbol
 + TEST OK : RangeRowColumn-Issue
@@ -21950,7 +22183,7 @@
 +  ITEM Assertion OK : -  = $E$3
 +  ITEM Assertion OK : -  = $A$8
 +  ITEM Assertion OK : -  = $B$8
-+  ITEM Assertion OK : -  = $IV$8
++  ITEM Assertion FAIL : -  = $AMJ$8
 +  ITEM Assertion OK : -  = $Z$8
 +END 'End issue' Symbol
 + TEST OK : End issue
@@ -21972,11 +22205,11 @@
 +  ITEM Assertion OK : Validation Error Title is : Microsoft Excel
 +END 'Validation' Symbol
 + TEST OK : Validation
-+Test run finished : 10/03/2008 15:15:13
++Test run finished : 17/12/2008 14:18:40
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/Shapes.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Shapes.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Shapes.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Shapes.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Shapes.log	(revision 266505)
 @@ -0,0 +1,77 @@
 +Test run started : 10/16/2007 05:25:21 PM
 +BEGIN Shapes_Collection_Behaviour
@@ -22057,8 +22290,8 @@
 +Test run finished : 10/16/2007 05:25:22 PM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log	(revision 266505)
 @@ -0,0 +1,62 @@
 +Test run started : 17/07/2007 20:56:04
 +----------------------------------------------------------------
@@ -22124,25 +22357,13 @@
 +Test run finished : 17/07/2007 20:56:05
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log	ïrevision 265237ï
-@@ -0,0 +1,82 @@
-+Test run started : 01/29/2008 02:38:27 PM
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log	(revision 266505)
+@@ -0,0 +1,36 @@
++Test run started : 17/12/2008 14:15:22
 +BEGIN Format
-+ TEST START : Test Predefined_Datetime_Format_Sample function
-+  ITEM Assertion OK : General Date: 1/6/98
-+  ITEM Assertion OK : Long Date: Tuesday, January 06, 1998
-+  ITEM Assertion FAIL : Medium Date: 06-Jan-1998
-+  ITEM Assertion OK : Short Date: 1/6/98
-+  ITEM Assertion FAIL : Long Time: 05:08:06 PM
-+  ITEM Assertion OK : Medium Time: 05:08 PM
-+  ITEM Assertion OK : Short Time: 17:08
-+ TEST OK : Test Predefined_Datetime_Format_Sample function
 + TEST START : Test Predefined_Number_Format_Sample function
 +  ITEM Assertion OK : General Number: 562486.2356
-+  ITEM Assertion OK : General Number: -3456.789
-+  ITEM Assertion OK : General Number: 213.21
-+  ITEM Assertion OK : Currency: $562,486.24
 +  ITEM Assertion OK : Fixed: 0.20
 +  ITEM Assertion OK : Standard: 562,486.24
 +  ITEM Assertion OK : Percent: 75.21%
@@ -22155,38 +22376,6 @@
 +  ITEM Assertion OK : On/Off: Off
 +  ITEM Assertion OK : On/Off: On
 + TEST OK : Test Predefined_Number_Format_Sample function
-+ TEST START : Test Custom_Datetime_Format_Sample function
-+  ITEM Assertion FAIL : c: 1/6/98 05:08:06 PM
-+  ITEM Assertion OK : dddddd: Tuesday, January 06, 1998
-+  ITEM Assertion OK : mm-dd-yyyy: 01-06-1998
-+  ITEM Assertion OK : d: 6
-+  ITEM Assertion OK : dd: 06
-+  ITEM Assertion OK : ddd: Tue
-+  ITEM Assertion OK : dddd: Tuesday
-+  ITEM Assertion OK : ddddd: 1/6/98
-+  ITEM Assertion OK : h: 5
-+  ITEM Assertion OK : hh: 05
-+  ITEM Assertion OK : n: 8
-+  ITEM Assertion OK : nn: 08
-+  ITEM Assertion OK : m: 1
-+  ITEM Assertion OK : mm: 01
-+  ITEM Assertion OK : mmm: Jan
-+  ITEM Assertion OK : mmmm: January
-+  ITEM Assertion FAIL : q: Q1
-+  ITEM Assertion OK : s: 6
-+  ITEM Assertion OK : ss: 06
-+  ITEM Assertion FAIL : ttttt: 05:08:06 AM
-+  ITEM Assertion OK : hh:mm:ss AM/PM: 05:08:06 PM
-+  ITEM Assertion FAIL : hh:mm:ss am/pm: 05:08:06 PM
-+  ITEM Assertion FAIL : hh:mm:ss A/P: 05:08:06 p
-+  ITEM Assertion OK : hh:mm:ss a/p: 05:08:06 p
-+  ITEM Assertion OK : hh:mm:ss: 17:08:06
-+  ITEM Assertion OK : ww: 2
-+  ITEM Assertion OK : w: 3
-+  ITEM Assertion OK : y: 6
-+  ITEM Assertion OK : yy: 98
-+  ITEM Assertion OK : yyyy: 1998
-+ TEST OK : Test Custom_Datetime_Format_Sample function
 + TEST START : Test Custom_Number_Format_Sample function
 +  ITEM Assertion OK : 00.0000: 23.6750
 +  ITEM Assertion OK : 00.00: 23.68
@@ -22202,17 +22391,15 @@
 +  ITEM Assertion OK : ##.###\%: .25%
 + TEST OK : Test Custom_Number_Format_Sample function
 + TEST START : Test Custom_Text_Format_Sample function
-+  ITEM Assertion FAIL : \* \*@@@@@: *VBA*VBAVBAVBAVBAVBA
-+  ITEM Assertion FAIL : \*&&\*&&&&: VBA
 +  ITEM Assertion OK : <: vba
 +  ITEM Assertion OK : >: VBA
 + TEST OK : Test Custom_Text_Format_Sample function
 +END  Format
-+Test run finished : 01/29/2008 02:38:27 PM
++Test run finished : 17/12/2008 14:15:22
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/bytearraystring.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/bytearraystring.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/bytearraystring.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/bytearraystring.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/bytearraystring.log	(revision 266505)
 @@ -0,0 +1,8 @@
 +Test run started : 05/29/2008 02:25:58 PM
 +BEGIN Bytearray To String
@@ -22224,8 +22411,8 @@
 +Test run finished : 05/29/2008 02:25:58 PM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log	(revision 266505)
 @@ -0,0 +1,45 @@
 +Test run started : 05/29/2008 02:55:48 PM
 +BEGIN Window2
@@ -22274,8 +22461,8 @@
 +Test run finished : 05/29/2008 02:55:48 PM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscRangeTests.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscRangeTests.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscRangeTests.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscRangeTests.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscRangeTests.log	(revision 266505)
 @@ -0,0 +1,45 @@
 +Test run started : 17/07/2007 20:54:56
 +----------------------------------------------------------------
@@ -22324,8 +22511,8 @@
 +Test run finished : 17/07/2007 20:55:03
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/pagesetup.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/pagesetup.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/pagesetup.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/pagesetup.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/pagesetup.log	(revision 266505)
 @@ -0,0 +1,77 @@
 +Test run started : 07/21/2008 02:00:06 PM
 +BEGIN PageSetup
@@ -22406,8 +22593,8 @@
 +Test run finished : 07/21/2008 02:00:07 PM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/range-4.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/unix/range-4.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/range-4.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/range-4.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/range-4.log	(revision 266505)
 @@ -0,0 +1,16 @@
 +Test run started : 2008ï06ï19 17:14:57
 +----------------------------------------------------------------
@@ -22427,8 +22614,8 @@
 +Test run finished : 2008ï06ï19 17:14:57
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges-3.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges-3.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges-3.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges-3.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges-3.log	(revision 266505)
 @@ -0,0 +1,8 @@
 +Test run started : 10/07/2007 01:55:51
 +----------------------------------------------------------------
@@ -22440,8 +22627,8 @@
 +Test run finished : 10/07/2007 01:55:51
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges.log	(revision 266505)
 @@ -0,0 +1,280 @@
 +Test run started : 10/07/2007 01:55:56
 +----------------------------------------------------------------
@@ -22725,8 +22912,8 @@
 +Test run finished : 10/07/2007 01:56:04
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/TestCalc_Rangetest2.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/win/TestCalc_Rangetest2.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/win/TestCalc_Rangetest2.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/win/TestCalc_Rangetest2.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/win/TestCalc_Rangetest2.log	(revision 266505)
 @@ -0,0 +1,65 @@
 +Test run started : 10/07/2007 01:56:15
 +BEGIN TestCalc
@@ -22795,8 +22982,8 @@
 +Test run finished : 10/07/2007 01:56:23
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/Shapes.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/win/Shapes.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/win/Shapes.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/win/Shapes.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/win/Shapes.log	(revision 266505)
 @@ -0,0 +1,77 @@
 +Test run started : 16/10/2007 17:46:03
 +BEGIN Shapes_Collection_Behaviour
@@ -22877,8 +23064,8 @@
 +Test run finished : 16/10/2007 17:46:04
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/TestAddress.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/win/TestAddress.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/win/TestAddress.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/win/TestAddress.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/win/TestAddress.log	(revision 266505)
 @@ -0,0 +1,62 @@
 +Test run started : 17/07/2007 15:26:54
 +----------------------------------------------------------------
@@ -22944,8 +23131,8 @@
 +Test run finished : 17/07/2007 15:26:56
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/MiscRangeTests.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/win/MiscRangeTests.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/win/MiscRangeTests.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/win/MiscRangeTests.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/win/MiscRangeTests.log	(revision 266505)
 @@ -0,0 +1,45 @@
 +Test run started : 17/07/2007 15:08:56
 +----------------------------------------------------------------
@@ -22994,8 +23181,8 @@
 +Test run finished : 17/07/2007 15:08:59
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/replace.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/win/replace.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/win/replace.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/win/replace.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/win/replace.log	(revision 266505)
 @@ -0,0 +1,14 @@
 +Test run started : 2007-11-21 11:24:04
 +BEGIN Replace
@@ -23013,8 +23200,8 @@
 +Test run finished : 2007-11-21 11:24:04
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/pagesetup.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/win/pagesetup.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/win/pagesetup.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/win/pagesetup.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/win/pagesetup.log	(revision 266505)
 @@ -0,0 +1,87 @@
 +Test run started : 7/21/2008 10:37:24 AM
 +BEGIN PageSetup
@@ -23105,8 +23292,8 @@
 +Test run finished : 7/21/2008 10:37:32 AM
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/AutoFilter.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/win/AutoFilter.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/win/AutoFilter.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/win/AutoFilter.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/win/AutoFilter.log	(revision 266505)
 @@ -0,0 +1,20 @@
 +Test run started : 16/10/2007 17:42:01
 +----------------------------------------------------------------
@@ -23130,8 +23317,8 @@
 +Test run finished : 16/10/2007 17:42:02
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges-2.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges-2.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges-2.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges-2.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/win/Ranges-2.log	(revision 266505)
 @@ -0,0 +1,68 @@
 +Test run started : 10/07/2007 01:55:47
 +----------------------------------------------------------------
@@ -23203,8 +23390,8 @@
 +Test run finished : 10/07/2007 01:55:48
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/TestCalc_Rangetest.log
 ===================================================================
---- sc/source/ui/vba/testvba/TestDocuments/logs/win/TestCalc_Rangetest.log	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/TestDocuments/logs/win/TestCalc_Rangetest.log	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/TestDocuments/logs/win/TestCalc_Rangetest.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/win/TestCalc_Rangetest.log	(revision 266505)
 @@ -0,0 +1,60 @@
 +Test run started : 10/07/2007 01:56:07
 +BEGIN TestCalc
@@ -23268,58 +23455,58 @@
 +Test run finished : 10/07/2007 01:56:12
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/Window.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 ===================================================================
-æææç: æäæèääèåçåã
+Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 
- åææå: sc/source/ui/vba/testvba/TestDocuments/partition.xls
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 ___________________________________________________________________
-ååå: svn:mime-type
+Added: svn:mime-type
    + application/octet-stream
 
 Index: sc/source/ui/vba/testvba/runTests.pl
 ===================================================================
---- sc/source/ui/vba/testvba/runTests.pl	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/runTests.pl	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/runTests.pl	(revision 0)
++++ sc/source/ui/vba/testvba/runTests.pl	(revision 266505)
 @@ -0,0 +1,121 @@
 +#!/usr/bin/perl -w
 +use URI::Escape;
@@ -23343,7 +23530,7 @@
 +my $officepath = shift || die "please specify path to office installation program dir";
 +my $DocName = shift || "";
 +my $programpath = "$officepath"."3/program:$officepath/program:";
-+my $basiclibrarypath = "$officepath/basis3.0/program";
++my $basiclibrarypath = "$officepath/basis3.1/program";
 +my $urelibpath = "$officepath/ure/lib";
 +my $binext = "";
 +my $testDocDir = "$binDir/TestDocuments";
@@ -23444,8 +23631,8 @@
 +$status = system( $analyseCmd );
 Index: sc/source/ui/vba/testvba/makefile.mk
 ===================================================================
---- sc/source/ui/vba/testvba/makefile.mk	ïrevision 264185ï
-+++ sc/source/ui/vba/testvba/makefile.mk	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/makefile.mk	(revision 264185)
++++ sc/source/ui/vba/testvba/makefile.mk	(revision 266505)
 @@ -30,28 +30,44 @@
  #*************************************************************************
  
@@ -23510,8 +23697,8 @@
 +
 Index: sc/source/ui/vba/testvba/testResult.pl
 ===================================================================
---- sc/source/ui/vba/testvba/testResult.pl	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/testResult.pl	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/testResult.pl	(revision 0)
++++ sc/source/ui/vba/testvba/testResult.pl	(revision 266505)
 @@ -0,0 +1,171 @@
 +#!/usr/bin/perl -w
 +use File::Temp qw/ tempfile tempdir /;
@@ -23686,8 +23873,8 @@
 +}
 Index: sc/source/ui/vba/testvba/testvba.cxx
 ===================================================================
---- sc/source/ui/vba/testvba/testvba.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/testvba/testvba.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/testvba.cxx	(revision 0)
++++ sc/source/ui/vba/testvba/testvba.cxx	(revision 266505)
 @@ -0,0 +1,309 @@
 +#include "cppuhelper/bootstrap.hxx"
 +
@@ -24000,8 +24187,8 @@
 +}
 Index: sc/source/ui/vba/testvba/testResults.pl
 ===================================================================
---- sc/source/ui/vba/testvba/testResults.pl	ïrevision 264185ï
-+++ sc/source/ui/vba/testvba/testResults.pl	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/testResults.pl	(revision 264185)
++++ sc/source/ui/vba/testvba/testResults.pl	(revision 266505)
 @@ -1,10 +1,11 @@
  #!/usr/bin/perl -w
 -
@@ -24032,8 +24219,8 @@
        if ( ($status >>=8) == 0 &&  ( $info->size == 0)  ) {
 Index: sc/source/ui/vba/testvba/README
 ===================================================================
---- sc/source/ui/vba/testvba/README	ïrevision 264185ï
-+++ sc/source/ui/vba/testvba/README	ïrevision 265237ï
+--- sc/source/ui/vba/testvba/README	(revision 264185)
++++ sc/source/ui/vba/testvba/README	(revision 266505)
 @@ -1,35 +1,37 @@
 -running dmake in this directory runs a set of regression (unit) tests.
 +to run the tests 
@@ -24098,8 +24285,8 @@
 +Note also: the testclient will attempt to connect to an existing instance of open-office, when the testClient exits the soffice process may still be running, if you wish to repeat tests you may want to kill the office instance before re-running.
 Index: sc/source/ui/vba/vbahelper.cxx
 ===================================================================
---- sc/source/ui/vba/vbahelper.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbahelper.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbahelper.cxx	(revision 264185)
++++ sc/source/ui/vba/vbahelper.cxx	(revision 266505)
 @@ -37,6 +37,7 @@
  #include <com/sun/star/uno/XComponentContext.hpp>
  #include <com/sun/star/lang/XMultiComponentFactory.hpp>
@@ -24108,20 +24295,21 @@
  
  #include <comphelper/processfactory.hxx>
  
-@@ -57,9 +58,10 @@
+@@ -57,9 +58,11 @@
  #include "tabvwsh.hxx"
  #include "transobj.hxx"
  #include "scmod.hxx"
 -
 +#include "vbashape.hxx"
 +#include "unonames.hxx"
++#include "cellsuno.hxx"
  using namespace ::com::sun::star;
 -using namespace ::org::openoffice;
 +using namespace ::ooo::vba;
  
  #define POINTTO100THMILLIMETERFACTOR 35.27778
  void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue );
-@@ -67,13 +69,25 @@ void unoToSbxValue( SbxVariable* pVar, const uno::
+@@ -67,13 +70,25 @@ void unoToSbxValue( SbxVariable* pVar, const uno::
  uno::Any sbxToUnoValue( SbxVariable* pVar );
  
  
@@ -24149,7 +24337,7 @@
  uno::Reference< script::XTypeConverter >
  getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
  {
-@@ -215,11 +229,27 @@ dispatchRequests (uno::Reference< frame::XModel>&
+@@ -215,11 +230,27 @@ dispatchRequests (uno::Reference< frame::XModel>&
  }
  
  
@@ -24178,7 +24366,7 @@
  	if ( pViewShell )
  	{
  		pViewShell->PasteFromSystem();
-@@ -515,6 +545,11 @@ void PrintOutHelper( const uno::Any& From, const u
+@@ -515,6 +546,11 @@ void PrintOutHelper( const uno::Any& From, const u
  	//   of this method
  }
  
@@ -24190,7 +24378,7 @@
  rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
  {
  	uno::Type aType = pvargItem.getValueType();
-@@ -728,5 +763,56 @@ double PixelsToPoints( css::uno::Reference< css::a
+@@ -728,5 +764,65 @@ double PixelsToPoints( css::uno::Reference< css::a
  	return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR;
  }
  
@@ -24245,12 +24433,21 @@
 +    {
 +	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLWID ) ), uno::makeAny(  Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
 +    }
++
++SfxItemSet*
++ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj )
++{
++	SfxItemSet* pDataSet = pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : NULL ;
++	return pDataSet;
++	
++}
++
  } // openoffice
  } //org
 Index: sc/source/ui/vba/vbacontrol.cxx
 ===================================================================
---- sc/source/ui/vba/vbacontrol.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacontrol.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacontrol.cxx	(revision 264185)
++++ sc/source/ui/vba/vbacontrol.cxx	(revision 266505)
 @@ -36,7 +36,13 @@
  #include <com/sun/star/frame/XModel.hpp>
  #include <com/sun/star/view/XControlAccess.hpp>
@@ -24766,8 +24963,8 @@
 +
 Index: sc/source/ui/vba/vbatextboxshape.hxx
 ===================================================================
---- sc/source/ui/vba/vbatextboxshape.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbatextboxshape.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbatextboxshape.hxx	(revision 0)
++++ sc/source/ui/vba/vbatextboxshape.hxx	(revision 266505)
 @@ -0,0 +1,58 @@
 +/*************************************************************************
 + *
@@ -24829,8 +25026,8 @@
 +#endif //SC_VBA_TEXTBOX_HXX
 Index: sc/source/ui/vba/vbatitle.hxx
 ===================================================================
---- sc/source/ui/vba/vbatitle.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbatitle.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbatitle.hxx	(revision 264185)
++++ sc/source/ui/vba/vbatitle.hxx	(revision 266505)
 @@ -37,7 +37,7 @@
  #include "vbapalette.hxx"
  #include <com/sun/star/drawing/XShape.hpp>
@@ -24895,8 +25092,8 @@
  	}
 Index: sc/source/ui/vba/vbaimage.hxx
 ===================================================================
---- sc/source/ui/vba/vbaimage.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbaimage.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaimage.hxx	(revision 0)
++++ sc/source/ui/vba/vbaimage.hxx	(revision 266505)
 @@ -0,0 +1,48 @@
 +/*************************************************************************
 + *
@@ -24948,8 +25145,8 @@
 +#endif //SC_VBA_IMAGE_HXX
 Index: sc/source/ui/vba/vbacondition.hxx
 ===================================================================
---- sc/source/ui/vba/vbacondition.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacondition.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacondition.hxx	(revision 264185)
++++ sc/source/ui/vba/vbacondition.hxx	(revision 266505)
 @@ -42,7 +42,7 @@ typedef InheritedHelperInterfaceImpl1< Ifc1 > ScVb
  	css::uno::Reference< css::sheet::XCellRangeAddressable > mxAddressable;
  	css::uno::Reference< css::sheet::XSheetCondition > mxSheetCondition;
@@ -24961,8 +25158,8 @@
  
 Index: sc/source/ui/vba/vbacolorformat.hxx
 ===================================================================
---- sc/source/ui/vba/vbacolorformat.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacolorformat.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacolorformat.hxx	(revision 264185)
++++ sc/source/ui/vba/vbacolorformat.hxx	(revision 266505)
 @@ -31,12 +31,12 @@
  #define SC_VBA_XCOLORFORMAT_HXX
  
@@ -24999,8 +25196,8 @@
      virtual sal_Int32 SAL_CALL getRGB() throw (css::uno::RuntimeException);
 Index: sc/source/ui/vba/vbacommandbarcontrols.hxx
 ===================================================================
---- sc/source/ui/vba/vbacommandbarcontrols.hxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacommandbarcontrols.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacommandbarcontrols.hxx	(revision 0)
++++ sc/source/ui/vba/vbacommandbarcontrols.hxx	(revision 266505)
 @@ -0,0 +1,90 @@
 +/*************************************************************************
 + *
@@ -25094,8 +25291,8 @@
 +#endif//SC_VBA_COMMANDBARCONTROLS_HXX
 Index: sc/source/ui/vba/vbarange.cxx
 ===================================================================
---- sc/source/ui/vba/vbarange.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbarange.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbarange.cxx	(revision 264185)
++++ sc/source/ui/vba/vbarange.cxx	(revision 266505)
 @@ -91,30 +91,31 @@
  #include <com/sun/star/sheet/XSubTotalDescriptor.hpp>
  #include <com/sun/star/sheet/GeneralFunction.hdl>
@@ -25193,7 +25390,7 @@
  	for ( sal_Int32 index = 0; index < nLen; ++index )
  	{
  		ScRange refRange;
-@@ -231,6 +235,7 @@ uno::Any lcl_makeRange( uno::Reference< uno::XComp
+@@ -231,10 +235,11 @@ uno::Any lcl_makeRange( uno::Reference< uno::XComp
  		// #FIXME need proper (WorkSheet) parent
  		xRange = new ScVbaRange( xParent, xContext, xRanges );
  	}
@@ -25201,7 +25398,27 @@
  	return xRange;
  }
  
-@@ -317,7 +322,7 @@ class ScVbaRangeAreas : public ScVbaCollectionBase
+-SfxItemSet*  ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException )
++ScCellRangeObj*  ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException )
+ {
+ 	uno::Reference< uno::XInterface > xIf;
+ 	if ( mxRanges.is() )
+@@ -242,8 +247,13 @@ uno::Any lcl_makeRange( uno::Reference< uno::XComp
+ 	else 
+ 		xIf.set( mxRange, uno::UNO_QUERY_THROW );
+ 	ScCellRangeObj* pUnoCellRange = dynamic_cast< ScCellRangeObj* >( xIf.get() );
+-	SfxItemSet* pDataSet = 	pUnoCellRange ? pUnoCellRange->GetCurrentDataSet( true ) : NULL ;
++	return pUnoCellRange;
++}
+ 	
++SfxItemSet*  ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException )
++{
++	ScCellRangeObj* pUnoCellRange = getCellRangeObj();
++	SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
+ 	if ( !pDataSet )
+ 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for range" ) ), uno::Reference< uno::XInterface >() );
+ 	return pDataSet;	
+@@ -317,7 +327,7 @@ class ScVbaRangeAreas : public ScVbaCollectionBase
  	bool mbIsRows;
  	bool mbIsColumns;
  public:
@@ -25210,7 +25427,16 @@
  
  	// XEnumerationAccess
  	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException);
-@@ -527,10 +532,38 @@ sal_Int32 m_nArea;
+@@ -460,7 +470,7 @@ class NumFormatHelper
+ 		if ( pUnoCellRange )
+ 		{
+ 			
+-			SfxItemSet* pDataSet = 	pUnoCellRange->GetCurrentDataSet( true );
++			SfxItemSet* pDataSet = 	ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
+ 			SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, TRUE, NULL);
+ 			// one of the cells in the range is not like the other ;-)
+ 			// so return a zero length format to indicate that
+@@ -527,10 +537,38 @@ sal_Int32 m_nArea;
  typedef ::cppu::WeakImplHelper1< container::XEnumeration > CellsEnumeration_BASE;
  typedef ::std::vector< CellPos > vCellPos;
  
@@ -25250,7 +25476,7 @@
  	vCellPos m_CellPositions;	
  	vCellPos::const_iterator m_it; 
  	uno::Reference< table::XCellRange > getArea( sal_Int32 nVBAIndex ) throw ( uno::RuntimeException )
-@@ -559,7 +592,7 @@ class CellsEnumeration : public CellsEnumeration_B
+@@ -559,7 +597,7 @@ class CellsEnumeration : public CellsEnumeration_B
  		}
  	}
  public:
@@ -25259,7 +25485,7 @@
  	{
  		sal_Int32 nItems = m_xAreas->getCount();
  		for ( sal_Int32 index=1; index <= nItems; ++index )
-@@ -579,7 +612,7 @@ class CellsEnumeration : public CellsEnumeration_B
+@@ -579,7 +617,7 @@ class CellsEnumeration : public CellsEnumeration_B
  		uno::Reference< table::XCellRange > xRangeArea = getArea( aPos.m_nArea );
  		uno::Reference< table::XCellRange > xCellRange( xRangeArea->getCellByPosition(  aPos.m_nCol, aPos.m_nRow ), uno::UNO_QUERY_THROW );
  		// #FIXME need proper (WorkSheet) parent
@@ -25268,15 +25494,15 @@
  
  	}
  };
-@@ -751,6 +784,7 @@ class CellFormulaValueSetter : public CellValueSet
+@@ -751,6 +789,7 @@ class CellFormulaValueSetter : public CellValueSet
  	bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell )
  	{
  		rtl::OUString sFormula;
-+		double aDblValue;
++		double aDblValue = 0.0;
  		if ( aValue >>= sFormula )
  		{
              // convert to CONV_OOO style formula string because XCell::setFormula
-@@ -777,6 +811,11 @@ class CellFormulaValueSetter : public CellValueSet
+@@ -777,6 +816,11 @@ class CellFormulaValueSetter : public CellValueSet
  			xCell->setFormula( sFormula );
  			return true;
  		}
@@ -25288,7 +25514,7 @@
  		return false;
  	}
  		
-@@ -801,7 +840,7 @@ class CellFormulaValueGetter : public CellValueGet
+@@ -801,7 +845,7 @@ class CellFormulaValueGetter : public CellValueGet
  			pUnoRangesBase )
  		{
  			ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();	
@@ -25297,7 +25523,7 @@
  			aCompiler.CompileString( sVal );
  			// set desired convention
              aCompiler.SetGrammar( m_eGrammar );
-@@ -937,9 +976,9 @@ class RangeCountProcessor : public RangeProcessor
+@@ -937,9 +981,9 @@ class RangeCountProcessor : public RangeProcessor
  class AreasVisitor
  {
  private:
@@ -25309,7 +25535,7 @@
  	
  	void visit( RangeProcessor& processor )
  	{
-@@ -998,7 +1037,7 @@ class RangeHelper
+@@ -998,7 +1042,7 @@ class RangeHelper
   sal_Int32 nEndColOffset = 0, sal_Int32 nEndRowOffset = 0 )
  	{
  		// #FIXME need proper (WorkSheet) parent
@@ -25318,7 +25544,7 @@
  			xRange->getCellRangeByPosition(
  				xCellRangeAddressable->getRangeAddress().StartColumn + nStartColOffset,
  				xCellRangeAddressable->getRangeAddress().StartRow + nStartRowOffset,
-@@ -1096,12 +1135,12 @@ getRangeForName( const uno::Reference< uno::XCompo
+@@ -1096,12 +1140,12 @@ getRangeForName( const uno::Reference< uno::XCompo
  	{
  		uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pDocSh, *aCellRanges.First() ) );
  		// #FIXME need proper (WorkSheet) parent
@@ -25333,7 +25559,7 @@
  }
  
  css::uno::Reference< excel::XRange >
-@@ -1149,27 +1188,36 @@ table::CellRangeAddress getCellRangeAddressForVBAR
+@@ -1149,27 +1193,36 @@ table::CellRangeAddress getCellRangeAddressForVBAR
  
  }
  
@@ -25377,7 +25603,7 @@
  : ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRange, uno::UNO_QUERY_THROW ), getModelFromRange( xRange), true ), mxRange( xRange ),
                  mbIsRows( bIsRows ),
                  mbIsColumns( bIsColumns )
-@@ -1184,7 +1232,7 @@ ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> c
+@@ -1184,7 +1237,7 @@ ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> c
  
  }
  
@@ -25386,7 +25612,7 @@
  : ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRanges, uno::UNO_QUERY_THROW ), getModelFromXIf( uno::Reference< uno::XInterface >( xRanges, uno::UNO_QUERY_THROW ) ), true ), mxRanges( xRanges ),mbIsRows( bIsRows ), mbIsColumns( bIsColumns )
  
  {
-@@ -1197,7 +1245,7 @@ ScVbaRange::~ScVbaRange()
+@@ -1197,7 +1250,7 @@ ScVbaRange::~ScVbaRange()
  {
  }
  
@@ -25395,7 +25621,7 @@
  {
  	if ( !m_Borders.is() )
  	{
-@@ -1530,7 +1578,7 @@ ScVbaRange::fillSeries( sheet::FillDirection nFill
+@@ -1530,7 +1583,7 @@ ScVbaRange::fillSeries( sheet::FillDirection nFill
  	if ( m_Areas->getCount() > 1 )
  	{
  		// Multi-Area Range
@@ -25404,7 +25630,7 @@
  		for ( sal_Int32 index = 1; index <= xCollection->getCount(); ++index )
  		{
  			uno::Reference< excel::XRange > xRange( xCollection->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-@@ -1737,7 +1785,7 @@ ScVbaRange::Address(  const uno::Any& RowAbsolute,
+@@ -1737,7 +1790,7 @@ ScVbaRange::Address(  const uno::Any& RowAbsolute,
  	{
  		// Multi-Area Range
  		rtl::OUString sAddress;
@@ -25413,7 +25639,26 @@
                  uno::Any aExternalCopy = External;
  		for ( sal_Int32 index = 1; index <= xCollection->getCount(); ++index )
  		{
-@@ -1845,14 +1893,43 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, cons
+@@ -1820,15 +1873,15 @@ ScVbaRange::Font() throw ( script::BasicErrorExcep
+ 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
+ 
+ 	ScVbaPalette aPalette( pDoc->GetDocumentShell() );	
+-	SfxItemSet* pSet = NULL;
++	ScCellRangeObj* pRangeObj = NULL;
+ 	try
+ 	{
+-		pSet = getCurrentDataSet();
++		pRangeObj = getCellRangeObj();
+ 	}
+ 	catch( uno::Exception& ) 
+ 	{
+ 	}
+-	return  new ScVbaFont( this, mxContext, aPalette, xProps, pSet );
++	return  new ScVbaFont( this, mxContext, aPalette, xProps, pRangeObj );
+ }
+                                                                                                                              
+ uno::Reference< excel::XRange >
+@@ -1845,14 +1898,43 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, cons
  	}
  
  	sal_Int32 nRow = 0, nColumn = 0;
@@ -25459,7 +25704,7 @@
  
  	sal_Int32 nIndex = --nRow;
  	if( bIsIndex && !bIsColumnIndex ) // .Cells(n)
-@@ -1888,9 +1965,22 @@ ScVbaRange::Select() throw (uno::RuntimeException)
+@@ -1888,9 +1970,22 @@ ScVbaRange::Select() throw (uno::RuntimeException)
  			xSelection->select( uno::makeAny( mxRanges ) );
  		else
  			xSelection->select( uno::makeAny( mxRange ) );
@@ -25482,7 +25727,7 @@
  bool cellInRange( const table::CellRangeAddress& rAddr, const sal_Int32& nCol, const sal_Int32& nRow )
  {
  	if ( nCol >= rAddr.StartColumn && nCol <= rAddr.EndColumn &&
-@@ -2685,6 +2775,167 @@ ScVbaRange::Replace( const ::rtl::OUString& What,
+@@ -2685,6 +2780,167 @@ ScVbaRange::Replace( const ::rtl::OUString& What,
  	return sal_True; // always
  }
  
@@ -25491,8 +25736,8 @@
 +{
 +    // return a Range object that represents the first cell where that information is found.
 +    rtl::OUString sWhat;
-+    sal_Int32 nWhat;
-+    float fWhat;
++    sal_Int32 nWhat = 0;
++    float fWhat = 0.0;
 +    
 +    // string.
 +    if( What >>= sWhat )
@@ -25541,10 +25786,10 @@
 +        // LookIn
 +        if( LookIn.hasValue() )
 +        {
-+            sal_Int32 nLookIn;
++            sal_Int32 nLookIn = 0;
 +            if( LookIn >>= nLookIn )
 +            {
-+                sal_Int16 nSearchType; 
++                sal_Int16 nSearchType = 0; 
 +                switch( nLookIn )
 +                {
 +                    case excel::XlFindLookIn::xlComments :
@@ -25598,7 +25843,7 @@
 +        // SearchDirection
 +        if ( SearchDirection.hasValue() )
 +        {
-+            sal_Int32 nSearchDirection;
++            sal_Int32 nSearchDirection = 0;
 +            if( SearchDirection >>= nSearchDirection )
 +            {
 +                sal_Bool bSearchBackwards = sal_False;
@@ -25650,7 +25895,7 @@
  uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Reference<  uno::XComponentContext >& xContext, ScDocShell* pDocSh )
  {
  	uno::Reference< excel::XRange > xKeyRange;
-@@ -2738,10 +2989,10 @@ void updateTableSortField( const uno::Reference< t
+@@ -2738,10 +2994,10 @@ void updateTableSortField( const uno::Reference< t
  
  		// make sure that upper left poing of key range is within the
  		// parent range
@@ -25664,7 +25909,7 @@
  		{
  			//determine col/row index
  			if ( bIsSortColumn )
-@@ -2797,7 +3048,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno:
+@@ -2797,7 +3053,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno:
  /* 
  	if (  isSingleCellRange() )
  	{
@@ -25673,7 +25918,7 @@
  		xCurrent->Sort( Key1, Order1, Key2, Type, Order2, Key3, Order3, Header, OrderCustom, MatchCase, Orientation, SortMethod, DataOption1, DataOption2, DataOption3 );
  		return; 
  	}
-@@ -3115,6 +3366,18 @@ ScVbaRange::hasElements() throw (uno::RuntimeExcep
+@@ -3115,6 +3371,18 @@ ScVbaRange::hasElements() throw (uno::RuntimeExcep
  uno::Reference< container::XEnumeration > SAL_CALL 
  ScVbaRange::createEnumeration() throw (uno::RuntimeException)
  {
@@ -25692,7 +25937,7 @@
  	return new CellsEnumeration( mxContext, m_Areas );
  }
  
-@@ -3362,26 +3625,32 @@ ScVbaRange::getRowHeight() throw (uno::RuntimeExce
+@@ -3362,26 +3630,32 @@ ScVbaRange::getRowHeight() throw (uno::RuntimeExce
  		return xRange->getRowHeight();
  	}	
  
@@ -25730,7 +25975,7 @@
  	return uno::makeAny( nHeight );
  }
  
-@@ -3553,7 +3822,7 @@ ScVbaRange::getWorksheet() throw (uno::RuntimeExce
+@@ -3553,7 +3827,7 @@ ScVbaRange::getWorksheet() throw (uno::RuntimeExce
  		ScDocShell* pDocShell = getDocShellFromRange(xRange);
  		RangeHelper rHelper(xRange);
  		// parent should be Thisworkbook
@@ -25739,7 +25984,7 @@
  	}	
  	return xSheet;
  }
-@@ -3620,14 +3889,14 @@ ScVbaRange::ApplicationRange( const uno::Reference
+@@ -3620,14 +3894,14 @@ ScVbaRange::ApplicationRange( const uno::Reference
  			if ( xRange.is() )
  			{
  				// #FIXME need proper (WorkSheet) parent
@@ -25756,7 +26001,7 @@
  	uno::Reference< excel::XRange > xVbSheetRange( pRange );
  	return pRange->Range( Cell1, Cell2, true ); 
  }
-@@ -4118,7 +4387,7 @@ ScVbaRange::Autofit() throw (uno::RuntimeException
+@@ -4118,7 +4392,7 @@ ScVbaRange::Autofit() throw (uno::RuntimeException
  		// if the range is a not a row or column range autofit will
  		// throw an error
  
@@ -25765,7 +26010,7 @@
  			DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); 			
          ScDocShell* pDocShell = getDocShellFromRange( mxRange );
          if ( pDocShell )
-@@ -4297,7 +4566,114 @@ void ScVbaRange::setFormulaHidden(const uno::Any&
+@@ -4297,7 +4571,114 @@ void ScVbaRange::setFormulaHidden(const uno::Any&
  	xProps->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLPRO)), uno::makeAny(rCellAttr));
  }
  
@@ -25867,8 +26112,8 @@
 +            }
 +            else
 +            {
-+                ScRange refRange( aCellAddress.StartColumn, aCellAddress.StartRow, aCellAddress.Sheet, 
-+                                  aCellAddress.EndColumn, aCellAddress.EndRow, aCellAddress.Sheet);
++                ScRange refRange( static_cast< SCCOL >( aCellAddress.StartColumn ), static_cast< SCROW >( aCellAddress.StartRow ), static_cast< SCTAB >( aCellAddress.Sheet ), 
++                                  static_cast< SCCOL >( aCellAddress.EndColumn ), static_cast< SCROW >( aCellAddress.EndRow ), static_cast< SCTAB >( aCellAddress.Sheet ) );
 +                uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getScDocShell() , refRange ) );
 +                return new ScVbaRange( getParent(),mxContext,xRange );
 +            }
@@ -25880,7 +26125,7 @@
  void SAL_CALL 
  ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException)
  {
-@@ -4515,7 +4891,7 @@ ScVbaRange::AutoOutline(  ) throw (script::BasicEr
+@@ -4515,7 +4896,7 @@ ScVbaRange::AutoOutline(  ) throw (script::BasicEr
  {
  	// #TODO #FIXME needs to check for summary row/col ( whatever they are )
  	// not valid for multi Area Addresses
@@ -25889,7 +26134,7 @@
  		DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY); 			
  	// So needs to either span an entire Row or a just be a single cell 
  	// ( that contains a summary RowColumn )
-@@ -4733,6 +5109,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType,
+@@ -4733,6 +5114,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType,
  		case excel::XlCellType::xlCellTypeConstants:
  		case excel::XlCellType::xlCellTypeFormulas:
  		case excel::XlCellType::xlCellTypeVisible:
@@ -25897,7 +26142,7 @@
  		{
  			if ( bIsMultiArea )
  			{
-@@ -4893,7 +5270,7 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal
+@@ -4893,7 +5275,7 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal
  		sal_Bool bAddPageBreaks = sal_False;
  		PageBreaks >>= bAddPageBreaks;
  
@@ -25906,7 +26151,7 @@
  		uno::Reference< sheet::XSubTotalDescriptor > xSubDesc = xSub->createSubTotalDescriptor(sal_True);
  		uno::Reference< beans::XPropertySet > xSubDescPropertySet( xSubDesc, uno::UNO_QUERY_THROW );
  		xSubDescPropertySet->setPropertyValue(INSERTPAGEBREAKS, uno::makeAny( bAddPageBreaks));
-@@ -4954,27 +5331,6 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal
+@@ -4954,27 +5336,6 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal
  	}
  }
  
@@ -25934,7 +26179,7 @@
  rtl::OUString& 
  ScVbaRange::getServiceImplName()
  {
-@@ -4989,7 +5345,7 @@ ScVbaRange::getServiceNames()
+@@ -4989,7 +5350,7 @@ ScVbaRange::getServiceNames()
  	if ( aServiceNames.getLength() == 0 )
  	{
  		aServiceNames.realloc( 1 );
@@ -25943,7 +26188,7 @@
  	}
  	return aServiceNames;
  }
-@@ -5001,5 +5357,5 @@ sdecl::vba_service_class_<ScVbaRange, sdecl::with_
+@@ -5001,5 +5362,5 @@ sdecl::vba_service_class_<ScVbaRange, sdecl::with_
  extern sdecl::ServiceDecl const serviceDecl(
      serviceImpl,
      "SvVbaRange",
@@ -25952,8 +26197,8 @@
  }
 Index: sc/source/ui/vba/vbachartobject.hxx
 ===================================================================
---- sc/source/ui/vba/vbachartobject.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbachartobject.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbachartobject.hxx	(revision 264185)
++++ sc/source/ui/vba/vbachartobject.hxx	(revision 266505)
 @@ -35,11 +35,11 @@
  #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
  #include <com/sun/star/container/XNamed.hpp>
@@ -25989,8 +26234,8 @@
  	// XHelperInterface
 Index: sc/source/ui/vba/vbatextbox.cxx
 ===================================================================
---- sc/source/ui/vba/vbatextbox.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbatextbox.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbatextbox.cxx	(revision 264185)
++++ sc/source/ui/vba/vbatextbox.cxx	(revision 266505)
 @@ -33,15 +33,28 @@
  #include <vector>
  
@@ -26062,8 +26307,8 @@
 +}
 Index: sc/source/ui/vba/vbaworkbook.cxx
 ===================================================================
---- sc/source/ui/vba/vbaworkbook.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaworkbook.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaworkbook.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaworkbook.cxx	(revision 266505)
 @@ -38,7 +38,7 @@
  #include <com/sun/star/frame/XStorable.hpp>
  #include <com/sun/star/frame/XFrame.hpp>
@@ -26182,8 +26427,8 @@
  }
 Index: sc/source/ui/vba/vbaformatcondition.cxx
 ===================================================================
---- sc/source/ui/vba/vbaformatcondition.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaformatcondition.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaformatcondition.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaformatcondition.cxx	(revision 266505)
 @@ -29,9 +29,9 @@
   ************************************************************************/
  #include "vbaformatcondition.hxx"
@@ -26216,8 +26461,8 @@
  }
 Index: sc/source/ui/vba/vbainterior.hxx
 ===================================================================
---- sc/source/ui/vba/vbainterior.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbainterior.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbainterior.hxx	(revision 264185)
++++ sc/source/ui/vba/vbainterior.hxx	(revision 266505)
 @@ -30,7 +30,7 @@
  #ifndef SC_VBA_INTERIOR_HXX
  #define SC_VBA_INTERIOR_HXX
@@ -26276,8 +26521,8 @@
  	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
 Index: sc/source/ui/vba/vbashape.cxx
 ===================================================================
---- sc/source/ui/vba/vbashape.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbashape.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbashape.cxx	(revision 264185)
++++ sc/source/ui/vba/vbashape.cxx	(revision 266505)
 @@ -27,8 +27,8 @@
   * for a copy of the LGPLv3 License.
   *
@@ -26321,8 +26566,8 @@
  }
 Index: sc/source/ui/vba/vbauserform.cxx
 ===================================================================
---- sc/source/ui/vba/vbauserform.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbauserform.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbauserform.cxx	(revision 0)
++++ sc/source/ui/vba/vbauserform.cxx	(revision 266505)
 @@ -0,0 +1,228 @@
 +/*************************************************************************
 + *
@@ -26554,8 +26799,8 @@
 +
 Index: sc/source/ui/vba/vbanames.cxx
 ===================================================================
---- sc/source/ui/vba/vbanames.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbanames.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbanames.cxx	(revision 264185)
++++ sc/source/ui/vba/vbanames.cxx	(revision 266505)
 @@ -42,16 +42,16 @@
  #include "tabvwsh.hxx"
  #include "viewdata.hxx"
@@ -26613,8 +26858,8 @@
  }
 Index: sc/source/ui/vba/vbacommandbarcontrol.cxx
 ===================================================================
---- sc/source/ui/vba/vbacommandbarcontrol.cxx	ïrevision 0ï
-+++ sc/source/ui/vba/vbacommandbarcontrol.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacommandbarcontrol.cxx	(revision 0)
++++ sc/source/ui/vba/vbacommandbarcontrol.cxx	(revision 266505)
 @@ -0,0 +1,403 @@
 +/*************************************************************************
 + *
@@ -27021,8 +27266,8 @@
 +}
 Index: sc/source/ui/vba/vbaaxes.hxx
 ===================================================================
---- sc/source/ui/vba/vbaaxes.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaaxes.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaaxes.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaaxes.hxx	(revision 266505)
 @@ -29,17 +29,17 @@
   ************************************************************************/
  #ifndef SC_VBA_AXES_HXX
@@ -27058,8 +27303,8 @@
  #endif //SC_VBA_AXES_HXX
 Index: sc/source/ui/vba/vbachart.hxx
 ===================================================================
---- sc/source/ui/vba/vbachart.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbachart.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbachart.hxx	(revision 264185)
++++ sc/source/ui/vba/vbachart.hxx	(revision 266505)
 @@ -38,12 +38,12 @@
  #include <com/sun/star/chart/XAxisZSupplier.hpp>
  #include <com/sun/star/chart/XTwoAxisXSupplier.hpp>
@@ -27115,8 +27360,8 @@
  	virtual rtl::OUString& getServiceImplName();
 Index: sc/source/ui/vba/vbaaxistitle.cxx
 ===================================================================
---- sc/source/ui/vba/vbaaxistitle.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaaxistitle.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaaxistitle.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaaxistitle.cxx	(revision 266505)
 @@ -30,9 +30,9 @@
  #include "vbaaxistitle.hxx"
  
@@ -27140,8 +27385,8 @@
  	}
 Index: sc/source/ui/vba/vbaformatconditions.cxx
 ===================================================================
---- sc/source/ui/vba/vbaformatconditions.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaformatconditions.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaformatconditions.cxx	(revision 264185)
++++ sc/source/ui/vba/vbaformatconditions.cxx	(revision 266505)
 @@ -28,7 +28,7 @@
   *
   ************************************************************************/
@@ -27220,8 +27465,8 @@
  }
 Index: sc/source/ui/vba/vbaoutline.hxx
 ===================================================================
---- sc/source/ui/vba/vbaoutline.hxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbaoutline.hxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbaoutline.hxx	(revision 264185)
++++ sc/source/ui/vba/vbaoutline.hxx	(revision 266505)
 @@ -32,17 +32,17 @@
  
  #include <com/sun/star/sheet/XSheetOutline.hpp>
@@ -27245,8 +27490,8 @@
  	virtual ~ScVbaOutline(){}
 Index: sc/source/ui/vba/vbacharts.cxx
 ===================================================================
---- sc/source/ui/vba/vbacharts.cxx	ïrevision 264185ï
-+++ sc/source/ui/vba/vbacharts.cxx	ïrevision 265237ï
+--- sc/source/ui/vba/vbacharts.cxx	(revision 264185)
++++ sc/source/ui/vba/vbacharts.cxx	(revision 266505)
 @@ -32,10 +32,10 @@
  #include <com/sun/star/table/XTableChartsSupplier.hpp>
  
@@ -27271,8 +27516,8 @@
  }
 Index: sc/inc/compiler.hxx
 ===================================================================
---- sc/inc/compiler.hxx	ïrevision 264185ï
-+++ sc/inc/compiler.hxx	ïrevision 265237ï
+--- sc/inc/compiler.hxx	(revision 264185)
++++ sc/inc/compiler.hxx	(revision 266505)
 @@ -513,6 +513,9 @@ class SC_DLLPUBLIC ScCompiler
       */
      static OpCodeMapPtr GetOpCodeMap( const sal_Int32 nLanguage );
@@ -27285,8 +27530,8 @@
                          { bCompileForFAP = bVal; bIgnoreErrors = bVal; }
 Index: sc/inc/document.hxx
 ===================================================================
---- sc/inc/document.hxx	ïrevision 264185ï
-+++ sc/inc/document.hxx	ïrevision 265237ï
+--- sc/inc/document.hxx	(revision 264185)
++++ sc/inc/document.hxx	(revision 266505)
 @@ -690,7 +690,7 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollection() con
  	BOOL			HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect );
  	BOOL			HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect );
@@ -27296,10 +27541,38 @@
  	BOOL			SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline );
  
  	void			DoAutoOutline( SCCOL nStartCol, SCROW nStartRow,
+Index: sc/inc/cellsuno.hxx
+===================================================================
+--- sc/inc/cellsuno.hxx	(revision 264185)
++++ sc/inc/cellsuno.hxx	(revision 266505)
+@@ -149,6 +149,13 @@ class ScHelperFunctions
+ 						const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner );
+ };
+ 
++namespace ooo
++{
++    namespace vba {
++	class ScVbaCellRangeAccess;  // Vba Helper class 
++    }
++}
++
+ class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet,
+ 						 public com::sun::star::beans::XMultiPropertySet,
+ 						 public com::sun::star::beans::XPropertyState,
+@@ -168,8 +175,7 @@ class SC_DLLPUBLIC ScCellRangesBase : public com::
+ {
+ 	friend class ScTabViewObj;		// fuer select()
+ 	friend class ScTableSheetObj;	// fuer createCursorByRange()
+-	friend class NumFormatHelper;	// VBA helper Class that helps manipulate format data
+-	friend class ScVbaRange;	//Main VBA helper class for Range
++ 	friend class ooo::vba::ScVbaCellRangeAccess;
+ 
+ private:
+ 	SfxItemPropertySet		aPropSet;
 Index: sc/inc/olinetab.hxx
 ===================================================================
---- sc/inc/olinetab.hxx	ïrevision 264185ï
-+++ sc/inc/olinetab.hxx	ïrevision 265237ï
+--- sc/inc/olinetab.hxx	(revision 264185)
++++ sc/inc/olinetab.hxx	(revision 266505)
 @@ -111,7 +111,7 @@ friend class ScSubOutlineIterator;
  
      ScOutlineEntry*         GetEntry( USHORT nLevel, USHORT nIndex ) const;
@@ -27311,8 +27584,8 @@
      BOOL                    GetEntryIndexInRange(
 Index: basic/source/runtime/step2.cxx
 ===================================================================
---- basic/source/runtime/step2.cxx	ïrevision 264185ï
-+++ basic/source/runtime/step2.cxx	ïrevision 265237ï
+--- basic/source/runtime/step2.cxx	(revision 264185)
++++ basic/source/runtime/step2.cxx	(revision 266505)
 @@ -71,7 +71,7 @@ SbxArray* getVBAGlobals( )
  	xCtx.set( xProps->getPropertyValue( rtl::OUString(
  		RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))),
@@ -27324,8 +27597,8 @@
  
 Index: basic/source/classes/sbunoobj.cxx
 ===================================================================
---- basic/source/classes/sbunoobj.cxx	ïrevision 264185ï
-+++ basic/source/classes/sbunoobj.cxx	ïrevision 265237ï
+--- basic/source/classes/sbunoobj.cxx	(revision 264185)
++++ basic/source/classes/sbunoobj.cxx	(revision 266505)
 @@ -117,7 +117,7 @@ static String ID_DBG_PROPERTIES( RTL_CONSTASCII_US
  static String ID_DBG_METHODS( RTL_CONSTASCII_USTRINGPARAM("Dbg_Methods") );
  



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]