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

[Kohei Yoshida]

 patches/dev300/apply                   |    4 ++--
 patches/dev300/xlsx-build-fix-m18.diff |   13 -------------
 patches/dev300/xlsx-build-fix.diff     |   30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 15 deletions(-)

New commits:
commit 06bcdf6420e39ef6aff6f313bc9626b9fdac6b06
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Nov 12 17:00:56 2009 -0500

    Fixed build breakage in sc (xlsx related).
    
    * patches/dev300/apply:
    * patches/dev300/xlsx-build-fix-m18.diff: renamed to the patch below.
    * patches/dev300/xlsx-build-fix.diff: added new hunk to add new
      function definition added by the recent vba patch.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 70e9233..bff920a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3176,8 +3176,8 @@ xlsx-filter-as-a-separate-lib.diff
 # update with the changes introduced up to m17
 xlsx-filter-as-a-separate-lib-m17-update.diff
 
-# build fix for m18 and up
-xlsx-build-fix-m18.diff, kohei
+# build fix
+xlsx-build-fix.diff, kohei
 
 # 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
deleted file mode 100644
index ddfdf67..0000000
--- a/patches/dev300/xlsx-build-fix-m18.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-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:;
diff --git a/patches/dev300/xlsx-build-fix.diff b/patches/dev300/xlsx-build-fix.diff
new file mode 100644
index 0000000..6a87137
--- /dev/null
+++ b/patches/dev300/xlsx-build-fix.diff
@@ -0,0 +1,30 @@
+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:;
+diff --git sc/source/filter/xlsx/xlsx-xiescher.cxx sc/source/filter/xlsx/xlsx-xiescher.cxx
+index 1637ab1..48ebcb6 100644
+--- sc/source/filter/xlsx/xlsx-xiescher.cxx
++++ sc/source/filter/xlsx/xlsx-xiescher.cxx
+@@ -2791,6 +2791,12 @@ SdrObject* XclImpPictureObj::DoCreateSdrObj( const Rectangle& rAnchorRect, ScfPr
+     return xSdrObj.release();
+ }
+ 
++String XclImpPictureObj::GetObjName() const
++{
++    // dummy function definition.  This is never called.
++    return String();
++}
++
+ void XclImpPictureObj::DoProcessSdrObj( SdrObject& rSdrObj ) const
+ {
+     if( IsOcxControl() )