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

Kohei Yoshida kohei at kemper.freedesktop.org
Mon May 24 19:06:19 PDT 2010 

 patches/dev300/apply                                       |   36 ++++++-------
 patches/dev300/oox-build-fix-dev300-m77.diff               |   12 +++-
 patches/dev300/pptx-filter-as-a-separate-lib.diff          |    4 -
 patches/dev300/pptx-snapshot-at-ooxml03-creation.diff      |    6 +-
 patches/dev300/sd-ruler-fix.diff                           |    2 
 patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff |    4 -
 6 files changed, 37 insertions(+), 27 deletions(-)

New commits:
commit c7a6bf9b2ed933abdc68a45036d5eb3781840aa6
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon May 24 22:06:08 2010 -0400

    More build fix, in sd.
    
    More header relocation & disabled pptx export patches.
    
    * patches/dev300/apply:
    * patches/dev300/oox-build-fix-dev300-m77.diff:
    * patches/dev300/pptx-filter-as-a-separate-lib.diff:
    * patches/dev300/pptx-snapshot-at-ooxml03-creation.diff:
    * patches/dev300/sd-ruler-fix.diff:
    * patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4bef5eb..61e27c2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3001,32 +3001,32 @@ mail-document-subject.diff, n#459176
 # Enable the DOCX export (and few related features in oox)
 docx-export-enable.diff, jholesov
 
-pptx-filter-as-a-separate-lib.diff
+# FIXME dev300-m77 pptx-filter-as-a-separate-lib.diff
 
 [ OOXMLExport and not OpenGLTransitions ]
-pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
+# FIXME dev300-m77 pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
 
 [ OOXMLExport and OpenGLTransitions ]
-pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
+# FIXME dev300-m77 pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
 
 [ OOXMLExport ]
 # Snapshot of the pptx export filter at the time of creation of ooxml03
 # This is until 0475--fix-crash-introduced-by-Jonathan-s-changes-in-eppt.patch
 # (including)
 
-pptx-snapshot-at-ooxml03-creation.diff
+# FIXME dev300-m77 pptx-snapshot-at-ooxml03-creation.diff
 
 # ...and the rest from the git tree
 # (until 'more qnimations export work', including)
 
-pptx-the-rest-from-git.diff
-pptx-export-empty-animations-node-and-groupshape-fix.diff, rodo
+# FIXME dev300-m77 pptx-the-rest-from-git.diff
+# FIXME dev300-m77 pptx-export-empty-animations-node-and-groupshape-fix.diff, rodo
 
 # ugly temp fix to make GraphicShapeContext recognise layout
-pptx-gfx-layout-fix.diff, thorsten
+# FIXME dev300-m77 pptx-gfx-layout-fix.diff, thorsten
 
 # handles case where a connector shape is not connected
-pptx-fix-connector-crash.diff, n#499129, thorsten
+# FIXME dev300-m77 pptx-fix-connector-crash.diff, n#499129, thorsten
 
 [ OOXMLExport321 and not OOXMLExportDevel ]
 # For the purpose of the 3.2 release, all the pptx and xlsx are done as
@@ -3117,7 +3117,7 @@ odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
 xlsx-shared-oox-smartart-import-m13.diff
 
 [ OOXML ]
-oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
+# FIXME dev300-m77 oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
 
 [ Fixes ]
 external-apm-header.diff, freuter
@@ -3169,20 +3169,20 @@ oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
 fit-list-to-size-ooxml.diff, i#94086, thorsten
 
 [ OOXMLExport ]
-oox-pptx-export-hyperlinks.diff, n#499124, rodo
-oox-pptx-export-vertical-text.diff, n#498737, rodo
-oox-pptx-export-para-linespacing.diff, n#498737, rodo
-oox-pptx-export-fix-action-button-presets.diff, n#497570, rodo
-oox-drawingml-fix-shapes-map-crash.diff, rodo
+# FIXME dev300-m77 oox-pptx-export-hyperlinks.diff, n#499124, rodo
+# FIXME dev300-m77 oox-pptx-export-vertical-text.diff, n#498737, rodo
+# FIXME dev300-m77 oox-pptx-export-para-linespacing.diff, n#498737, rodo
+# FIXME dev300-m77 oox-pptx-export-fix-action-button-presets.diff, n#497570, rodo
+# FIXME dev300-m77 oox-drawingml-fix-shapes-map-crash.diff, rodo
 
 [ OOXMLExportDevel ]
 # equivalent of ooxml-drawing-fix-shapes-map-crash-xlsx-part for shared filter
 xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff, rodo
 
 [ OOXMLExport ]
-oox-pptx-export-animations-filter.diff, n#497570, rodo
-oox-pptx-export-animations-paragraph-target.diff, n#497570, rodo
-oox-pptx-export-blip-luminance.diff, n#497570, rodo
+# FIXME dev300-m77 oox-pptx-export-animations-filter.diff, n#497570, rodo
+# FIXME dev300-m77 oox-pptx-export-animations-paragraph-target.diff, n#497570, rodo
+# FIXME dev300-m77 oox-pptx-export-blip-luminance.diff, n#497570, rodo
 
 
 [ Experimental ]
@@ -3331,7 +3331,7 @@ system.mysqlcpp.diff, cmc
 gnome-screen-saver.diff, i#106372, cmc
 
 [ OOXMLExport ]
-oox-pptx-export-update-to-ooo320.diff, rodo
+# FIXME dev300-m77 oox-pptx-export-update-to-ooo320.diff, rodo
 # FIXME dev300-m77 docx-fixes02.diff, n#581604, cbosdo
 
 [ OOXMLExport321 and not OOXMLExportDevel ]
diff --git a/patches/dev300/oox-build-fix-dev300-m77.diff b/patches/dev300/oox-build-fix-dev300-m77.diff
index bb54930..5327006 100644
--- a/patches/dev300/oox-build-fix-dev300-m77.diff
+++ b/patches/dev300/oox-build-fix-dev300-m77.diff
@@ -71,7 +71,7 @@ index c44f5d0..0f71789 100644
 +#include <editeng/svxenum.hxx>
  
  using namespace ::com::sun::star;
- using namespace ::com::sun::star::beans;
+ using namespace ::com::sun::star::uno;
 @@ -520,7 +520,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
              }
  
@@ -156,3 +156,13 @@ index 33c53d1..977b3b9 100644
          $(TOOLSLIB)
  
  # link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk
+diff --git oox/prj/build.lst oox/prj/build.lst
+index 89bf77d..48e33b6 100644
+--- oox/prj/build.lst
++++ oox/prj/build.lst
+@@ -1,4 +1,4 @@
+-oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx svx tools vcl unotools BOOST:boost OPENSSL:openssl NULL
++oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx svx tools vcl filter unotools BOOST:boost OPENSSL:openssl NULL
+ oox	oox				usr1	-   all	oox_mkout NULL
+ oox	oox\prj				get	-   all	oox_prj NULL
+ oox	oox\source\token		nmake	-   all	oox_token NULL
diff --git a/patches/dev300/pptx-filter-as-a-separate-lib.diff b/patches/dev300/pptx-filter-as-a-separate-lib.diff
index 593b614..2a09313 100644
--- a/patches/dev300/pptx-filter-as-a-separate-lib.diff
+++ b/patches/dev300/pptx-filter-as-a-separate-lib.diff
@@ -117,7 +117,7 @@ index 0000000..e2bd962
 +#include <sot/storage.hxx>
 +#include <tools/gen.hxx>
 +#include <vcl/graph.hxx>
-+#include <vcl/fontcvt.hxx>
++#include <unotools/fontcvt.hxx>
 +#include <tools/string.hxx>
 +#include "pptexanimations.hxx"
 +#include <pptexsoundcollection.hxx>
@@ -164,7 +164,7 @@ index 0000000..e2bd962
 +#include <com/sun/star/container/XIndexContainer.hpp>
 +#include <com/sun/star/awt/XControlModel.hpp>
 +#include <com/sun/star/style/TabStop.hpp>
-+#include <svx/msocximex.hxx>
++#include <filter/msfilter/msocximex.hxx>
 +#include <com/sun/star/beans/XPropertySet.hpp>
 +#include <com/sun/star/beans/XPropertyState.hpp>
 +#include <com/sun/star/beans/XPropertySetInfo.hpp>
diff --git a/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff b/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
index 00b26c1..ad727a2 100644
--- a/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
+++ b/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
@@ -148,7 +148,7 @@ index e2bd962..80e745f 100644
  #include <sot/storage.hxx>
 -#include <tools/gen.hxx>
  #include <vcl/graph.hxx>
- #include <vcl/fontcvt.hxx>
+ #include <unotools/fontcvt.hxx>
 -#include <tools/string.hxx>
  #include "pptexanimations.hxx"
  #include <pptexsoundcollection.hxx>
@@ -177,7 +177,7 @@ index e2bd962..80e745f 100644
  #include <com/sun/star/container/XIndexContainer.hpp>
  #include <com/sun/star/awt/XControlModel.hpp>
  #include <com/sun/star/style/TabStop.hpp>
- #include <svx/msocximex.hxx>
+ #include <filter/msfilter/msocximex.hxx>
 -#include <com/sun/star/beans/XPropertySet.hpp>
  #include <com/sun/star/beans/XPropertyState.hpp>
  #include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -8686,7 +8686,7 @@ index 0000000..b450e33
 +#include <sfx2/app.hxx>
 +#include <editeng/svxenum.hxx>
 +#include <svx/frmdir.hxx>
-+#include <vcl/fontcvt.hxx>
++#include <unotools/fontcvt.hxx>
 +#include <vcl/metric.hxx>
 +#include <vcl/outdev.hxx>
 +#include <vcl/virdev.hxx>
diff --git a/patches/dev300/sd-ruler-fix.diff b/patches/dev300/sd-ruler-fix.diff
index 8cc32bf..c781640 100644
--- a/patches/dev300/sd-ruler-fix.diff
+++ b/patches/dev300/sd-ruler-fix.diff
@@ -31,7 +31,7 @@ index 9c357a4..7f75df4 100644
  #include <editeng/protitem.hxx>
  #include <editeng/frmdiritem.hxx>
  #include <svx/ruler.hxx>
-+#include <svx/numitem.hxx>
++#include <editeng/numitem.hxx>
  #ifndef _SVX_RULERITEM_HXX
  #include <svx/rulritem.hxx>
  #endif
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 7cb383b..c0d74c1 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
@@ -16941,7 +16941,7 @@ index 0000000..0dc50ba
 +#include <svx/svdoole2.hxx>
 +#include <svx/unoapi.hxx>
 +#include <svx/fmglob.hxx>
-+#include <svx/msocximex.hxx>
++#include <filter/msfilter/msocximex.hxx>
 +#include <vcl/outdev.hxx>
 +#include <unotools/tempfile.hxx>
 +#include <unotools/ucbstreamhelper.hxx>
@@ -49043,7 +49043,7 @@ index 0000000..2fc84ce
 +#include <algorithm>
 +#include <math.h>
 +#include <sal/mathconf.h>
-+#include <vcl/fontcvt.hxx>
++#include <unotools/fontcvt.hxx>
 +#include <sfx2/objsh.hxx>
 +#include <editeng/editstat.hxx>
 +#include "xestream.hxx"

More information about the ooo-build-commit mailing list