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

[Radek Doulík]

 patches/dev300/apply                           |    1 
 patches/dev300/sd-pptx-export-build-fix-2.diff |   32 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

New commits:
commit 43c4560249b269143f3fa343408d5f029364028c
Author: Radek Doulik <rodo at novell.com>
Date:   Tue May 25 21:48:05 2010 +0200

    fixed more issues in sd build
    
    * patches/dev300/apply:
    * patches/dev300/sd-pptx-export-build-fix-2.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index cc6012d..9e26928 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3764,3 +3764,4 @@ transogl-transitions-newsflash-pptin.diff
 oox-build-fix-dev300-m77.diff, kohei
 filter-fix-fcfgmerge.diff, rodo
 sd-pptx-export-build-fix.diff, rodo
+sd-pptx-export-build-fix-2.diff, rodo
diff --git a/patches/dev300/sd-pptx-export-build-fix-2.diff b/patches/dev300/sd-pptx-export-build-fix-2.diff
new file mode 100644
index 0000000..a2579c9
--- /dev/null
+++ b/patches/dev300/sd-pptx-export-build-fix-2.diff
@@ -0,0 +1,32 @@
+diff -rup sd-orig/source/filter/pptx/pptx-eppt.cxx sd/source/filter/pptx/pptx-eppt.cxx
+--- sd-orig/source/filter/pptx/pptx-eppt.cxx	2010-05-25 18:10:07.000000000 +0200
++++ sd/source/filter/pptx/pptx-eppt.cxx	2010-05-25 21:12:26.000000000 +0200
+@@ -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 -rup sd-orig/util/makefile.mk sd/util/makefile.mk
+--- sd-orig/util/makefile.mk	2010-05-25 17:38:01.000000000 +0200
++++ sd/util/makefile.mk	2010-05-25 21:45:48.000000000 +0200
+@@ -282,6 +282,7 @@ SHL6STDLIBS = $(ISDLIB) \
+               $(SOTLIB)           \
+               $(GOODIESLIB)       \
+               $(VCLLIB)           \
++              $(MSFILTERLIB)      \
+               $(SVLLIB)           \
+               $(SOTLIB)           \
+               $(UNOTOOLSLIB)      \
+diff -rup sd-orig/util/pptx.map sd/util/pptx.map
+--- sd-orig/util/pptx.map	2010-05-25 17:38:01.000000000 +0200
++++ sd/util/pptx.map	2010-05-25 21:41:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-PPTX_1_0 {
++UDK_3_0_0 {
+         global:
+                 component_getImplementationEnvironment;
+                 component_writeInfo;