[ooo-build-commit] .: 4 commits - patches/dev300
Radek DoulÃk
rodo at kemper.freedesktop.org
Tue May 25 08:03:37 PDT 2010
patches/dev300/apply | 36 +++----
patches/dev300/oox-build-fix-dev300-m77.diff | 88 ++++++++-----------
patches/dev300/oox-pptx-export-para-linespacing.diff | 35 ++-----
3 files changed, 67 insertions(+), 92 deletions(-)
New commits:
commit cc5910cbf6edcd0fcfb516b2d926978a386b2b62
Author: Radek Doulik <rodo at novell.com>
Date: Tue May 25 17:03:00 2010 +0200
enabled pptx patches again, they apply and build now
* patches/dev300/apply:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 94540fe..626903a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3015,32 +3015,32 @@ mail-document-subject.diff, n#459176
# Enable the DOCX export (and few related features in oox)
docx-export-enable.diff, jholesov
-# FIXME dev300-m77 pptx-filter-as-a-separate-lib.diff
+pptx-filter-as-a-separate-lib.diff
[ OOXMLExport and not OpenGLTransitions ]
-# FIXME dev300-m77 pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
+pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
[ OOXMLExport and OpenGLTransitions ]
-# FIXME dev300-m77 pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
+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)
-# FIXME dev300-m77 pptx-snapshot-at-ooxml03-creation.diff
+pptx-snapshot-at-ooxml03-creation.diff
# ...and the rest from the git tree
# (until 'more qnimations export work', including)
-# FIXME dev300-m77 pptx-the-rest-from-git.diff
-# FIXME dev300-m77 pptx-export-empty-animations-node-and-groupshape-fix.diff, rodo
+pptx-the-rest-from-git.diff
+pptx-export-empty-animations-node-and-groupshape-fix.diff, rodo
# ugly temp fix to make GraphicShapeContext recognise layout
-# FIXME dev300-m77 pptx-gfx-layout-fix.diff, thorsten
+pptx-gfx-layout-fix.diff, thorsten
# handles case where a connector shape is not connected
-# FIXME dev300-m77 pptx-fix-connector-crash.diff, n#499129, thorsten
+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
@@ -3131,7 +3131,7 @@ odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
xlsx-shared-oox-smartart-import-m13.diff
[ OOXML ]
-# FIXME dev300-m77 oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
+oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
[ Fixes ]
external-apm-header.diff, freuter
@@ -3183,20 +3183,20 @@ oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
fit-list-to-size-ooxml.diff, i#94086, thorsten
[ OOXMLExport ]
-# 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
+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
[ 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 ]
-# 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
+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
[ Experimental ]
@@ -3345,7 +3345,7 @@ system.mysqlcpp.diff, cmc
gnome-screen-saver.diff, i#106372, cmc
[ OOXMLExport ]
-# FIXME dev300-m77 oox-pptx-export-update-to-ooo320.diff, rodo
+oox-pptx-export-update-to-ooo320.diff, rodo
# FIXME dev300-m77 docx-fixes02.diff, n#581604, cbosdo
[ OOXMLExport321 and not OOXMLExportDevel ]
commit 830e4dc2324edadc6a303f0221ca9415d1b2a347
Author: Radek Doulik <rodo at novell.com>
Date: Tue May 25 16:58:16 2010 +0200
updated patch to make it apply
* patches/dev300/oox-build-fix-dev300-m77.diff:
diff --git a/patches/dev300/oox-build-fix-dev300-m77.diff b/patches/dev300/oox-build-fix-dev300-m77.diff
index 5327006..a2284f5 100644
--- a/patches/dev300/oox-build-fix-dev300-m77.diff
+++ b/patches/dev300/oox-build-fix-dev300-m77.diff
@@ -1,7 +1,6 @@
-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
+diff -rup oox-orig/inc/oox/drawingml/customshapeproperties.hxx oox/inc/oox/drawingml/customshapeproperties.hxx
+--- oox-orig/inc/oox/drawingml/customshapeproperties.hxx 2010-05-25 16:55:39.000000000 +0200
++++ oox/inc/oox/drawingml/customshapeproperties.hxx 2010-05-25 16:56:11.000000000 +0200
@@ -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;
@@ -10,10 +9,9 @@ index 4bd9381..387c072 100644
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
+diff -rup oox-orig/inc/oox/drawingml/shape.hxx oox/inc/oox/drawingml/shape.hxx
+--- oox-orig/inc/oox/drawingml/shape.hxx 2010-05-25 16:55:39.000000000 +0200
++++ oox/inc/oox/drawingml/shape.hxx 2010-05-25 16:56:11.000000000 +0200
@@ -160,6 +160,11 @@ public:
virtual void applyShapeReference( const Shape& rReferencedShape );
@@ -26,10 +24,9 @@ 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
+diff -rup oox-orig/inc/oox/export/drawingml.hxx oox/inc/oox/export/drawingml.hxx
+--- oox-orig/inc/oox/export/drawingml.hxx 2010-05-25 16:55:39.000000000 +0200
++++ oox/inc/oox/export/drawingml.hxx 2010-05-25 16:56:11.000000000 +0200
@@ -7,7 +7,7 @@
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/uno/XReference.hpp>
@@ -39,10 +36,9 @@ index 211c90e..10397a5 100644
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
+diff -rup oox-orig/inc/oox/export/vmlexport.hxx oox/inc/oox/export/vmlexport.hxx
+--- oox-orig/inc/oox/export/vmlexport.hxx 2010-05-25 16:55:39.000000000 +0200
++++ oox/inc/oox/export/vmlexport.hxx 2010-05-25 16:56:11.000000000 +0200
@@ -27,7 +27,7 @@
#include <oox/dllapi.h>
@@ -52,10 +48,18 @@ index b749297..cde0224 100644
namespace rtl {
class OString;
-diff --git oox/source/export/drawingml.cxx oox/source/export/drawingml.cxx
-index c44f5d0..0f71789 100644
---- oox/source/export/drawingml.cxx
-+++ oox/source/export/drawingml.cxx
+diff -rup oox-orig/prj/build.lst oox/prj/build.lst
+--- oox-orig/prj/build.lst 2010-05-25 16:55:39.000000000 +0200
++++ oox/prj/build.lst 2010-05-25 16:56:11.000000000 +0200
+@@ -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 -rup oox-orig/source/export/drawingml.cxx oox/source/export/drawingml.cxx
+--- oox-orig/source/export/drawingml.cxx 2010-05-25 16:55:39.000000000 +0200
++++ oox/source/export/drawingml.cxx 2010-05-25 16:56:50.000000000 +0200
@@ -65,13 +65,13 @@
#include <tools/string.hxx>
#include <vcl/cvtgrf.hxx>
@@ -71,8 +75,8 @@ index c44f5d0..0f71789 100644
+#include <editeng/svxenum.hxx>
using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
-@@ -520,7 +520,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
+ using namespace ::com::sun::star::beans;
+@@ -520,7 +520,7 @@ OUString DrawingML::WriteImage( const Gr
}
aData = aStream.GetData();
@@ -81,10 +85,9 @@ index c44f5d0..0f71789 100644
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
+diff -rup oox-orig/source/export/preset-definitions-to-shape-types.pl oox/source/export/preset-definitions-to-shape-types.pl
+--- oox-orig/source/export/preset-definitions-to-shape-types.pl 2010-05-25 16:55:39.000000000 +0200
++++ oox/source/export/preset-definitions-to-shape-types.pl 2010-05-25 16:56:11.000000000 +0200
@@ -1204,7 +1204,7 @@ print <<EOF;
// '$src_text'
// which are part of the OOXML documentation
@@ -94,10 +97,9 @@ 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
+diff -rup oox-orig/source/export/shapes.cxx oox/source/export/shapes.cxx
+--- oox-orig/source/export/shapes.cxx 2010-05-25 16:55:39.000000000 +0200
++++ oox/source/export/shapes.cxx 2010-05-25 16:56:11.000000000 +0200
@@ -66,9 +66,9 @@
#include <rtl/strbuf.hxx>
#include <sfx2/app.hxx>
@@ -110,10 +112,9 @@ index 71d3f9c..fee5abc 100644
#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
-+++ oox/source/export/vmlexport.cxx
+diff -rup oox-orig/source/export/vmlexport.cxx oox/source/export/vmlexport.cxx
+--- oox-orig/source/export/vmlexport.cxx 2010-05-25 16:55:39.000000000 +0200
++++ oox/source/export/vmlexport.cxx 2010-05-25 16:56:11.000000000 +0200
@@ -64,7 +64,7 @@ public:
};
@@ -133,7 +134,7 @@ index 6da08a2..1223519 100644
UINT32 nShapeId = GetShapeID();
OStringBuffer aStyle( 200 );
-@@ -163,6 +166,7 @@ UINT32 VMLExport::EnterGroup( const String& rShapeName, const Rectangle* pRect )
+@@ -163,6 +166,7 @@ UINT32 VMLExport::EnterGroup( const Stri
mnGroupLevel++;
return nShapeId;
@@ -141,10 +142,9 @@ index 6da08a2..1223519 100644
}
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
+diff -rup oox-orig/util/makefile.mk oox/util/makefile.mk
+--- oox-orig/util/makefile.mk 2010-05-25 16:55:39.000000000 +0200
++++ oox/util/makefile.mk 2010-05-25 16:56:11.000000000 +0200
@@ -74,7 +74,9 @@ SHL1STDLIBS= \
$(GOODIESLIB) \
$(SVTOOLLIB) \
@@ -156,13 +156,3 @@ 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
commit 3c694d46eaf4dc23d199d7dca9ab86f127eb1087
Author: Radek Doulik <rodo at novell.com>
Date: Tue May 25 16:48:40 2010 +0200
updated for m77 again
* patches/dev300/oox-pptx-export-para-linespacing.diff:
diff --git a/patches/dev300/oox-pptx-export-para-linespacing.diff b/patches/dev300/oox-pptx-export-para-linespacing.diff
index c9d60f9..6ee6b06 100644
--- a/patches/dev300/oox-pptx-export-para-linespacing.diff
+++ b/patches/dev300/oox-pptx-export-para-linespacing.diff
@@ -1,6 +1,6 @@
-diff -rup oox-orig/inc/oox/export/drawingml.hxx oox/inc/oox/export/drawingml.hxx
---- oox-orig/inc/oox/export/drawingml.hxx 2010-05-25 15:23:02.000000000 +0200
-+++ oox/inc/oox/export/drawingml.hxx 2010-05-25 15:24:30.000000000 +0200
+diff -rup oox-orig-1/inc/oox/export/drawingml.hxx oox/inc/oox/export/drawingml.hxx
+--- oox-orig-1/inc/oox/export/drawingml.hxx 2010-05-25 16:44:38.000000000 +0200
++++ oox/inc/oox/export/drawingml.hxx 2010-05-25 16:44:50.000000000 +0200
@@ -20,6 +20,9 @@ namespace beans {
namespace drawing {
class XShape;
@@ -19,9 +19,9 @@ diff -rup oox-orig/inc/oox/export/drawingml.hxx oox/inc/oox/export/drawingml.hxx
::rtl::OUString WriteBlip( ::rtl::OUString& rURL );
void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
-diff -rup oox-orig/source/export/drawingml.cxx oox/source/export/drawingml.cxx
---- oox-orig/source/export/drawingml.cxx 2010-05-25 15:23:02.000000000 +0200
-+++ oox/source/export/drawingml.cxx 2010-05-25 15:25:36.000000000 +0200
+diff -rup oox-orig-1/source/export/drawingml.cxx oox/source/export/drawingml.cxx
+--- oox-orig-1/source/export/drawingml.cxx 2010-05-25 16:44:37.000000000 +0200
++++ oox/source/export/drawingml.cxx 2010-05-25 16:46:29.000000000 +0200
@@ -39,6 +39,8 @@
#include <com/sun/star/awt/Gradient.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -41,7 +41,7 @@ diff -rup oox-orig/source/export/drawingml.cxx oox/source/export/drawingml.cxx
#include <com/sun/star/text/WritingMode.hpp>
#include <com/sun/star/text/XText.hpp>
@@ -70,10 +74,12 @@
- #include <editeng/svxenum.hxx>
+ #include <svx/svxenum.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
commit 1a0be69e38c569074103be89912042e9d29a62ed
Author: Radek Doulik <rodo at novell.com>
Date: Tue May 25 15:28:44 2010 +0200
updated patch for m77
* patches/dev300/oox-pptx-export-para-linespacing.diff:
diff --git a/patches/dev300/oox-pptx-export-para-linespacing.diff b/patches/dev300/oox-pptx-export-para-linespacing.diff
index 07835bd..c9d60f9 100644
--- a/patches/dev300/oox-pptx-export-para-linespacing.diff
+++ b/patches/dev300/oox-pptx-export-para-linespacing.diff
@@ -1,17 +1,6 @@
-From 6e3f49d01b5c39128feb0dbc3ebdec83ef916ab5 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:06:36 +0200
-Subject: [PATCH 634/768] oox-pptx-export-para-linespacing.diff
-
----
- oox/inc/oox/export/drawingml.hxx | 4 ++
- oox/source/export/drawingml.cxx | 81 ++++++++++++++++++++++++++++++++++++--
- 2 files changed, 81 insertions(+), 4 deletions(-)
-
-diff --git oox/inc/oox/export/drawingml.hxx oox/inc/oox/export/drawingml.hxx
-index b9ebc0b..f085df8 100644
---- oox/inc/oox/export/drawingml.hxx
-+++ oox/inc/oox/export/drawingml.hxx
+diff -rup oox-orig/inc/oox/export/drawingml.hxx oox/inc/oox/export/drawingml.hxx
+--- oox-orig/inc/oox/export/drawingml.hxx 2010-05-25 15:23:02.000000000 +0200
++++ oox/inc/oox/export/drawingml.hxx 2010-05-25 15:24:30.000000000 +0200
@@ -20,6 +20,9 @@ namespace beans {
namespace drawing {
class XShape;
@@ -30,10 +19,9 @@ index b9ebc0b..f085df8 100644
::rtl::OUString WriteBlip( ::rtl::OUString& rURL );
void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
-diff --git oox/source/export/drawingml.cxx oox/source/export/drawingml.cxx
-index 752ead6..ebc5344 100644
---- oox/source/export/drawingml.cxx
-+++ oox/source/export/drawingml.cxx
+diff -rup oox-orig/source/export/drawingml.cxx oox/source/export/drawingml.cxx
+--- oox-orig/source/export/drawingml.cxx 2010-05-25 15:23:02.000000000 +0200
++++ oox/source/export/drawingml.cxx 2010-05-25 15:25:36.000000000 +0200
@@ -39,6 +39,8 @@
#include <com/sun/star/awt/Gradient.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -53,7 +41,7 @@ index 752ead6..ebc5344 100644
#include <com/sun/star/text/WritingMode.hpp>
#include <com/sun/star/text/XText.hpp>
@@ -70,10 +74,12 @@
- #include <svx/svxenum.hxx>
+ #include <editeng/svxenum.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
@@ -61,13 +49,13 @@ index 752ead6..ebc5344 100644
using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::text;
using namespace ::com::sun::star::i18n;
-+using namespace ::com::sun::star::style;
+using namespace ::com::sun::star::text;
++using namespace ::com::sun::star::style;
+using namespace ::com::sun::star::uno;
using ::com::sun::star::beans::PropertyState;
using ::com::sun::star::beans::PropertyValue;
using ::com::sun::star::beans::XPropertySet;
-@@ -82,6 +88,7 @@ using ::com::sun::star::container::XEnumeration;
+@@ -82,6 +88,7 @@ using ::com::sun::star::container::XEnum
using ::com::sun::star::container::XEnumerationAccess;
using ::com::sun::star::container::XIndexAccess;
using ::com::sun::star::io::XOutputStream;
@@ -120,7 +108,7 @@ index 752ead6..ebc5344 100644
// not thread safe
int DrawingML::mnImageCounter = 1;
-@@ -1083,14 +1128,30 @@ const char* DrawingML::GetAlignment( sal_Int32 nAlignment )
+@@ -1083,14 +1128,30 @@ const char* DrawingML::GetAlignment( sal
return sAlignment;
}
@@ -151,7 +139,7 @@ index 752ead6..ebc5344 100644
sal_Int16 nLevel = -1;
GET( nLevel, NumberingLevel );
-@@ -1101,15 +1162,27 @@ void DrawingML::WriteParagraphProperties( Reference< XTextContent > rParagraph )
+@@ -1101,15 +1162,27 @@ void DrawingML::WriteParagraphProperties
sal_Int16 nAlignment( style::ParagraphAdjust_LEFT );
GET( nAlignment, ParaAdjust );
@@ -181,6 +169,3 @@ index 752ead6..ebc5344 100644
WriteParagraphNumbering( rXPropSet, nLevel );
mpFS->endElementNS( XML_a, XML_pPr );
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list