ooo-build r13875 - in trunk: . patches/dev300

From: pflin svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13875 - in trunk: . patches/dev300
Date: Thu, 11 Sep 2008 08:44:44 +0000 (UTC)
Author: pflin
Date: Thu Sep 11 08:44:43 2008
New Revision: 13875
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13875&view=rev

Log:
2008-09-11  Fong Lin  <pflin novell com>
	* patches/dev300/cws-npower11.diff: worksheet function fix and
    window api fix.
    * patches/dev300/cws-pflin10.diff: merge some basic fix.
    * patches/dev300/apply.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/cws-npower11.diff
   trunk/patches/dev300/cws-pflin10.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Sep 11 08:44:43 2008
@@ -1513,9 +1513,6 @@
 #associating sheet and codename when insert a sheet
 # sc-insert-sheet-codename.diff, i#80869, jianhua
 
-# NOT parameter without brackets
-vba-not-param-withoutbrackets.diff, n#397325, Fong
-
 # hack for when resolving a symbol in the module ThisWorkbook
 #vba-symbol-searchhack-for-thisworkbook.diff
 vba-allow-ranges-for-cell-functions.diff
@@ -1595,12 +1592,7 @@
 vba-empty-comparison-fix.diff, n#397438, Fong
 # Add Worksheet.EnableSelection ( depends on cws-scsheetprotection02-sc.diff )
 vba-worksheet-enableselection.diff, n#405312, Fong
-# needs a ScCompiler change upstream
-vba-worksheetfunctions-fix.diff, n#414248, Fong
 
-# Fixed for n#407805
-basic-not-is-nothing.diff, n#407805, Fong
-basic-replace-function-fix.diff, n#411203, Fong
 # keywords (including NAME, LINE, TEXT) can be used as variable 
 vba-keyword-fix.diff, n#403586, Fong
 
@@ -1622,10 +1614,6 @@
 # fix bad intersect api, need to be folded into npower11
 # also needs some testing
 vba-intersect-multi-area.diff
-# fix datevalue function in non-en_US locale
-vba-datevalue-function-fix.diff, Fong
-# fix window.SplitRow issue
-vba-window-api-fix.diff, Fong
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao
@@ -1636,6 +1624,21 @@
 #not so useful but perhaps we can build on it later
 basic-speedup-fix.diff
 
+# the following patch is in cws pflin10
+# NOT parameter without brackets
+vba-not-param-withoutbrackets.diff, n#397325, Fong
+# fix datevalue function in non-en_US locale
+vba-datevalue-function-fix.diff, Fong
+# Fixed for n#407805
+basic-not-is-nothing.diff, n#407805, Fong
+basic-replace-function-fix.diff, n#411203, Fong
+
+# the following patch is in cws npower11
+# needs a ScCompiler change upstream
+vba-worksheetfunctions-fix.diff, n#414248, Fong
+# fix window.SplitRow issue
+vba-window-api-fix.diff, Fong
+
 [ VBAObjects < ooo300-m3 ]
 bytearray-string-fix.diff, i#91911, Fong
 

Modified: trunk/patches/dev300/cws-npower11.diff
==============================================================================
--- trunk/patches/dev300/cws-npower11.diff	(original)
+++ trunk/patches/dev300/cws-npower11.diff	Thu Sep 11 08:44:43 2008
@@ -1,9 +1,27 @@
+Index: sc/inc/compiler.hxx
+===================================================================
+RCS file: /cvs/sc/sc/inc/compiler.hxx,v
+retrieving revision 1.39
+retrieving revision 1.39.24.1
+diff -u -p -b -w -B -r1.39 -r1.39.24.1
+--- sc/inc/compiler.hxx	8 Jul 2008 07:19:00 -0000	1.39
++++ sc/inc/compiler.hxx	11 Sep 2008 06:11:48 -0000	1.39.24.1
+@@ -513,6 +513,9 @@ public:
+      */
+     static OpCodeMapPtr GetOpCodeMap( const sal_Int32 nLanguage );
+ 
++    // Check if it is a valid english function name
++    static bool IsEnglishSymbol( const String& rName ); 
++
+     //! _either_ CompileForFAP _or_ AutoCorrection, _not_ both
+     void            SetCompileForFAP( BOOL bVal )
+                         { bCompileForFAP = bVal; bIgnoreErrors = bVal; }
 Index: sc/inc/document.hxx
 ===================================================================
 RCS file: /cvs/sc/sc/inc/document.hxx,v
 retrieving revision 1.115
 retrieving revision 1.115.22.3
-diff -u -p -u -p -b -w -B -r1.115 -r1.115.22.3
+diff -u -p -b -w -B -r1.115 -r1.115.22.3
 --- sc/inc/document.hxx	8 Jul 2008 07:19:13 -0000	1.115
 +++ sc/inc/document.hxx	7 Aug 2008 07:40:08 -0000	1.115.22.3
 @@ -703,7 +703,7 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollec
@@ -20,7 +38,7 @@
 RCS file: /cvs/sc/sc/inc/olinetab.hxx,v
 retrieving revision 1.6
 retrieving revision 1.6.96.1
-diff -u -p -u -p -b -w -B -r1.6 -r1.6.96.1
+diff -u -p -b -w -B -r1.6 -r1.6.96.1
 --- sc/inc/olinetab.hxx	10 Apr 2008 18:41:55 -0000	1.6
 +++ sc/inc/olinetab.hxx	29 Jul 2008 06:35:39 -0000	1.6.96.1
 @@ -114,7 +114,7 @@ public:
@@ -32,12 +50,54 @@
  
      BOOL                    GetEntryIndex( USHORT nLevel, SCCOLROW nPos, USHORT& rnIndex ) const;
      BOOL                    GetEntryIndexInRange(
+Index: sc/source/core/tool/compiler.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/core/tool/compiler.cxx,v
+retrieving revision 1.81
+retrieving revision 1.81.22.1
+diff -u -p -b -w -B -r1.81 -r1.81.22.1
+--- sc/source/core/tool/compiler.cxx	8 Jul 2008 07:20:31 -0000	1.81
++++ sc/source/core/tool/compiler.cxx	11 Sep 2008 06:11:48 -0000	1.81.22.1
+@@ -581,6 +581,33 @@ OpCode ScCompiler::GetEnglishOpCode( con
+     return bFound ? (*iLook).second : OpCode(ocNone);
+ }
+ 
++// static
++bool ScCompiler::IsEnglishSymbol( const String& rName )
++{
++    // function names are always case-insensitive
++    String aUpper( ScGlobal::pCharClass->upper( rName ) );
++
++    // 1. built-in function name
++    OpCode eOp = ScCompiler::GetEnglishOpCode( aUpper );
++    if ( eOp != ocNone )
++    {
++        return true;
++    }
++    // 2. old add in functions
++    USHORT nIndex;
++    if ( ScGlobal::GetFuncCollection()->SearchFunc( aUpper, nIndex ) )
++    {
++        return true;
++    }
++
++    // 3. new (uno) add in functions
++    String aIntName(ScGlobal::GetAddInCollection()->FindFunction( aUpper, FALSE ));
++    if (aIntName.Len())
++    {
++        return true;
++    }
++    return false;		// no valid function name
++}
+ 
+ // static
+ ScCompiler::OpCodeMapPtr ScCompiler::CreateOpCodeMap(
 Index: sc/source/ui/vba/makefile.mk
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/makefile.mk,v
 retrieving revision 1.6
 retrieving revision 1.5.42.8
-diff -u -p -u -p -b -w -B -r1.6 -r1.5.42.8
+diff -u -p -b -w -B -r1.6 -r1.5.42.8
 --- sc/source/ui/vba/makefile.mk	11 Apr 2008 00:46:57 -0000	1.6
 +++ sc/source/ui/vba/makefile.mk	5 Sep 2008 14:04:18 -0000	1.5.42.8
 @@ -88,6 +88,7 @@ SLOFILES= \
@@ -82,7 +142,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/service.cxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.5
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.5
+diff -u -p -b -w -B -r1.4 -r1.3.42.5
 --- sc/source/ui/vba/service.cxx	11 Apr 2008 00:47:11 -0000	1.4
 +++ sc/source/ui/vba/service.cxx	7 Aug 2008 07:40:10 -0000	1.3.42.5
 @@ -53,12 +53,22 @@ namespace  worksheet
@@ -133,7 +193,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaapplication.cxx,v
 retrieving revision 1.7
 retrieving revision 1.5.42.4
-diff -u -p -u -p -b -w -B -r1.7 -r1.5.42.4
+diff -u -p -b -w -B -r1.7 -r1.5.42.4
 --- sc/source/ui/vba/vbaapplication.cxx	11 Apr 2008 00:47:25 -0000	1.7
 +++ sc/source/ui/vba/vbaapplication.cxx	29 Jul 2008 06:35:39 -0000	1.5.42.4
 @@ -42,6 +42,7 @@
@@ -333,7 +393,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaapplication.hxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.3
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.3
+diff -u -p -b -w -B -r1.4 -r1.3.42.3
 --- sc/source/ui/vba/vbaapplication.hxx	11 Apr 2008 00:47:42 -0000	1.4
 +++ sc/source/ui/vba/vbaapplication.hxx	29 Jul 2008 06:35:39 -0000	1.3.42.3
 @@ -75,6 +75,8 @@ public:
@@ -595,7 +655,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.2
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -b -w -B -r1.3 -r1.2.42.2
 --- sc/source/ui/vba/vbaaxis.cxx	11 Apr 2008 00:48:27 -0000	1.3
 +++ sc/source/ui/vba/vbaaxis.cxx	6 Jul 2008 15:31:03 -0000	1.2.42.2
 @@ -42,8 +42,8 @@ using namespace ::org::openoffice::excel
@@ -638,7 +698,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbabutton.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbabutton.cxx	11 Apr 2008 00:50:02 -0000	1.3
 +++ sc/source/ui/vba/vbabutton.cxx	5 Sep 2008 14:04:19 -0000	1.2.42.3
 @@ -35,7 +35,7 @@ using namespace org::openoffice;
@@ -678,7 +738,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbabutton.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbabutton.hxx	11 Apr 2008 00:50:19 -0000	1.3
 +++ sc/source/ui/vba/vbabutton.hxx	5 Sep 2008 14:04:19 -0000	1.2.42.3
 @@ -40,10 +40,12 @@ typedef cppu::ImplInheritanceHelper1< Sc
@@ -701,7 +761,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbacharacters.cxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.2
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -b -w -B -r1.4 -r1.3.42.2
 --- sc/source/ui/vba/vbacharacters.cxx	11 Apr 2008 00:50:34 -0000	1.4
 +++ sc/source/ui/vba/vbacharacters.cxx	6 Jul 2008 15:30:46 -0000	1.3.42.2
 @@ -46,7 +46,11 @@ ScVbaCharacters::ScVbaCharacters( const 
@@ -903,7 +963,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbacombobox.cxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.3
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.3
+diff -u -p -b -w -B -r1.4 -r1.3.42.3
 --- sc/source/ui/vba/vbacombobox.cxx	11 Apr 2008 00:55:28 -0000	1.4
 +++ sc/source/ui/vba/vbacombobox.cxx	5 Sep 2008 14:04:19 -0000	1.3.42.3
 @@ -34,34 +34,93 @@ using namespace com::sun::star;
@@ -1035,7 +1095,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbacombobox.hxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.3
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.3
+diff -u -p -b -w -B -r1.4 -r1.3.42.3
 --- sc/source/ui/vba/vbacombobox.hxx	11 Apr 2008 00:55:42 -0000	1.4
 +++ sc/source/ui/vba/vbacombobox.hxx	5 Sep 2008 14:04:19 -0000	1.3.42.3
 @@ -44,22 +44,16 @@
@@ -2726,7 +2786,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbacontrol.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.7
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.7
+diff -u -p -b -w -B -r1.3 -r1.2.42.7
 --- sc/source/ui/vba/vbacontrol.cxx	11 Apr 2008 00:57:50 -0000	1.3
 +++ sc/source/ui/vba/vbacontrol.cxx	9 Sep 2008 18:43:44 -0000	1.2.42.7
 @@ -36,7 +36,13 @@
@@ -3244,7 +3304,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbacontrol.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.4
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.4
+diff -u -p -b -w -B -r1.3 -r1.2.42.4
 --- sc/source/ui/vba/vbacontrol.hxx	11 Apr 2008 00:58:09 -0000	1.3
 +++ sc/source/ui/vba/vbacontrol.hxx	9 Sep 2008 10:22:25 -0000	1.2.42.4
 @@ -35,40 +35,34 @@
@@ -3516,7 +3576,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaglobals.cxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.2
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -b -w -B -r1.4 -r1.3.42.2
 --- sc/source/ui/vba/vbaglobals.cxx	11 Apr 2008 01:02:04 -0000	1.4
 +++ sc/source/ui/vba/vbaglobals.cxx	6 Jul 2008 15:29:30 -0000	1.3.42.2
 @@ -153,9 +153,9 @@ ScVbaGlobals::Range( const uno::Any& Cel
@@ -3536,7 +3596,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaglobals.hxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.2
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -b -w -B -r1.4 -r1.3.42.2
 --- sc/source/ui/vba/vbaglobals.hxx	11 Apr 2008 01:02:19 -0000	1.4
 +++ sc/source/ui/vba/vbaglobals.hxx	6 Jul 2008 15:30:20 -0000	1.3.42.2
 @@ -70,6 +70,6 @@
@@ -3552,7 +3612,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbahelper.cxx,v
 retrieving revision 1.5
 retrieving revision 1.3.42.5
-diff -u -p -u -p -b -w -B -r1.5 -r1.3.42.5
+diff -u -p -b -w -B -r1.5 -r1.3.42.5
 --- sc/source/ui/vba/vbahelper.cxx	11 Apr 2008 01:02:33 -0000	1.5
 +++ sc/source/ui/vba/vbahelper.cxx	5 Sep 2008 14:04:20 -0000	1.3.42.5
 @@ -37,6 +37,7 @@
@@ -3695,7 +3755,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbahelper.hxx,v
 retrieving revision 1.5
 retrieving revision 1.4.42.3
-diff -u -p -u -p -b -w -B -r1.5 -r1.4.42.3
+diff -u -p -b -w -B -r1.5 -r1.4.42.3
 --- sc/source/ui/vba/vbahelper.hxx	11 Apr 2008 01:02:47 -0000	1.5
 +++ sc/source/ui/vba/vbahelper.hxx	6 Jul 2008 15:31:23 -0000	1.4.42.3
 @@ -31,14 +31,18 @@
@@ -4170,7 +4230,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbainterior.cxx,v
 retrieving revision 1.5
 retrieving revision 1.5.96.1
-diff -u -p -u -p -b -w -B -r1.5 -r1.5.96.1
+diff -u -p -b -w -B -r1.5 -r1.5.96.1
 --- sc/source/ui/vba/vbainterior.cxx	11 Apr 2008 01:03:23 -0000	1.5
 +++ sc/source/ui/vba/vbainterior.cxx	29 Jul 2008 06:35:41 -0000	1.5.96.1
 @@ -34,8 +34,11 @@
@@ -4530,7 +4590,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbainterior.hxx,v
 retrieving revision 1.4
 retrieving revision 1.4.96.1
-diff -u -p -u -p -b -w -B -r1.4 -r1.4.96.1
+diff -u -p -b -w -B -r1.4 -r1.4.96.1
 --- sc/source/ui/vba/vbainterior.hxx	11 Apr 2008 01:03:36 -0000	1.4
 +++ sc/source/ui/vba/vbainterior.hxx	29 Jul 2008 06:35:41 -0000	1.4.96.1
 @@ -46,8 +46,23 @@ class ScVbaInterior :  public ScVbaInter
@@ -4575,7 +4635,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbalabel.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbalabel.cxx	11 Apr 2008 01:03:52 -0000	1.3
 +++ sc/source/ui/vba/vbalabel.cxx	5 Sep 2008 14:04:20 -0000	1.2.42.3
 @@ -35,7 +35,7 @@ using namespace org::openoffice;
@@ -4629,7 +4689,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbalabel.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbalabel.hxx	11 Apr 2008 01:04:06 -0000	1.3
 +++ sc/source/ui/vba/vbalabel.hxx	5 Sep 2008 14:04:21 -0000	1.2.42.3
 @@ -34,16 +34,23 @@
@@ -4664,7 +4724,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbalistbox.cxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.4
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.4
+diff -u -p -b -w -B -r1.4 -r1.3.42.4
 --- sc/source/ui/vba/vbalistbox.cxx	11 Apr 2008 01:05:34 -0000	1.4
 +++ sc/source/ui/vba/vbalistbox.cxx	5 Sep 2008 14:04:21 -0000	1.3.42.4
 @@ -37,31 +37,49 @@
@@ -4883,7 +4943,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbalistbox.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.4
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.4
+diff -u -p -b -w -B -r1.3 -r1.2.42.4
 --- sc/source/ui/vba/vbalistbox.hxx	11 Apr 2008 01:05:48 -0000	1.3
 +++ sc/source/ui/vba/vbalistbox.hxx	5 Sep 2008 14:04:21 -0000	1.2.42.4
 @@ -49,14 +49,11 @@ class ScVbaListBox : public ListBoxImpl_
@@ -5138,7 +5198,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaname.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.2
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -b -w -B -r1.3 -r1.2.42.2
 --- sc/source/ui/vba/vbaname.cxx	11 Apr 2008 01:06:07 -0000	1.3
 +++ sc/source/ui/vba/vbaname.cxx	6 Jul 2008 15:31:26 -0000	1.2.42.2
 @@ -31,6 +31,7 @@
@@ -5251,7 +5311,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbanames.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.2
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -b -w -B -r1.3 -r1.2.42.2
 --- sc/source/ui/vba/vbanames.cxx	11 Apr 2008 01:06:56 -0000	1.3
 +++ sc/source/ui/vba/vbanames.cxx	6 Jul 2008 15:29:52 -0000	1.2.42.2
 @@ -70,6 +70,7 @@ ScVbaNames::ScVbaNames(const css::uno::R
@@ -7183,7 +7243,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaradiobutton.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbaradiobutton.cxx	11 Apr 2008 01:12:55 -0000	1.3
 +++ sc/source/ui/vba/vbaradiobutton.cxx	5 Sep 2008 14:04:22 -0000	1.2.42.3
 @@ -36,7 +36,7 @@ using namespace org::openoffice;
@@ -7260,7 +7320,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaradiobutton.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbaradiobutton.hxx	11 Apr 2008 01:13:09 -0000	1.3
 +++ sc/source/ui/vba/vbaradiobutton.hxx	5 Sep 2008 14:04:22 -0000	1.2.42.3
 @@ -29,24 +29,27 @@
@@ -7303,7 +7363,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbarange.cxx,v
 retrieving revision 1.9
 retrieving revision 1.5.34.14
-diff -u -p -u -p -b -w -B -r1.9 -r1.5.34.14
+diff -u -p -b -w -B -r1.9 -r1.5.34.14
 --- sc/source/ui/vba/vbarange.cxx	14 May 2008 10:03:31 -0000	1.9
 +++ sc/source/ui/vba/vbarange.cxx	5 Sep 2008 14:04:22 -0000	1.5.34.14
 @@ -115,6 +115,7 @@
@@ -7829,7 +7889,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbarange.hxx,v
 retrieving revision 1.6
 retrieving revision 1.6.70.1
-diff -u -p -u -p -b -w -B -r1.6 -r1.6.70.1
+diff -u -p -b -w -B -r1.6 -r1.6.70.1
 --- sc/source/ui/vba/vbarange.hxx	14 May 2008 10:03:47 -0000	1.6
 +++ sc/source/ui/vba/vbarange.hxx	29 Jul 2008 06:35:42 -0000	1.6.70.1
 @@ -171,6 +171,10 @@ public:
@@ -8083,7 +8143,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbashape.cxx,v
 retrieving revision 1.4
 retrieving revision 1.3.34.2
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.34.2
+diff -u -p -b -w -B -r1.4 -r1.3.34.2
 --- sc/source/ui/vba/vbashape.cxx	11 Apr 2008 01:16:34 -0000	1.4
 +++ sc/source/ui/vba/vbashape.cxx	6 Jul 2008 15:29:40 -0000	1.3.34.2
 @@ -50,13 +50,13 @@ using namespace ::org::openoffice;
@@ -8107,7 +8167,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbashape.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbashape.hxx	11 Apr 2008 01:16:51 -0000	1.3
 +++ sc/source/ui/vba/vbashape.hxx	6 Jul 2008 15:30:30 -0000	1.2.42.3
 @@ -47,21 +47,22 @@ typedef InheritedHelperInterfaceImpl< Li
@@ -8325,7 +8385,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbatextbox.cxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbatextbox.cxx	11 Apr 2008 01:19:17 -0000	1.3
 +++ sc/source/ui/vba/vbatextbox.cxx	5 Sep 2008 14:04:23 -0000	1.2.42.3
 @@ -37,11 +37,24 @@ using namespace org::openoffice;
@@ -8397,7 +8457,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbatextbox.hxx,v
 retrieving revision 1.3
 retrieving revision 1.2.42.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -b -w -B -r1.3 -r1.2.42.3
 --- sc/source/ui/vba/vbatextbox.hxx	11 Apr 2008 01:19:33 -0000	1.3
 +++ sc/source/ui/vba/vbatextbox.hxx	5 Sep 2008 14:04:23 -0000	1.2.42.3
 @@ -38,16 +38,20 @@ typedef cppu::ImplInheritanceHelper1< Sc
@@ -9069,10 +9129,10 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbawindow.cxx,v
 retrieving revision 1.5
-retrieving revision 1.3.42.4
-diff -u -p -u -p -b -w -B -r1.5 -r1.3.42.4
+retrieving revision 1.3.42.5
+diff -u -p -b -w -B -r1.5 -r1.3.42.5
 --- sc/source/ui/vba/vbawindow.cxx	11 Apr 2008 01:21:13 -0000	1.5
-+++ sc/source/ui/vba/vbawindow.cxx	29 Jul 2008 06:35:43 -0000	1.3.42.4
++++ sc/source/ui/vba/vbawindow.cxx	11 Sep 2008 06:54:22 -0000	1.3.42.5
 @@ -27,6 +27,7 @@
   * for a copy of the LGPLv3 License.
   *
@@ -9135,7 +9195,24 @@
  		SplitAtDefinedPosition( !bFrozen );
  	}
  }
-@@ -661,7 +677,8 @@ ScVbaWindow::setSplitRow( sal_Int32 _spl
+@@ -646,13 +662,14 @@ void SAL_CALL 
+ ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeException)
+ {
+ 	double fHoriPixels = PointsToPixels( m_xDevice, _splithorizontal, sal_True );
+-   m_xViewSplitable->splitAtPosition( (int) fHoriPixels, 0 );	
++   m_xViewSplitable->splitAtPosition( static_cast<sal_Int32>( fHoriPixels ), 0 );	
+ }
+ 
+ sal_Int32 SAL_CALL 
+ ScVbaWindow::getSplitRow() throw (uno::RuntimeException)
+ {
+-	return m_xViewSplitable->getSplitRow();	
++	sal_Int32 nValue = m_xViewSplitable->getSplitRow();
++	return nValue ? nValue - 1 : nValue;	
+ }
+ 
+ void SAL_CALL 
+@@ -661,7 +678,8 @@ ScVbaWindow::setSplitRow( sal_Int32 _spl
  	if( getSplitRow() != _splitrow )
  	{
  		sal_Bool bFrozen = getFreezePanes();
@@ -9145,7 +9222,7 @@
  		SplitAtDefinedPosition( !bFrozen );
  	}
  }
-@@ -736,6 +753,184 @@ ScVbaWindow::setZoom( const uno::Any& _z
+@@ -736,6 +754,184 @@ ScVbaWindow::setZoom( const uno::Any& _z
  	}			
  }
  
@@ -9330,7 +9407,7 @@
  rtl::OUString& 
  ScVbaWindow::getServiceImplName()
  {
-@@ -754,3 +949,12 @@ ScVbaWindow::getServiceNames()
+@@ -754,3 +950,12 @@ ScVbaWindow::getServiceNames()
  	}
  	return aServiceNames;
  }
@@ -9348,7 +9425,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbawindow.hxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.3
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.3
+diff -u -p -b -w -B -r1.4 -r1.3.42.3
 --- sc/source/ui/vba/vbawindow.hxx	11 Apr 2008 01:21:27 -0000	1.4
 +++ sc/source/ui/vba/vbawindow.hxx	29 Jul 2008 06:35:43 -0000	1.3.42.3
 @@ -53,14 +53,19 @@ private:		
@@ -9416,7 +9493,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaworkbook.cxx,v
 retrieving revision 1.5
 retrieving revision 1.4.42.2
-diff -u -p -u -p -b -w -B -r1.5 -r1.4.42.2
+diff -u -p -b -w -B -r1.5 -r1.4.42.2
 --- sc/source/ui/vba/vbaworkbook.cxx	11 Apr 2008 01:22:11 -0000	1.5
 +++ sc/source/ui/vba/vbaworkbook.cxx	6 Jul 2008 15:29:44 -0000	1.4.42.2
 @@ -428,14 +428,18 @@ ScVbaWorkbook::Styles( const::uno::Any& 
@@ -9444,7 +9521,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaworkbook.hxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.2
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -b -w -B -r1.4 -r1.3.42.2
 --- sc/source/ui/vba/vbaworkbook.hxx	11 Apr 2008 01:22:26 -0000	1.4
 +++ sc/source/ui/vba/vbaworkbook.hxx	6 Jul 2008 15:30:33 -0000	1.3.42.2
 @@ -75,7 +75,7 @@ public:
@@ -9461,7 +9538,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheet.cxx,v
 retrieving revision 1.5
 retrieving revision 1.3.42.6
-diff -u -p -u -p -b -w -B -r1.5 -r1.3.42.6
+diff -u -p -b -w -B -r1.5 -r1.3.42.6
 --- sc/source/ui/vba/vbaworksheet.cxx	11 Apr 2008 01:23:10 -0000	1.5
 +++ sc/source/ui/vba/vbaworksheet.cxx	5 Sep 2008 14:04:24 -0000	1.3.42.6
 @@ -47,6 +47,7 @@
@@ -9722,7 +9799,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheet.hxx,v
 retrieving revision 1.4
 retrieving revision 1.3.42.4
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.4
+diff -u -p -b -w -B -r1.4 -r1.3.42.4
 --- sc/source/ui/vba/vbaworksheet.hxx	11 Apr 2008 01:23:24 -0000	1.4
 +++ sc/source/ui/vba/vbaworksheet.hxx	29 Jul 2008 06:35:43 -0000	1.3.42.4
 @@ -42,6 +42,8 @@
@@ -9763,12 +9840,91 @@
  	// XHelperInterface
  	virtual rtl::OUString& getServiceImplName();
  	virtual css::uno::Sequence<rtl::OUString> getServiceNames();	
+Index: sc/source/ui/vba/vbawsfunction.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbawsfunction.cxx,v
+retrieving revision 1.4
+retrieving revision 1.4.96.1
+diff -u -p -b -w -B -r1.4 -r1.4.96.1
+--- sc/source/ui/vba/vbawsfunction.cxx	11 Apr 2008 01:24:09 -0000	1.4
++++ sc/source/ui/vba/vbawsfunction.cxx	11 Sep 2008 06:11:49 -0000	1.4.96.1
+@@ -42,13 +42,14 @@
+ #include <comphelper/anytostring.hxx>
+ 
+ #include "vbawsfunction.hxx"
++#include "opcode.hxx"
++#include "compiler.hxx"
+ 
+ using namespace com::sun::star;
+ using namespace org::openoffice;
+ 
+ ScVbaWSFunction::ScVbaWSFunction( const uno::Reference< vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext): ScVbaWSFunction_BASE( xParent, xContext )
+ {
+-	m_xNameAccess.set(  mxContext->getServiceManager()->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.FunctionDescriptions") ), mxContext ), uno::UNO_QUERY_THROW );
+ }
+ 
+ 
+@@ -86,7 +87,24 @@ ScVbaWSFunction::invoke(const rtl::OUStr
+ 	for ( int count=0; count < aParamTemp.getLength(); ++count )
+ 		OSL_TRACE("Param[%d] is %s",
+ 			count, rtl::OUStringToOString( comphelper::anyToString( aParamTemp[count] ), RTL_TEXTENCODING_UTF8 ).getStr()  );
+-	return xFunctionAccess->callFunction(FunctionName,aParamTemp);
++	
++	uno::Any aRet = xFunctionAccess->callFunction(FunctionName,aParamTemp);
++	// MATCH function should alwayse return a double value, but currently if the first argument is XCellRange, MATCH function returns an array instead of a double value. Don't know why?
++	// To fix this issue in safe, current solution is to convert this array to a double value just for MATCH function.
++	String aUpper( FunctionName );
++	OpCode eOp = ScCompiler::GetEnglishOpCode( aUpper.ToUpperAscii() );
++	if( eOp == ocMatch )
++	{
++		double fVal = 0.0;
++		if( aRet >>= fVal )
++			return aRet;
++		uno::Sequence< uno::Sequence< uno::Any > > aSequence;
++		if( !( ( aRet >>= aSequence ) && ( aSequence.getLength() > 0 ) &&
++			( aSequence[0].getLength() > 0 ) && ( aSequence[0][0] >>= fVal ) ) )
++				throw uno::RuntimeException();
++		aRet <<= fVal;
++	}
++	return aRet;
+ }
+ 
+ void SAL_CALL
+@@ -107,7 +125,10 @@ ScVbaWSFunction::hasMethod(const rtl::OU
+ 	sal_Bool bIsFound = sal_False;
+ 	try 
+ 	{
+-		if ( m_xNameAccess->hasByName( Name ) )
++		// the function name contained in the com.sun.star.sheet.FunctionDescription service is alwayse localized.
++		// but the function name used in WorksheetFunction is a programmatic name (seems English).
++		// So m_xNameAccess->hasByName( Name ) may fail to find name when a function name has a localized name.
++		if( ScCompiler::IsEnglishSymbol( Name ) )
+ 			bIsFound = sal_True;
+ 	}
+ 	catch( uno::Exception& /*e*/ )
+Index: sc/source/ui/vba/vbawsfunction.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbawsfunction.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.96.1
+diff -u -p -b -w -B -r1.4 -r1.4.96.1
+--- sc/source/ui/vba/vbawsfunction.hxx	11 Apr 2008 01:24:23 -0000	1.4
++++ sc/source/ui/vba/vbawsfunction.hxx	11 Sep 2008 06:11:49 -0000	1.4.96.1
+@@ -41,7 +41,6 @@ typedef InheritedHelperInterfaceImpl1< o
+ 
+ class ScVbaWSFunction :  public ScVbaWSFunction_BASE
+ {
+-	css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
+ public:
+ 	ScVbaWSFunction( const css::uno::Reference< oo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
+ 	virtual ~ScVbaWSFunction(){}
+cvs diff: Diffing sc/source/ui/vba/testvba
 Index: sc/source/ui/vba/testvba/README
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/testvba/README,v
 retrieving revision 1.2
 retrieving revision 1.2.42.1
-diff -u -p -u -p -b -w -B -r1.2 -r1.2.42.1
+diff -u -p -b -w -B -r1.2 -r1.2.42.1
 --- sc/source/ui/vba/testvba/README	7 Dec 2007 11:14:59 -0000	1.2
 +++ sc/source/ui/vba/testvba/README	29 Jul 2008 07:22:41 -0000	1.2.42.1
 @@ -1,35 +1,37 @@
@@ -9838,7 +9994,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/testvba/makefile.mk,v
 retrieving revision 1.3
 retrieving revision 1.3.96.2
-diff -u -p -u -p -b -w -B -r1.3 -r1.3.96.2
+diff -u -p -b -w -B -r1.3 -r1.3.96.2
 --- sc/source/ui/vba/testvba/makefile.mk	11 Apr 2008 01:25:09 -0000	1.3
 +++ sc/source/ui/vba/testvba/makefile.mk	29 Jul 2008 09:36:01 -0000	1.3.96.2
 @@ -30,28 +30,44 @@
@@ -10214,7 +10370,7 @@
 RCS file: /cvs/sc/sc/source/ui/vba/testvba/testResults.pl,v
 retrieving revision 1.2
 retrieving revision 1.2.42.1
-diff -u -p -u -p -b -w -B -r1.2 -r1.2.42.1
+diff -u -p -b -w -B -r1.2 -r1.2.42.1
 --- sc/source/ui/vba/testvba/testResults.pl	7 Dec 2007 11:15:50 -0000	1.2
 +++ sc/source/ui/vba/testvba/testResults.pl	29 Jul 2008 07:22:42 -0000	1.2.42.1
 @@ -1,5 +1,5 @@
@@ -10565,121 +10721,124 @@
 +	}
 +
 +}
+cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments
 Index: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
-Binary files /dev/null and /tmp/cvs3BaaJ1 differ
+Binary files /dev/null and /tmp/cvsoMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
-Binary files /dev/null and /tmp/cvs4BaaJ1 differ
+Binary files /dev/null and /tmp/cvspMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
-Binary files /dev/null and /tmp/cvs5BaaJ1 differ
+Binary files /dev/null and /tmp/cvsqMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
-Binary files /dev/null and /tmp/cvs6BaaJ1 differ
+Binary files /dev/null and /tmp/cvsrMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
-Binary files /dev/null and /tmp/cvs7BaaJ1 differ
+Binary files /dev/null and /tmp/cvssMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
-Binary files /dev/null and /tmp/cvs8BaaJ1 differ
+Binary files /dev/null and /tmp/cvstMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
-Binary files /dev/null and /tmp/cvs9BaaJ1 differ
+Binary files /dev/null and /tmp/cvsuMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
-Binary files /dev/null and /tmp/cvs.BaaJ1 differ
+Binary files /dev/null and /tmp/cvsvMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
-Binary files /dev/null and /tmp/cvs_BaaJ1 differ
+Binary files /dev/null and /tmp/cvswMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Template.xls
-Binary files /dev/null and /tmp/cvsaCaaJ1 differ
+Binary files /dev/null and /tmp/cvsxMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
-Binary files /dev/null and /tmp/cvsbCaaJ1 differ
+Binary files /dev/null and /tmp/cvsyMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
-Binary files /dev/null and /tmp/cvscCaaJ1 differ
+Binary files /dev/null and /tmp/cvszMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
-Binary files /dev/null and /tmp/cvsdCaaJ1 differ
+Binary files /dev/null and /tmp/cvsAMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Window.xls
-Binary files /dev/null and /tmp/cvseCaaJ1 differ
+Binary files /dev/null and /tmp/cvsBMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
-Binary files /dev/null and /tmp/cvsfCaaJ1 differ
+Binary files /dev/null and /tmp/cvsCMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
-Binary files /dev/null and /tmp/cvsgCaaJ1 differ
+Binary files /dev/null and /tmp/cvsDMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
-Binary files /dev/null and /tmp/cvshCaaJ1 differ
+Binary files /dev/null and /tmp/cvsEMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/format.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/format.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/format.xls
-Binary files /dev/null and /tmp/cvsiCaaJ1 differ
+Binary files /dev/null and /tmp/cvsFMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/partition.xls
-Binary files /dev/null and /tmp/cvsjCaaJ1 differ
+Binary files /dev/null and /tmp/cvsGMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/range-4.xls
-Binary files /dev/null and /tmp/cvskCaaJ1 differ
+Binary files /dev/null and /tmp/cvsHMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/replace.xls
-Binary files /dev/null and /tmp/cvslCaaJ1 differ
+Binary files /dev/null and /tmp/cvsIMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
-Binary files /dev/null and /tmp/cvsmCaaJ1 differ
+Binary files /dev/null and /tmp/cvsJMaG5U differ
 Index: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/window2.xls
-Binary files /dev/null and /tmp/cvsnCaaJ1 differ
+Binary files /dev/null and /tmp/cvsKMaG5U differ
+cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs
+cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs/excel
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
@@ -11343,6 +11502,7 @@
 + TEST Not succesfully completed : RangeTest3
 +END   TestCalc
 +Test run finished : 31/05/2007 11:02:12
+cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs/unix
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log
@@ -12600,6 +12760,7 @@
 + TEST OK : Test Windows.Count
 +END  Window2
 +Test run finished : 05/29/2008 02:55:48 PM
+cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs/win
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/win/AutoFilter.log
@@ -13590,7 +13751,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XApplication.idl,v
 retrieving revision 1.4
 retrieving revision 1.3.4.3
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.3
+diff -u -p -b -w -B -r1.4 -r1.3.4.3
 --- oovbaapi/org/openoffice/excel/XApplication.idl	11 Apr 2008 09:46:23 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XApplication.idl	29 Jul 2008 06:27:52 -0000	1.3.4.3
 @@ -38,6 +38,14 @@
@@ -13858,7 +14019,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XInterior.idl,v
 retrieving revision 1.4
 retrieving revision 1.4.6.1
-diff -u -p -u -p -b -w -B -r1.4 -r1.4.6.1
+diff -u -p -b -w -B -r1.4 -r1.4.6.1
 --- oovbaapi/org/openoffice/excel/XInterior.idl	11 Apr 2008 09:52:54 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XInterior.idl	29 Jul 2008 06:27:52 -0000	1.4.6.1
 @@ -51,6 +51,9 @@ interface XInterior
@@ -14048,7 +14209,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XRange.idl,v
 retrieving revision 1.4
 retrieving revision 1.4.6.1
-diff -u -p -u -p -b -w -B -r1.4 -r1.4.6.1
+diff -u -p -b -w -B -r1.4 -r1.4.6.1
 --- oovbaapi/org/openoffice/excel/XRange.idl	11 Apr 2008 09:55:48 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XRange.idl	29 Jul 2008 06:27:52 -0000	1.4.6.1
 @@ -103,6 +103,7 @@ interface XRange
@@ -14080,7 +14241,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWindow.idl,v
 retrieving revision 1.4
 retrieving revision 1.3.4.2
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.2
+diff -u -p -b -w -B -r1.4 -r1.3.4.2
 --- oovbaapi/org/openoffice/excel/XWindow.idl	11 Apr 2008 09:57:44 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XWindow.idl	6 Jul 2008 15:37:37 -0000	1.3.4.2
 @@ -44,6 +44,8 @@ module org {  module openoffice {  modul
@@ -14139,7 +14300,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWorkbook.idl,v
 retrieving revision 1.4
 retrieving revision 1.3.4.2
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.2
+diff -u -p -b -w -B -r1.4 -r1.3.4.2
 --- oovbaapi/org/openoffice/excel/XWorkbook.idl	11 Apr 2008 09:58:14 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XWorkbook.idl	6 Jul 2008 15:37:43 -0000	1.3.4.2
 @@ -71,7 +71,7 @@ interface XWorkbook
@@ -14156,7 +14317,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWorksheet.idl,v
 retrieving revision 1.4
 retrieving revision 1.3.4.3
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.3
+diff -u -p -b -w -B -r1.4 -r1.3.4.3
 --- oovbaapi/org/openoffice/excel/XWorksheet.idl	11 Apr 2008 09:58:44 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/XWorksheet.idl	29 Jul 2008 06:27:52 -0000	1.3.4.3
 @@ -51,6 +51,8 @@ module org {  module openoffice {  modul
@@ -14198,7 +14359,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/excel/makefile.mk,v
 retrieving revision 1.4
 retrieving revision 1.4.6.1
-diff -u -p -u -p -b -w -B -r1.4 -r1.4.6.1
+diff -u -p -b -w -B -r1.4 -r1.4.6.1
 --- oovbaapi/org/openoffice/excel/makefile.mk	11 Apr 2008 09:59:47 -0000	1.4
 +++ oovbaapi/org/openoffice/excel/makefile.mk	29 Jul 2008 06:27:52 -0000	1.4.6.1
 @@ -96,6 +96,13 @@ IDLFILES= XApplication.idl\
@@ -14215,12 +14376,13 @@
  
  
  # ------------------------------------------------------------------
+cvs diff: Diffing oovbaapi/org/openoffice/msforms
 Index: oovbaapi/org/openoffice/msforms/XComboBox.idl
 ===================================================================
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XComboBox.idl,v
 retrieving revision 1.3
 retrieving revision 1.2.8.2
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.8.2
+diff -u -p -b -w -B -r1.3 -r1.2.8.2
 --- oovbaapi/org/openoffice/msforms/XComboBox.idl	11 Apr 2008 10:00:49 -0000	1.3
 +++ oovbaapi/org/openoffice/msforms/XComboBox.idl	6 Jul 2008 15:37:49 -0000	1.2.8.2
 @@ -44,6 +44,7 @@ module org {  module openoffice {  modul
@@ -14236,7 +14398,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XControl.idl,v
 retrieving revision 1.3
 retrieving revision 1.2.4.4
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.4
+diff -u -p -b -w -B -r1.3 -r1.2.4.4
 --- oovbaapi/org/openoffice/msforms/XControl.idl	11 Apr 2008 10:01:02 -0000	1.3
 +++ oovbaapi/org/openoffice/msforms/XControl.idl	9 Sep 2008 10:22:00 -0000	1.2.4.4
 @@ -37,12 +37,20 @@
@@ -14396,7 +14558,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XLabel.idl,v
 retrieving revision 1.3
 retrieving revision 1.2.4.2
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.2
+diff -u -p -b -w -B -r1.3 -r1.2.4.2
 --- oovbaapi/org/openoffice/msforms/XLabel.idl	11 Apr 2008 10:01:32 -0000	1.3
 +++ oovbaapi/org/openoffice/msforms/XLabel.idl	6 Jul 2008 15:38:07 -0000	1.2.4.2
 @@ -41,6 +41,7 @@ module org {  module openoffice {  modul
@@ -14412,7 +14574,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XListBox.idl,v
 retrieving revision 1.3
 retrieving revision 1.2.4.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.3
+diff -u -p -b -w -B -r1.3 -r1.2.4.3
 --- oovbaapi/org/openoffice/msforms/XListBox.idl	11 Apr 2008 10:02:04 -0000	1.3
 +++ oovbaapi/org/openoffice/msforms/XListBox.idl	29 Jul 2008 06:27:52 -0000	1.2.4.3
 @@ -44,8 +44,10 @@ interface XListBox: com::sun::star::uno:
@@ -14628,7 +14790,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XRadioButton.idl,v
 retrieving revision 1.3
 retrieving revision 1.2.4.2
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.2
+diff -u -p -b -w -B -r1.3 -r1.2.4.2
 --- oovbaapi/org/openoffice/msforms/XRadioButton.idl	11 Apr 2008 10:02:36 -0000	1.3
 +++ oovbaapi/org/openoffice/msforms/XRadioButton.idl	6 Jul 2008 15:38:04 -0000	1.2.4.2
 @@ -41,7 +41,7 @@ module org {  module openoffice {  modul
@@ -14779,7 +14941,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XTextBox.idl,v
 retrieving revision 1.3
 retrieving revision 1.2.4.2
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.2
+diff -u -p -b -w -B -r1.3 -r1.2.4.2
 --- oovbaapi/org/openoffice/msforms/XTextBox.idl	11 Apr 2008 10:03:37 -0000	1.3
 +++ oovbaapi/org/openoffice/msforms/XTextBox.idl	6 Jul 2008 15:38:01 -0000	1.2.4.2
 @@ -41,7 +41,7 @@ module org {  module openoffice {  modul
@@ -14995,7 +15157,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/makefile.mk,v
 retrieving revision 1.4
 retrieving revision 1.3.4.5
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.5
+diff -u -p -b -w -B -r1.4 -r1.3.4.5
 --- oovbaapi/org/openoffice/msforms/makefile.mk	11 Apr 2008 10:03:53 -0000	1.4
 +++ oovbaapi/org/openoffice/msforms/makefile.mk	5 Sep 2008 14:06:38 -0000	1.3.4.5
 @@ -60,7 +60,16 @@ IDLFILES=\
@@ -15016,6 +15178,7 @@
  
  # ------------------------------------------------------------------
  
+cvs diff: Diffing oovbaapi/org/openoffice/vba
 Index: oovbaapi/org/openoffice/vba/XAssistant.idl
 ===================================================================
 RCS file: oovbaapi/org/openoffice/vba/XAssistant.idl
@@ -15371,7 +15534,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/vba/XGlobals.idl,v
 retrieving revision 1.4
 retrieving revision 1.3.4.2
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.2
+diff -u -p -b -w -B -r1.4 -r1.3.4.2
 --- oovbaapi/org/openoffice/vba/XGlobals.idl	11 Apr 2008 10:05:01 -0000	1.4
 +++ oovbaapi/org/openoffice/vba/XGlobals.idl	6 Jul 2008 15:37:34 -0000	1.3.4.2
 @@ -57,7 +57,7 @@ interface XGlobals: com::sun::star::uno:
@@ -15388,7 +15551,7 @@
 RCS file: /cvs/api/oovbaapi/org/openoffice/vba/makefile.mk,v
 retrieving revision 1.4
 retrieving revision 1.3.4.3
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.3
+diff -u -p -b -w -B -r1.4 -r1.3.4.3
 --- oovbaapi/org/openoffice/vba/makefile.mk	11 Apr 2008 10:06:09 -0000	1.4
 +++ oovbaapi/org/openoffice/vba/makefile.mk	29 Jul 2008 06:27:53 -0000	1.3.4.3
 @@ -52,6 +52,11 @@ IDLFILES=\
@@ -15408,7 +15571,7 @@
 RCS file: /cvs/api/offapi/com/sun/star/document/makefile.mk,v
 retrieving revision 1.47
 retrieving revision 1.47.32.2
-diff -u -p -u -p -b -w -B -r1.47 -r1.47.32.2
+diff -u -p -b -w -B -r1.47 -r1.47.32.2
 --- offapi/com/sun/star/document/makefile.mk	1 Jul 2008 12:38:47 -0000	1.47
 +++ offapi/com/sun/star/document/makefile.mk	7 Aug 2008 06:23:37 -0000	1.47.32.2
 @@ -108,7 +108,7 @@ IDLFILES=\

Modified: trunk/patches/dev300/cws-pflin10.diff
==============================================================================
--- trunk/patches/dev300/cws-pflin10.diff	(original)
+++ trunk/patches/dev300/cws-pflin10.diff	Thu Sep 11 08:44:43 2008
@@ -149,26 +149,102 @@
  };
   // Hinweis: IDS_SBERR_TERMINATED = IDS_SBERR_START+2000.
  String IDS_SBERR_TERMINATED
+cvs diff: Diffing basic/source/comp
+Index: basic/source/comp/exprtree.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/comp/exprtree.cxx,v
+retrieving revision 1.24
+retrieving revision 1.24.36.1
+diff -u -p -b -w -B -r1.24 -r1.24.36.1
+--- basic/source/comp/exprtree.cxx	2 Jul 2008 09:58:29 -0000	1.24
++++ basic/source/comp/exprtree.cxx	1 Sep 2008 09:35:37 -0000	1.24.36.1
+@@ -117,7 +117,7 @@ static BOOL DoParametersFollow( SbiParse
+ 	if( !p->WhiteSpace() || eCurExpr != SbSYMBOL )
+ 		return FALSE;
+ 	if (   eTok == NUMBER || eTok == MINUS || eTok == FIXSTRING
+-		|| eTok == SYMBOL || eTok == COMMA  || eTok == DOT )
++		|| eTok == SYMBOL || eTok == COMMA  || eTok == DOT || eTok == NOT )
+ 	{
+ 		return TRUE;
+ 	}
+@@ -495,6 +495,14 @@ SbiExprNode* SbiExpression::Operand()
+ 	switch( eTok = pParser->Peek() )
+ 	{
+ 		case SYMBOL:
++			pRes = Term();
++			// process something like "IF Not r Is Nothing Then .."
++			if( pParser->IsVBASupportOn() && pParser->Peek() == IS )
++			{
++				eTok = pParser->Next();
++				pRes = new SbiExprNode( pParser, pRes, eTok, Like() );
++			}
++			break;
+ 		case DOT:	// .with
+ 			pRes = Term(); break;
+ 		case NUMBER:
 Index: basic/source/runtime/methods.cxx
 ===================================================================
 RCS file: /cvs/script/basic/source/runtime/methods.cxx,v
-retrieving revision 1.79
-retrieving revision 1.78.20.2
-diff -u -p -b -w -B -r1.79 -r1.78.20.2
---- basic/source/runtime/methods.cxx	11 Apr 2008 12:03:12 -0000	1.79
-+++ basic/source/runtime/methods.cxx	19 May 2008 04:10:58 -0000	1.78.20.2
-@@ -1695,16 +1695,53 @@ INT16 implGetDateYear( double aDate )
+retrieving revision 1.82
+retrieving revision 1.78.20.6
+diff -u -p -b -w -B -r1.82 -r1.78.20.6
+--- basic/source/runtime/methods.cxx	3 Jul 2008 10:04:35 -0000	1.82
++++ basic/source/runtime/methods.cxx	11 Sep 2008 07:26:03 -0000	1.78.20.6
+@@ -1378,9 +1378,15 @@ RTLFUNC(Replace)
+ 		if ( nArgCount == 6 )
+ 			bTextMode = rPar.Get(6)->GetInteger();
+ 
+-		USHORT nStrLen = aExpStr.Len();
++		USHORT nExpStrLen = aExpStr.Len();
++		USHORT nFindStrLen = aFindStr.Len();
++		USHORT nReplaceStrLen = aReplaceStr.Len();
+ 
+-		if( lStartPos <= nStrLen )
++		if( lStartPos <= nExpStrLen )
++		{
++			USHORT nPos = static_cast<USHORT>( lStartPos - 1 );
++			USHORT nCounts = 0;
++			while( lCount == -1 || lCount > nCounts )
+ 		{
+ 			String aSrcStr( aExpStr );
+ 			if( bTextMode )
+@@ -1388,17 +1394,18 @@ RTLFUNC(Replace)
+ 					aSrcStr.ToUpperAscii();
+ 					aFindStr.ToUpperAscii();
+ 			}
+-			
+-			USHORT nPos = aSrcStr.Search( aFindStr, static_cast<USHORT>( lStartPos - 1 ) );
+-			USHORT nCounts = 0;
+-			USHORT nReplaceLength = aReplaceStr.Len() ? aReplaceStr.Len():1;
+-			while( nPos != STRING_NOTFOUND && (lCount == -1 || lCount > nCounts) )
+-			{
+-				aExpStr.Replace( nPos, aFindStr.Len(), aReplaceStr );
+-				nPos = nPos + nReplaceLength;
+ 				nPos = aSrcStr.Search( aFindStr, nPos );
++				if( nPos != STRING_NOTFOUND )
++				{
++					aExpStr.Replace( nPos, nFindStrLen, aReplaceStr );
++					nPos = nPos - nFindStrLen + nReplaceStrLen + 1;
+ 				nCounts++;
+ 			}
++				else
++				{
++					break;
++				}
++			}
+ 		}
+ 		rPar.Get(0)->PutString( aExpStr.Copy( static_cast<USHORT>(lStartPos - 1) )  );
+ 	}
+@@ -1779,17 +1786,52 @@ INT16 implGetDateYear( double aDate )
+ 
  BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
  {
++	if ( nYear < 30 )
++		nYear += 2000;
  	if ( nYear < 100 )
--		nYear += 1900;
+ 		nYear += 1900;
 -	if ((nYear < 100 || nYear > 9999)   ||
 -		(nMonth < 1 || nMonth > 12 )	||
-+	{
-+		Date now;
-+		INT16 nCentury = ( now.GetYear() / 100 ) * 100;
-+		nYear += nCentury;
-+	}
 +	Date aCurDate( nDay, nMonth, nYear );
 +	if ((nYear < 100 || nYear > 9999) )  
 +	{
@@ -215,7 +291,7 @@
  	long nDiffDays = GetDayDiff( aCurDate );
      rdRet = (double)nDiffDays;
      return TRUE;
-@@ -1831,6 +1868,23 @@ RTLFUNC(DateValue)
+@@ -1916,6 +1958,22 @@ RTLFUNC(DateValue)
  		String aStr( rPar.Get(1)->GetString() );
  		BOOL bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );
  		short nType = pFormatter->GetType( nIndex );
@@ -225,15 +301,14 @@
 +		// It seems that both locale number formatter and English number formatter 
 +		// are supported in Visual Basic.
 +		LanguageType eLangType = GetpApp()->GetSettings().GetLanguage();
-+		if( !bSuccess && !(eLangType & LANGUAGE_ENGLISH))
++        if( !bSuccess && ( eLangType != LANGUAGE_ENGLISH_US ) )
 +		{
 +			// Create a new SvNumberFormatter by using LANGUAGE_ENGLISH to get the date value;
 +			com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > 
 +				xFactory = comphelper::getProcessServiceFactory();
-+			SvNumberFormatter* pFormatterEn = new SvNumberFormatter( xFactory, LANGUAGE_ENGLISH );
-+			bSuccess = pFormatterEn->IsNumberFormat( aStr, nIndex, fResult );
-+			nType = pFormatterEn->GetType( nIndex );
-+			delete pFormatterEn;
++			SvNumberFormatter aFormatter( xFactory, LANGUAGE_ENGLISH_US );
++			bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, fResult );
++			nType = aFormatter.GetType( nIndex );
 +		}
 +
  		if(bSuccess && (nType==NUMBERFORMAT_DATE || nType==NUMBERFORMAT_DATETIME))
@@ -280,11 +355,11 @@
 Index: basic/source/sbx/sbxscan.cxx
 ===================================================================
 RCS file: /cvs/script/basic/source/sbx/sbxscan.cxx,v
-retrieving revision 1.13
-retrieving revision 1.12.22.2
-diff -u -p -b -w -B -r1.13 -r1.12.22.2
---- basic/source/sbx/sbxscan.cxx	11 Apr 2008 12:19:34 -0000	1.13
-+++ basic/source/sbx/sbxscan.cxx	19 May 2008 04:10:48 -0000	1.12.22.2
+retrieving revision 1.14
+retrieving revision 1.12.22.3
+diff -u -p -b -w -B -r1.14 -r1.12.22.3
+--- basic/source/sbx/sbxscan.cxx	2 Jul 2008 10:04:30 -0000	1.14
++++ basic/source/sbx/sbxscan.cxx	28 Aug 2008 06:20:42 -0000	1.12.22.3
 @@ -53,6 +53,7 @@
  #include <svtools/svtools.hrc>
  
@@ -308,12 +383,12 @@
 Index: basic/source/sbx/sbxvalue.cxx
 ===================================================================
 RCS file: /cvs/script/basic/source/sbx/sbxvalue.cxx,v
-retrieving revision 1.12
-retrieving revision 1.11.24.2
-diff -u -p -b -w -B -r1.12 -r1.11.24.2
---- basic/source/sbx/sbxvalue.cxx	11 Apr 2008 12:21:27 -0000	1.12
-+++ basic/source/sbx/sbxvalue.cxx	19 May 2008 04:10:44 -0000	1.11.24.2
-@@ -1123,7 +1123,13 @@ BOOL SbxValue::Compute( SbxOperator eOp,
+retrieving revision 1.14
+retrieving revision 1.11.24.3
+diff -u -p -b -w -B -r1.14 -r1.11.24.3
+--- basic/source/sbx/sbxvalue.cxx	15 Aug 2008 14:16:13 -0000	1.14
++++ basic/source/sbx/sbxvalue.cxx	28 Aug 2008 06:20:38 -0000	1.11.24.3
+@@ -1147,7 +1147,13 @@ BOOL SbxValue::Compute( SbxOperator eOp,
  	{
  		SbxValues aL, aR;
  		bool bDecimal = false;
@@ -328,7 +403,7 @@
  		{
  			if( eOp == SbxCAT || eOp == SbxPLUS )
  			{
-@@ -1368,6 +1374,7 @@ BOOL SbxValue::Compute( SbxOperator eOp,
+@@ -1392,6 +1398,7 @@ BOOL SbxValue::Compute( SbxOperator eOp,
  			}
  		}
  		else
@@ -339,12 +414,12 @@
 Index: sc/source/ui/vba/vbarange.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbarange.cxx,v
-retrieving revision 1.8
-retrieving revision 1.7.18.2
-diff -u -p -b -w -B -r1.8 -r1.7.18.2
---- sc/source/ui/vba/vbarange.cxx	11 Apr 2008 01:15:15 -0000	1.8
-+++ sc/source/ui/vba/vbarange.cxx	19 May 2008 04:11:44 -0000	1.7.18.2
-@@ -162,6 +162,7 @@
+retrieving revision 1.9
+retrieving revision 1.7.18.3
+diff -u -p -b -w -B -r1.9 -r1.7.18.3
+--- sc/source/ui/vba/vbarange.cxx	14 May 2008 10:03:31 -0000	1.9
++++ sc/source/ui/vba/vbarange.cxx	28 Aug 2008 06:21:15 -0000	1.7.18.3
+@@ -163,6 +163,7 @@
  // end test includes
  
  #include <org/openoffice/excel/Range.hpp>
@@ -352,7 +427,7 @@
  
  using namespace ::org::openoffice;
  using namespace ::com::sun::star;
-@@ -442,6 +443,16 @@ public:
+@@ -443,6 +444,16 @@ public:
  		return false;
  	}
  
@@ -369,7 +444,7 @@
  	rtl::OUString getNumberFormatString()
  	{
  		uno::Reference< uno::XInterface > xIf( mxRangeProps, uno::UNO_QUERY_THROW );
-@@ -715,6 +726,8 @@ void CellValueGetter::visitNode( sal_Int
+@@ -716,6 +727,8 @@ void CellValueGetter::visitNode( sal_Int
  			NumFormatHelper cellFormat( xRange );
  			if ( cellFormat.isBooleanType() )
  				aValue = uno::makeAny( ( xCell->getValue() != 0.0 ) );
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]