diff options
author | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-19 17:18:08 +0200 |
---|---|---|
committer | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-19 17:18:08 +0200 |
commit | 65b8a190dca67aee568798fe7ce24a4373cbaeb6 (patch) | |
tree | fdb2db8cfeaa5796a57ef33b17d7fe0249051982 | |
parent | 7e2a7b406f032b1ccf34dbeee9de7084612e8de6 (diff) |
Merged sd-pptx-export-build-fix-2.diff from ooo-build
-rw-r--r-- | sd/source/filter/pptx/pptx-eppt.cxx | 2 | ||||
-rwxr-xr-x | sd/util/makefile.mk | 1 | ||||
-rw-r--r-- | sd/util/pptx.map | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/filter/pptx/pptx-eppt.cxx b/sd/source/filter/pptx/pptx-eppt.cxx index 6976013e0df0..485e44f856b1 100644 --- a/sd/source/filter/pptx/pptx-eppt.cxx +++ b/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 a/sd/util/makefile.mk b/sd/util/makefile.mk index 4e335e2b4814..b24befb0e4f3 100755 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -283,6 +283,7 @@ SHL6STDLIBS = $(ISDLIB) \ $(SOTLIB) \ $(GOODIESLIB) \ $(VCLLIB) \ + $(MSFILTERLIB) \ $(SVLLIB) \ $(SOTLIB) \ $(UNOTOOLSLIB) \ diff --git a/sd/util/pptx.map b/sd/util/pptx.map index e72a8e38e2f7..f9d596074f4e 100644 --- a/sd/util/pptx.map +++ b/sd/util/pptx.map @@ -1,4 +1,4 @@ -PPTX_1_0 { +UDK_3_0_0 { global: component_getImplementationEnvironment; component_writeInfo; |