[Libreoffice-commits] .: Branch 'feature/pptx-export-ooxml11' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                           |    3 -
 patches/dev300/sd-pptx-export-build-fix-2.diff |   44 -------------------------
 2 files changed, 47 deletions(-)

New commits:
commit 1efd863eabc2b33293cba5701c8ba357c17c96c7
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Nov 8 14:32:58 2010 +0200

    sd-pptx-export-build-fix-2.diff is in git
    
    Here in the feature/pptx-export-ooxml11 branch

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1c18859..23b85e4 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2334,9 +2334,6 @@ sled10-splash.diff, i#123456, pmladek
 [ Fixes ]
 svx-ppt-bullet-offset-fix.diff, n#593609, rodo
 
-[ OOXMLExport ]
-sd-pptx-export-build-fix-2.diff, rodo
-
 [ Fixes ]
 svx-fix-layout-build.diff, rodo
 sfx2-style-edit-greyentry.diff, i#85003, simonaw
diff --git a/patches/dev300/sd-pptx-export-build-fix-2.diff b/patches/dev300/sd-pptx-export-build-fix-2.diff
deleted file mode 100644
index 57e687e..0000000
--- a/patches/dev300/sd-pptx-export-build-fix-2.diff
+++ /dev/null
@@ -1,44 +0,0 @@
----
- sd/source/filter/pptx/pptx-eppt.cxx |    2 +-
- sd/util/makefile.mk                 |    1 +
- sd/util/pptx.map                    |    2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git sd/source/filter/pptx/pptx-eppt.cxx sd/source/filter/pptx/pptx-eppt.cxx
-index 2ea5d57..061db2c 100644
---- sd/source/filter/pptx/pptx-eppt.cxx
-+++ sd/source/filter/pptx/pptx-eppt.cxx
-@@ -121,7 +121,7 @@ void PPTWriter::exportPPTPre()
-     if ( !mpPicStrm )
-         mpPicStrm = mrStg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Pictures" ) ) );
- 
--    mpPptEscherEx = new PptEscherEx( *mpStrm, mnDrawings );
-+    mpPptEscherEx = new PptEscherEx( *mpStrm );
- };
- 
- void PPTWriter::exportPPTPost()
-diff --git sd/util/makefile.mk sd/util/makefile.mk
-index 4483706..ed1396a 100755
---- sd/util/makefile.mk
-+++ sd/util/makefile.mk
-@@ -283,6 +283,7 @@ SHL6STDLIBS = $(ISDLIB) \
-               $(SOTLIB)           \
-               $(GOODIESLIB)       \
-               $(VCLLIB)           \
-+              $(MSFILTERLIB)      \
-               $(SVLLIB)           \
-               $(SOTLIB)           \
-               $(UNOTOOLSLIB)      \
-diff --git sd/util/pptx.map sd/util/pptx.map
-index e72a8e3..f9d5960 100644
---- sd/util/pptx.map
-+++ sd/util/pptx.map
-@@ -1,4 +1,4 @@
--PPTX_1_0 {
-+UDK_3_0_0 {
-         global:
-                 component_getImplementationEnvironment;
-                 component_writeInfo;
--- 
-1.7.0.1
-