[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                   |    5 +++++
 patches/dev300/xlsx-build-fix-m18.diff |   13 +++++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit 00d9bf9f96938abe869a36085e72b3fe360b9e95
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Aug 7 14:17:33 2009 -0400

    Fixed build breakage in sc.
    
    * patches/dev300/apply:
    * patches/dev300/xlsx-build-fix-m18.diff: part of my shared formula
      wrapping patch which they integrated for m18.  But we still need
      to patch xlsx because they don't have it upstream.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 58075ca..6a652e3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3170,6 +3170,11 @@ xlsx-filter-as-a-separate-lib.diff
 [ OOXMLExport >= ooo310-m17 ]
 # update with the changes introduced up to m17
 xlsx-filter-as-a-separate-lib-m17-update.diff
+
+[ OOXMLExport >= ooo310-m18 ]
+# build fix for m18 and up
+xlsx-build-fix-m18.diff, kohei
+
 [ OOXMLExport ]
 # tweak to above ( associated with vba-fallback-to-calling-doc-context.diff )
 xlsx-separate-lib-vba-fallback-tweak.diff
diff --git a/patches/dev300/xlsx-build-fix-m18.diff b/patches/dev300/xlsx-build-fix-m18.diff
new file mode 100644
index 0000000..ddfdf67
--- /dev/null
+++ b/patches/dev300/xlsx-build-fix-m18.diff
@@ -0,0 +1,13 @@
+diff --git sc/source/filter/xlsx/xlsx-xeformula.cxx sc/source/filter/xlsx/xlsx-xeformula.cxx
+index 31af0f9..c1989b8 100644
+--- sc/source/filter/xlsx/xlsx-xeformula.cxx
++++ sc/source/filter/xlsx/xlsx-xeformula.cxx
+@@ -619,7 +619,7 @@ void XclExpFmlaCompImpl::Init( XclFormulaType eType, const ScTokenArray& rScTokA
+             DBG_ASSERT( mbOk, "XclExpFmlaCompImpl::Init - missing cell address" );
+             // clone the passed token array, convert references relative to current cell position
+             mxOwnScTokArr.reset( rScTokArr.Clone() );
+-            ScCompiler::MoveRelWrap( *mxOwnScTokArr, GetDocPtr(), *pScBasePos );
++            ScCompiler::MoveRelWrap( *mxOwnScTokArr, GetDocPtr(), *pScBasePos, MAXCOL, MAXROW );
+             // don't remember pScBasePos in mpScBasePos, shared formulas use real relative refs
+         break;
+         default:;