[ooo-build-commit] .: 2 commits - patches/dev300

Kohei Yoshida kohei at kemper.freedesktop.org
Mon May 24 12:02:32 PDT 2010 

 patches/dev300/apply                                        |   11 
 patches/dev300/calc-html-csv-import-force-text-cell.diff    |   16 -
 patches/dev300/calc-xls-export-encryption-condfmt-fix.diff  |   12 
 patches/dev300/hack-readd-XclExpInterfaceEnd-WriteBody.diff |   27 --
 patches/dev300/oox-build-fix-dev300-m77.diff                |  158 ++++++++++++
 patches/dev300/sc-filters-fill-fix.diff                     |   40 ---
 patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff  |   80 +++---
 7 files changed, 211 insertions(+), 133 deletions(-)

New commits:
commit 749d7e789719147e75353aa1ac75f253f25bd468
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon May 24 15:02:04 2010 -0400

    More build fix for dev300-m77.
    
    * patches/dev300/apply:
    * patches/dev300/calc-html-csv-import-force-text-cell.diff:
    * patches/dev300/calc-xls-export-encryption-condfmt-fix.diff:
    * patches/dev300/hack-readd-XclExpInterfaceEnd-WriteBody.diff:
    * patches/dev300/oox-build-fix-dev300-m77.diff:
    * patches/dev300/sc-filters-fill-fix.diff:
    * patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3dce427..5620bb3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -824,14 +824,6 @@ calc-find-replace-skip-filtered-sc.diff,  n#539282, n#580408, kohei
 # 2003 and 2007 happy.
 calc-combo-listbox-export-fix.diff, n#540566, noelp
 
-# FIXME. hack. readd XclExpInterfaceEnd::WriteBody as in m60 as 
-# calc-xls-export-encryption-condfmt-fix.diff patches it. Kohei, please check
-# --rengelhard
-hack-readd-XclExpInterfaceEnd-WriteBody.diff
-
-# Correctly encrypt zero bytes in the conditional formatting records.
-calc-xls-export-encryption-condfmt-fix.diff, n#541058, i#105933, kohei
-
 # Excel compatibility for handling of "string numbers".
 calc-string-number.diff, kohei
 
diff --git a/patches/dev300/calc-html-csv-import-force-text-cell.diff b/patches/dev300/calc-html-csv-import-force-text-cell.diff
index 3301947..360dbd7 100644
--- a/patches/dev300/calc-html-csv-import-force-text-cell.diff
+++ b/patches/dev300/calc-html-csv-import-force-text-cell.diff
@@ -50,12 +50,11 @@ index ffba48d..fff03fe 100644
  
  namespace com { namespace sun { namespace star {
      namespace lang {
-@@ -755,7 +756,8 @@ public:
+@@ -755,7 +756,7 @@ public:
                      //	return TRUE = Zahlformat gesetzt
      SC_DLLPUBLIC BOOL           SetString(
          SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
 -        SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
-+        SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true,
 +        ScSetStringParam* pParam = NULL );
      SC_DLLPUBLIC void           SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal );
      void 			SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError);
@@ -119,12 +118,11 @@ index 0b1228b..a6609b9 100644
  
  class ScTable
  {
-@@ -267,7 +267,8 @@ public:
+@@ -267,7 +267,7 @@ public:
      void		PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell);
                  //	TRUE = Zahlformat gesetzt
      BOOL		SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
 -                           SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
-+                           SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true,
 +                           ScSetStringParam* pParam = NULL );
      void		SetValue( SCCOL nCol, SCROW nRow, const double& rVal );
      void 		SetError( SCCOL nCol, SCROW nRow, USHORT nError);
@@ -256,17 +254,16 @@ diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
 index 7766d7f..366211d 100644
 --- sc/source/core/data/document.cxx
 +++ sc/source/core/data/document.cxx
-@@ -2647,10 +2647,11 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT
+@@ -2647,10 +2647,10 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT
  
  
  BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
 -                            SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
-+                            SvNumberFormatter* pFormatter, bool bDetectNumberFormat,
 +                            ScSetStringParam* pParam )
  {
      if ( ValidTab(nTab) && pTab[nTab] )
 -        return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pFormatter, bDetectNumberFormat );
-+        return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pFormatter, bDetectNumberFormat, pParam );
++        return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pParam );
      else
          return FALSE;
  }
@@ -274,18 +271,17 @@ diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
 index 614980e..bd14718 100644
 --- sc/source/core/data/table2.cxx
 +++ sc/source/core/data/table2.cxx
-@@ -846,11 +846,12 @@ void ScTable::PutCell( const ScAddress& rPos, ScBaseCell* pCell )
+@@ -846,11 +846,11 @@ void ScTable::PutCell( const ScAddress& rPos, ScBaseCell* pCell )
  
  
  BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString, 
 -                         SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
-+                         SvNumberFormatter* pFormatter, bool bDetectNumberFormat,
 +                         ScSetStringParam* pParam )
  {
      if (ValidColRow(nCol,nRow))
          return aCol[nCol].SetString( 
 -            nRow, nTabP, rString, pDocument->GetAddressConvention(), pFormatter, bDetectNumberFormat );
-+            nRow, nTabP, rString, pDocument->GetAddressConvention(), pFormatter, bDetectNumberFormat, pParam );
++            nRow, nTabP, rString, pDocument->GetAddressConvention(), pParam );
      else
          return FALSE;
  }
diff --git a/patches/dev300/calc-xls-export-encryption-condfmt-fix.diff b/patches/dev300/calc-xls-export-encryption-condfmt-fix.diff
index c28a6d9..ab2821d 100644
--- a/patches/dev300/calc-xls-export-encryption-condfmt-fix.diff
+++ b/patches/dev300/calc-xls-export-encryption-condfmt-fix.diff
@@ -11,18 +11,14 @@ diff --git sc/source/filter/xcl97/xcl97rec.cxx sc/source/filter/xcl97/xcl97rec.c
 index 2fcc2f8..09f9f23 100644
 --- sc/source/filter/xcl97/xcl97rec.cxx
 +++ sc/source/filter/xcl97/xcl97rec.cxx
-@@ -1352,8 +1352,10 @@ void XclExpWriteAccess::WriteBody( XclExpStream& rStrm )
+@@ -1352,4 +1352,10 @@ void XclExpWriteAccess::WriteBody( XclExpStream& rStrm )
          rStrm << aData[i];
  }
- 
--void XclExpInterfaceEnd::WriteBody( XclExpStream& /*rStrm*/ )
++
 +void XclExpInterfaceEnd::WriteBody( XclExpStream& rStrm )
- {
++{
 +    // Don't forget to re-enable encryption.
 +    rStrm.EnableEncryption();
- }
++}
  
  // ============================================================================
--- 
-1.7.0.1
-
diff --git a/patches/dev300/hack-readd-XclExpInterfaceEnd-WriteBody.diff b/patches/dev300/hack-readd-XclExpInterfaceEnd-WriteBody.diff
deleted file mode 100644
index 9fc062d..0000000
--- a/patches/dev300/hack-readd-XclExpInterfaceEnd-WriteBody.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From f140743a5e3327992ac26195d6a992ff37678111 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 16:56:30 +0200
-Subject: [PATCH 186/768] hack-readd-XclExpInterfaceEnd-WriteBody.diff
-
----
- sc/source/filter/xcl97/xcl97rec.cxx |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git sc/source/filter/xcl97/xcl97rec.cxx sc/source/filter/xcl97/xcl97rec.cxx
-index 4470469..2fcc2f8 100644
---- sc/source/filter/xcl97/xcl97rec.cxx
-+++ sc/source/filter/xcl97/xcl97rec.cxx
-@@ -1352,6 +1352,10 @@ void XclExpWriteAccess::WriteBody( XclExpStream& rStrm )
-         rStrm << aData[i];
- }
- 
-+void XclExpInterfaceEnd::WriteBody( XclExpStream& /*rStrm*/ )
-+{
-+}
-+
- // ============================================================================
- 
- XclExpFileSharing::XclExpFileSharing( const XclExpRoot& rRoot, sal_uInt16 nPasswordHash ) :
--- 
-1.7.0.1
-
diff --git a/patches/dev300/oox-build-fix-dev300-m77.diff b/patches/dev300/oox-build-fix-dev300-m77.diff
index 9b09f5f..bb54930 100644
--- a/patches/dev300/oox-build-fix-dev300-m77.diff
+++ b/patches/dev300/oox-build-fix-dev300-m77.diff
@@ -26,11 +26,37 @@ index 7ba2a44..9adf64b 100644
  protected:
  
      ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+diff --git oox/inc/oox/export/drawingml.hxx oox/inc/oox/export/drawingml.hxx
+index 211c90e..10397a5 100644
+--- oox/inc/oox/export/drawingml.hxx
++++ oox/inc/oox/export/drawingml.hxx
+@@ -7,7 +7,7 @@
+ #include <com/sun/star/awt/FontDescriptor.hpp>
+ #include <com/sun/star/uno/XReference.hpp>
+ #include <tools/poly.hxx>
+-#include <svx/escherex.hxx>
++#include <filter/msfilter/escherex.hxx>
+ 
+ class Graphic;
+ class String;
+diff --git oox/inc/oox/export/vmlexport.hxx oox/inc/oox/export/vmlexport.hxx
+index b749297..cde0224 100644
+--- oox/inc/oox/export/vmlexport.hxx
++++ oox/inc/oox/export/vmlexport.hxx
+@@ -27,7 +27,7 @@
+ 
+ #include <oox/dllapi.h>
+ #include <sax/fshelper.hxx>
+-#include <svx/escherex.hxx>
++#include <filter/msfilter/escherex.hxx>
+ 
+ namespace rtl {
+     class OString;
 diff --git oox/source/export/drawingml.cxx oox/source/export/drawingml.cxx
-index e4e8fba..659ce4c 100644
+index c44f5d0..0f71789 100644
 --- oox/source/export/drawingml.cxx
 +++ oox/source/export/drawingml.cxx
-@@ -65,6 +65,7 @@
+@@ -65,13 +65,13 @@
  #include <tools/string.hxx>
  #include <vcl/cvtgrf.hxx>
  #include <unotools/fontcvt.hxx>
@@ -38,7 +64,15 @@ index e4e8fba..659ce4c 100644
  #include <vcl/graph.hxx>
  #include <svtools/grfmgr.hxx>
  #include <rtl/strbuf.hxx>
-@@ -520,7 +521,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
+ #include <sfx2/app.hxx>
+ #include <svl/languageoptions.hxx>
+-#include <svx/escherex.hxx>
+-#include <svx/svxenum.hxx>
++#include <editeng/svxenum.hxx>
+ 
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::beans;
+@@ -520,7 +520,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
              }
  
              aData = aStream.GetData();
@@ -60,6 +94,22 @@ index 0dc98c1..bc5163b 100644
  
  const char* pShapeTypes[ ESCHER_ShpInst_COUNT ] =
  {
+diff --git oox/source/export/shapes.cxx oox/source/export/shapes.cxx
+index 71d3f9c..fee5abc 100644
+--- oox/source/export/shapes.cxx
++++ oox/source/export/shapes.cxx
+@@ -66,9 +66,9 @@
+ #include <rtl/strbuf.hxx>
+ #include <sfx2/app.hxx>
+ #include <svl/languageoptions.hxx>
+-#include <svx/escherex.hxx>
++#include <filter/msfilter/escherex.hxx>
+ #include <svx/svdoashp.hxx>
+-#include <svx/svxenum.hxx>
++#include <editeng/svxenum.hxx>
+ #include <svx/unoapi.hxx>
+ 
+ using namespace ::com::sun::star;
 diff --git oox/source/export/vmlexport.cxx oox/source/export/vmlexport.cxx
 index 6da08a2..1223519 100644
 --- oox/source/export/vmlexport.cxx
diff --git a/patches/dev300/sc-filters-fill-fix.diff b/patches/dev300/sc-filters-fill-fix.diff
index c41ad3a..580d7c3 100644
--- a/patches/dev300/sc-filters-fill-fix.diff
+++ b/patches/dev300/sc-filters-fill-fix.diff
@@ -1,43 +1,3 @@
-From 2c8c5468fd35b94923e1b84613cf13362d5b0074 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 16:55:13 +0200
-Subject: [PATCH 122/768] sc-filters-fill-fix.diff
-
----
- sc/inc/document.hxx            |   12 ++++++++++++
- sc/source/core/data/table4.cxx |    4 ++++
- 2 files changed, 16 insertions(+), 0 deletions(-)
-
-diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 2fcde19..d796790 100644
---- sc/inc/document.hxx
-+++ sc/inc/document.hxx
-@@ -436,6 +436,8 @@ public:
-     ULONG			GetWeightedCount() const;	// Formeln und Edit staerker gewichtet
-     ULONG			GetCodeCount() const;		// RPN-Code in Formeln
-     DECL_LINK( GetUserDefinedColor, USHORT * );
-+    BOOL        RowFiltered( SCROW nRow, SCTAB nTab ) const;    // FillInfo
-+    BOOL        ColFiltered( SCCOL nCol, SCTAB nTab ) const;    // FillInfo
-                                                                 // Numberformatter
- 
- public:
-@@ -1852,6 +1854,16 @@ inline void ScDocument::SetSortParam( ScSortParam& rParam, SCTAB nTab )
-     mSheetSortParams[ nTab ] = rParam;
- }
- 
-+inline BOOL ScDocument::ColFiltered( SCCOL nCol, SCTAB nTab ) const
-+{
-+    return ( pTab[nTab]->pColFlags[nCol] & CR_FILTERED) != 0;
-+}
-+
-+inline BOOL ScDocument::RowFiltered( SCROW nRow, SCTAB nTab ) const
-+{
-+    return pTab[nTab]->IsFiltered(nRow);
-+}
-+
- #endif
- 
- 
 diff --git sc/source/core/data/table4.cxx sc/source/core/data/table4.cxx
 index 7493241..f8ee2ca 100644
 --- sc/source/core/data/table4.cxx
diff --git a/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff b/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff
index 2c08e58..1882194 100644
--- a/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff
+++ b/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff
@@ -957,7 +957,7 @@ index 0000000..c7e9231
 +#define SC_EXCRECDS_HXX
 +
 +#include <tools/solar.h>
-+#include <svtools/zforlist.hxx>
++#include <svl/zforlist.hxx>
 +#include <tools/string.hxx>
 +#include <vcl/vclenum.hxx>
 +#include <tools/color.hxx>
@@ -6781,7 +6781,7 @@ index 0000000..1fc4a2c
 +#include "xlstream.hxx"
 +#include "xestring.hxx"
 +
-+#include <svx/mscodec.hxx>
++#include <filter/msfilter/mscodec.hxx>
 +#include <vector>
 +
 +/* ============================================================================
@@ -6986,7 +6986,7 @@ index 0000000..1fc4a2c
 +    sal_uInt16 GetOffsetInBlock( sal_Size nStrmPos ) const;
 +
 +private:
-+    ::svx::MSCodec_Std97 maCodec;      /// Crypto algorithm implementation.
++    ::msfilter::MSCodec_Std97 maCodec;      /// Crypto algorithm implementation.
 +    sal_uInt16          mnPassw[16];   /// Cached password data for copy construction.
 +    sal_uInt8           mnDocId[16];   /// Cached document ID for copy construction.
 +    sal_uInt8           mnSaltDigest[16];
@@ -7135,9 +7135,9 @@ index 0000000..4fa9174
 +#include <map>
 +#include <tools/mempool.hxx>
 +#include <tools/string.hxx>
-+#include <svtools/zforlist.hxx>
-+#include <svtools/nfkeytab.hxx>
-+#include <svx/svxfont.hxx>
++#include <svl/zforlist.hxx>
++#include <svl/nfkeytab.hxx>
++#include <editeng/svxfont.hxx>
 +#include "xerecord.hxx"
 +#include "xlstyle.hxx"
 +#include "xeroot.hxx"
@@ -12630,10 +12630,10 @@ index 0000000..3aa85dd
 +#include <svx/svdobj.hxx>
 +#include <svx/svditer.hxx>
 +#include <svx/svdpage.hxx>
-+#include <svx/lrspitem.hxx>
-+#include <svx/ulspitem.hxx>
++#include <editeng/lrspitem.hxx>
++#include <editeng/ulspitem.hxx>
 +#include <svl/intitem.hxx>
-+#include <svtools/zformat.hxx>
++#include <svl/zformat.hxx>
 +#include <sot/storage.hxx>
 +#include <sfx2/objsh.hxx>
 +#include <tools/urlobj.hxx>
@@ -13487,14 +13487,14 @@ index 0000000..b651315
 +#include <svx/countryid.hxx>
 +
 +#include "scitems.hxx"
-+#include <svx/eeitem.hxx>
++#include <editeng/eeitem.hxx>
 +
 +#include <sfx2/objsh.hxx>
 +
-+#include <svx/editdata.hxx>
-+#include <svx/editeng.hxx>
-+#include <svx/editobj.hxx>
-+#include <svx/editstat.hxx>
++#include <editeng/editdata.hxx>
++#include <editeng/editeng.hxx>
++#include <editeng/editobj.hxx>
++#include <editeng/editstat.hxx>
 +
 +#include <svx/flditem.hxx>
 +#include <svx/flstitem.hxx>
@@ -13505,12 +13505,12 @@ index 0000000..b651315
 +#include <svx/pageitem.hxx>
 +#include <svx/paperinf.hxx>
 +#include <svx/sizeitem.hxx>
-+#include <svx/ulspitem.hxx>
++#include <editeng/ulspitem.hxx>
 +#include <svx/fhgtitem.hxx>
 +#include <svx/escpitem.hxx>
 +#include <svl/intitem.hxx>
-+#include <svtools/zforlist.hxx>
-+#include <svtools/zformat.hxx>
++#include <svl/zforlist.hxx>
++#include <svl/zformat.hxx>
 +#include <svtools/ctrltool.hxx>
 +
 +#define _SVSTDARR_USHORTS
@@ -14540,12 +14540,12 @@ index 0000000..8a3b6e2
 +//------------------------------------------------------------------------
 +
 +#include "scitems.hxx"
-+#include <svx/eeitem.hxx>
++#include <editeng/eeitem.hxx>
 +
-+#include <svx/editdata.hxx>
-+#include <svx/editeng.hxx>
-+#include <svx/editobj.hxx>
-+#include <svx/editstat.hxx>
++#include <editeng/editdata.hxx>
++#include <editeng/editeng.hxx>
++#include <editeng/editobj.hxx>
++#include <editeng/editstat.hxx>
 +
 +#include "document.hxx"
 +#include "patattr.hxx"
@@ -15217,7 +15217,7 @@ index 0000000..ccce79f
 +#include "scitems.hxx"
 +#include <svx/cntritem.hxx>
 +#include <svx/crsditem.hxx>
-+#include <svx/eeitem.hxx>
++#include <editeng/eeitem.hxx>
 +#include <svx/postitem.hxx>
 +#include <svx/shdditem.hxx>
 +#include <svx/escpitem.hxx>
@@ -17556,7 +17556,7 @@ index 0000000..b47ae57
 +#include <svx/svdpool.hxx>
 +#include <svx/sdtaitm.hxx>
 +#include <svx/svdotext.hxx>
-+#include <svx/editobj.hxx>
++#include <editeng/editobj.hxx>
 +#include <svx/svdoole2.hxx>
 +#include <sot/storage.hxx>
 +#include <svtools/itemset.hxx>
@@ -17566,7 +17566,7 @@ index 0000000..b47ae57
 +#include <svx/writingmodeitem.hxx>
 +#include <vcl/svapp.hxx>
 +#include <rtl/math.hxx>
-+#include <svtools/zformat.hxx>
++#include <svl/zformat.hxx>
 +#include "cell.hxx"
 +#include "drwlayer.hxx"
 +
@@ -17584,7 +17584,7 @@ index 0000000..b47ae57
 +#include <svx/boxitem.hxx>
 +#include <svx/frmdiritem.hxx>
 +#include <svx/adjitem.hxx>
-+#include <svx/eeitem.hxx>
++#include <editeng/eeitem.hxx>
 +#include <svx/msoleexp.hxx>
 +
 +#include <unotools/localedatawrapper.hxx>
@@ -22308,7 +22308,7 @@ index 0000000..2f3b7bd
 +#include <svtools/itemset.hxx>
 +#include <formula/grammar.hxx>
 +#include "scitems.hxx"
-+#include <svx/eeitem.hxx>
++#include <editeng/eeitem.hxx>
 +#include <svx/flditem.hxx>
 +#include "document.hxx"
 +#include "validat.hxx"
@@ -23801,7 +23801,7 @@ index 0000000..ada23ed
 +#include <svx/svdoole2.hxx>
 +#include <svx/svdocapt.hxx>
 +#include <svx/outlobj.hxx>
-+#include <svx/editobj.hxx>
++#include <editeng/editobj.hxx>
 +
 +#include "editutil.hxx"
 +#include "unonames.hxx"
@@ -27532,10 +27532,10 @@ index 0000000..605005c
 +#include <svx/fhgtitem.hxx>
 +#include <svx/flstitem.hxx>
 +#include <svx/colritem.hxx>
-+#include <svx/eeitem.hxx>
++#include <editeng/eeitem.hxx>
 +#include <svx/flditem.hxx>
 +#include <svx/escpitem.hxx>
-+#include <svx/svxfont.hxx>
++#include <editeng/svxfont.hxx>
 +
 +#define _SVSTDARR_USHORTS
 +#include <svtools/svstdarr.hxx>
@@ -28675,7 +28675,7 @@ index 0000000..207812e
 +
 +#include <algorithm>
 +#include <unotools/collatorwrapper.hxx>
-+#include <svtools/zforlist.hxx>
++#include <svl/zforlist.hxx>
 +#include "document.hxx"
 +#include "cell.hxx"
 +#include "scextopt.hxx"
@@ -31922,8 +31922,8 @@ index 0000000..7aadc8f
 +#include <svl/intitem.hxx>
 +#include <svx/pageitem.hxx>
 +#include <svx/sizeitem.hxx>
-+#include <svx/lrspitem.hxx>
-+#include <svx/ulspitem.hxx>
++#include <editeng/lrspitem.hxx>
++#include <editeng/ulspitem.hxx>
 +#include <svx/brshitem.hxx>
 +#include "document.hxx"
 +#include "stlpool.hxx"
@@ -32348,7 +32348,7 @@ index 0000000..3270295
 +
 +#include <rtl/math.hxx>
 +#include <tools/date.hxx>
-+#include <svtools/zformat.hxx>
++#include <svl/zformat.hxx>
 +#include <sot/storage.hxx>
 +#include "document.hxx"
 +#include "dpobject.hxx"
@@ -36453,7 +36453,7 @@ index 0000000..5e7c86d
 +#include <set>
 +#include <com/sun/star/i18n/ScriptType.hpp>
 +#include <vcl/font.hxx>
-+#include <svtools/zformat.hxx>
++#include <svl/zformat.hxx>
 +#include <svtools/languageoptions.hxx>
 +#include <sfx2/printer.hxx>
 +#include "scitems.hxx"
@@ -36464,7 +36464,7 @@ index 0000000..5e7c86d
 +#include <svx/colritem.hxx>
 +#include <svx/brshitem.hxx>
 +#include <svx/frmdiritem.hxx>
-+#include <svx/eeitem.hxx>
++#include <editeng/eeitem.hxx>
 +#include <svx/escpitem.hxx>
 +#include "document.hxx"
 +#include "stlpool.hxx"
@@ -46444,9 +46444,9 @@ index 0000000..3a675db
 +#include <sfx2/printer.hxx>
 +#include <sfx2/docfile.hxx>
 +#include <vcl/font.hxx>
-+#include <svx/editstat.hxx>
++#include <editeng/editstat.hxx>
 +#include "scitems.hxx"
-+#include <svx/eeitem.hxx>
++#include <editeng/eeitem.hxx>
 +#include "document.hxx"
 +#include "docpool.hxx"
 +#include "docuno.hxx"
@@ -46833,7 +46833,7 @@ index 0000000..955a445
 +#include <vcl/font.hxx>
 +#include <rtl/tencinfo.h>
 +#include <toolkit/unohlp.hxx>
-+#include <svx/svxfont.hxx>
++#include <editeng/svxfont.hxx>
 +#include "global.hxx"
 +#include "xlroot.hxx"
 +
@@ -49045,7 +49045,7 @@ index 0000000..2fc84ce
 +#include <sal/mathconf.h>
 +#include <vcl/fontcvt.hxx>
 +#include <sfx2/objsh.hxx>
-+#include <svx/editstat.hxx>
++#include <editeng/editstat.hxx>
 +#include "xestream.hxx"
 +#include "document.hxx"
 +#include "docuno.hxx"
commit 98eefbac3b345c17f16dbc2a65e0612f7f901778
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon May 24 12:26:36 2010 -0400

    Temporarily "fixed" oox build breakage.
    
    * patches/dev300/apply:
    * patches/dev300/oox-build-fix-dev300-m77.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 84ca2ed..3dce427 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3752,3 +3752,6 @@ emf+-cppcanvas-replace-poly-factory-and-clean.diff, rodo
 
 [ OpenGLTransitions ]
 transogl-transitions-newsflash-pptin.diff
+
+[ Fixes ]
+oox-build-fix-dev300-m77.diff, kohei
diff --git a/patches/dev300/oox-build-fix-dev300-m77.diff b/patches/dev300/oox-build-fix-dev300-m77.diff
new file mode 100644
index 0000000..9b09f5f
--- /dev/null
+++ b/patches/dev300/oox-build-fix-dev300-m77.diff
@@ -0,0 +1,108 @@
+diff --git oox/inc/oox/drawingml/customshapeproperties.hxx oox/inc/oox/drawingml/customshapeproperties.hxx
+index 4bd9381..387c072 100644
+--- oox/inc/oox/drawingml/customshapeproperties.hxx
++++ oox/inc/oox/drawingml/customshapeproperties.hxx
+@@ -74,6 +74,7 @@ public:
+             const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet,
+                         const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape) const;
+ 
++    const rtl::OUString getShapePresetType() const { return maShapePresetType; }
+     void setShapePresetType( const rtl::OUString& rShapePresetType ){ maShapePresetType = rShapePresetType; };
+     std::vector< CustomShapeGuide >& getAdjustmentValues(){ return maAdjustmentValues; };
+ 
+diff --git oox/inc/oox/drawingml/shape.hxx oox/inc/oox/drawingml/shape.hxx
+index 7ba2a44..9adf64b 100644
+--- oox/inc/oox/drawingml/shape.hxx
++++ oox/inc/oox/drawingml/shape.hxx
+@@ -160,6 +160,11 @@ public:
+ 
+     virtual void        applyShapeReference( const Shape& rReferencedShape );
+ 
++    const ::com::sun::star::awt::Size&
++                        getSize() const { return maSize; }
++    const ::com::sun::star::awt::Point&
++                        getPosition() const { return maPosition; }
++
+ protected:
+ 
+     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+diff --git oox/source/export/drawingml.cxx oox/source/export/drawingml.cxx
+index e4e8fba..659ce4c 100644
+--- oox/source/export/drawingml.cxx
++++ oox/source/export/drawingml.cxx
+@@ -65,6 +65,7 @@
+ #include <tools/string.hxx>
+ #include <vcl/cvtgrf.hxx>
+ #include <unotools/fontcvt.hxx>
++#include <unotools/fontdefs.hxx>
+ #include <vcl/graph.hxx>
+ #include <svtools/grfmgr.hxx>
+ #include <rtl/strbuf.hxx>
+@@ -520,7 +521,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
+             }
+ 
+             aData = aStream.GetData();
+-            nDataSize = aStream.GetSize();
++            nDataSize = aStream.GetEndOfData();
+             break;
+             }
+     }
+diff --git oox/source/export/preset-definitions-to-shape-types.pl oox/source/export/preset-definitions-to-shape-types.pl
+index 0dc98c1..bc5163b 100644
+--- oox/source/export/preset-definitions-to-shape-types.pl
++++ oox/source/export/preset-definitions-to-shape-types.pl
+@@ -1204,7 +1204,7 @@ print <<EOF;
+ //   '$src_text'
+ // which are part of the OOXML documentation
+ 
+-#include <svx/escherex.hxx>
++#include <filter/msfilter/escherex.hxx>
+ 
+ const char* pShapeTypes[ ESCHER_ShpInst_COUNT ] =
+ {
+diff --git oox/source/export/vmlexport.cxx oox/source/export/vmlexport.cxx
+index 6da08a2..1223519 100644
+--- oox/source/export/vmlexport.cxx
++++ oox/source/export/vmlexport.cxx
+@@ -64,7 +64,7 @@ public:
+ };
+ 
+ VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr pSerializer )
+-    : EscherEx( *( new SvNullStream ), 0 ),
++    : EscherEx( EscherExGlobalRef(new EscherExGlobal(0)), *( new SvNullStream ) ),
+       m_pSerializer( pSerializer ),
+       m_pShapeAttrList( NULL ),
+       m_nShapeType( ESCHER_ShpInst_Nil ),
+@@ -128,6 +128,9 @@ void VMLExport::CloseContainer()
+ 
+ UINT32 VMLExport::EnterGroup( const String& rShapeName, const Rectangle* pRect )
+ {
++#if 1 // FIXME dev300-m77 please fix this.
++    return 0;
++#else
+     UINT32 nShapeId = GetShapeID();
+ 
+     OStringBuffer aStyle( 200 );
+@@ -163,6 +166,7 @@ UINT32 VMLExport::EnterGroup( const String& rShapeName, const Rectangle* pRect )
+ 
+     mnGroupLevel++;
+     return nShapeId;
++#endif
+ }
+ 
+ void VMLExport::LeaveGroup()
+diff --git oox/util/makefile.mk oox/util/makefile.mk
+index 33c53d1..977b3b9 100644
+--- oox/util/makefile.mk
++++ oox/util/makefile.mk
+@@ -74,7 +74,9 @@ SHL1STDLIBS= \
+         $(GOODIESLIB)		\
+         $(SVTOOLLIB)		\
+         $(SVXCORELIB)		\
+-        $(SVXMSFILTERLIB)	\
++        $(SVLLIB)		\
++        $(UNOTOOLSLIB)		\
++        $(MSFILTERLIB)	\
+         $(TOOLSLIB)
+ 
+ # link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk

More information about the ooo-build-commit mailing list