[ooo-build-commit] .: patches/dev300 patches/vba

[Noel Power]

 patches/dev300/apply                      |    3 +-
 patches/vba/fix-name-range-separator.diff |   43 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

New commits:
commit 189dbae1256d4c0d6e91f7864e2c08ee41a71de6
Author: Noel Power <noel.power at novell.com>
Date:   Fri Apr 16 17:02:42 2010 +0100

    fix for bnc#597351 passing wrong seperator for range list
    
    * patches/dev300/apply:
    * patches/vba/fix-name-range-separator.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 111aca6..a89fd3d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1873,7 +1873,8 @@ vba-ctb-fix-looponload.diff, n#589794, n#590359
 vba-import-xlsm.diff
 # fix weird wizard truncation
 fix-containercontrols-wizardresize.diff, n#591768
-
+# fix strange ranges seperator regression problem
+fix-name-range-separator.diff, n#597351
 [ VBAUntested ]
 SectionOwner => noelpwer
 # doesn't work
diff --git a/patches/vba/fix-name-range-separator.diff b/patches/vba/fix-name-range-separator.diff
new file mode 100644
index 0000000..7b69bd8
--- /dev/null
+++ b/patches/vba/fix-name-range-separator.diff
@@ -0,0 +1,43 @@
+diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
+index f9ab354..1577dd3 100644
+--- sc/source/ui/vba/vbarange.cxx
++++ sc/source/ui/vba/vbarange.cxx
+@@ -1069,7 +1069,7 @@ public:
+ };
+ 
+ bool
+-getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv )
++getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 )
+ {
+     
+     ScDocument* pDoc = NULL;
+@@ -1079,7 +1079,7 @@ getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDoc
+         String aString(sAddress);
+         USHORT nMask = SCA_VALID;
+         //USHORT nParse = rCellRanges.Parse( sAddress, pDoc, nMask, formula::FormulaGrammar::CONV_XL_A1 );
+-        rResFlags = rCellRanges.Parse( sAddress, pDoc, nMask, eConv, 0 );
++        rResFlags = rCellRanges.Parse( sAddress, pDoc, nMask, eConv, cDelimiter );
+         if ( rResFlags & SCA_VALID )
+         {
+             return true;
+@@ -1132,6 +1132,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
+                 }
+             }
+         }
++        char aChar = 0; 
+         if ( xNameAccess->hasByName( sAddress ) )
+         {
+             uno::Reference< sheet::XNamedRange > xNamed( xNameAccess->getByName( sAddress ), uno::UNO_QUERY_THROW );
+@@ -1139,10 +1140,11 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
+             // As the address comes from OOO, the addressing
+             // style is may not be XL_A1
+             eConv = pDocSh->GetDocument()->GetAddressConvention();
++            aChar = ';';
+         }	
+ 
+         USHORT nFlags = 0;
+-        if ( !getCellRangesForAddress( nFlags, sAddress, pDocSh, aCellRanges, eConv ) )
++        if ( !getCellRangesForAddress( nFlags, sAddress, pDocSh, aCellRanges, eConv, aChar ) )
+             return false;
+     
+         bool bTabFromReferrer = !( nFlags & SCA_TAB_3D );