[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                    |    3 +++
 patches/dev300/calc-r1c1-parse-fix.diff |   15 +++++++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit 1dd317bed199fc705c2fbaa52acf95d0a27d1346
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Nov 30 19:45:26 2009 -0500

    Fixed R1C1 parser to have it return correct flag value.
    
    * patches/dev300/apply:
    * patches/dev300/calc-r1c1-parse-fix.diff: it failed to return
      SCA_VALID_TAB2 for the range-end address, which caused range
      addresses to be parsed correctly. (n#557475)  BTW Noel put
      the exact same fix way before (around 2.4).  Looks like we lost
      that fix between then and now. :-(

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 52b03ff..1bc27b5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -866,6 +866,9 @@ calc-auto-tab-complete.diff, i#18748, muthusuba/kohei
 # Speed up filtering performance with notes.
 calc-perf-filtering-with-notes.diff, n#556927, kohei
 
+# Fix R1C1 parser.
+calc-r1c1-parse-fix.diff, n#557475, kohei
+
 # Support PHONETIC function to display asian phonetic guide.
 # LATER: I'll take care of this later.  --kohei
 # calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
diff --git a/patches/dev300/calc-r1c1-parse-fix.diff b/patches/dev300/calc-r1c1-parse-fix.diff
new file mode 100644
index 0000000..cb28040
--- /dev/null
+++ b/patches/dev300/calc-r1c1-parse-fix.diff
@@ -0,0 +1,15 @@
+diff --git sc/source/core/tool/address.cxx sc/source/core/tool/address.cxx
+index e85ec8d..5a1217a 100644
+--- sc/source/core/tool/address.cxx
++++ sc/source/core/tool/address.cxx
+@@ -631,7 +631,9 @@ lcl_ScRange_Parse_XL_R1C1( ScRange& r,
+ {
+     const sal_Unicode* pTmp = NULL;
+     String aExternDocName, aStartTabName, aEndTabName;
+-    USHORT nFlags = SCA_VALID | SCA_VALID_TAB, nFlags2 = SCA_VALID_TAB2;
++    USHORT nFlags = SCA_VALID | SCA_VALID_TAB;
++    // Keep in mind that nFlags2 gets left-shifted by 4 bits before being merged.
++    USHORT nFlags2 = SCA_VALID_TAB;
+ 
+ #if 0
+     {