Fixup pptx export after impress212 merges.

5 files changed, 17 insertions, 11 deletions

diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 26fcd2c3f015..d76fb5220ffc 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -74,7 +74,7 @@ using ::com::sun::star::beans::XPropertySet;
 
 //============================ PPTWriter ==================================
 
-PPTWriter::PPTWriter( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage,
+PPTWriter::PPTWriter( SvStorageRef& rSvStorage,
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel,
             ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd,
             SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) :
@@ -97,7 +97,7 @@ PPTWriter::PPTWriter( const std::vector< com::sun::star::beans::PropertyValue >&
 {
 }
 
-void PPTWriter::exportPPTPre()
+void PPTWriter::exportPPTPre( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData )
 {
     if ( !mrStg.Is() )
         return;
@@ -132,7 +132,6 @@ void PPTWriter::exportPPTPre()
     {
         if ( (*aIter).Name.equals( sBaseURI ) )
         {
-            rtl::OUString sBaseURI;
             (*aIter).Value >>= maBaseURI;
             break;
         }
@@ -1498,10 +1497,10 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI ExportPPT( const std::v
     PPTWriter*  pPPTWriter;
     sal_Bool bStatus = sal_False;
 
-    pPPTWriter = new PPTWriter( rMediaData, rSvStorage, rXModel, rXStatInd, pVBA, nCnvrtFlags );
+    pPPTWriter = new PPTWriter( rSvStorage, rXModel, rXStatInd, pVBA, nCnvrtFlags );
     if ( pPPTWriter )
     {
-        pPPTWriter->exportPPT();
+        pPPTWriter->exportPPT(rMediaData);
         bStatus = ( pPPTWriter->IsValid() == sal_True );
         delete pPPTWriter;
     }
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 6096276ea48e..96f19c418a2c 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -296,7 +296,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
 
         sal_Bool                IsValid() const { return mbStatus; };
 
-        virtual void        exportPPTPre();
+        virtual void        exportPPTPre( const std::vector< com::sun::star::beans::PropertyValue >& );
         virtual void        exportPPTPost( );
 };
 
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index f21db684d162..33a43d364fd7 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -378,7 +378,7 @@ protected:
     virtual void ImplWriteSlideMaster( sal_uInt32 /* nPageNum */, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > /* aXBackgroundPropSet */ ) {}
     virtual void ImplWriteLayout( sal_Int32 /* nOffset */, sal_uInt32 /* nMasterNum */ ) {}
 
-    virtual void exportPPTPre() {}
+    virtual void exportPPTPre( const std::vector< com::sun::star::beans::PropertyValue >& ) {}
     virtual void exportPPTPost() {}
 
     virtual sal_Bool ImplCreateDocument()=0;
@@ -402,7 +402,7 @@ public:
 
     virtual ~PPTWriterBase();
 
-    void exportPPT();
+    void exportPPT(const std::vector< com::sun::star::beans::PropertyValue >&);
 
     sal_Bool InitSOIface();
     sal_Bool GetPageByIndex( sal_uInt32 nIndex, PageType );
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index c310a5a34566..2191cbdd89c0 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -176,7 +176,7 @@ PPTWriterBase::~PPTWriterBase()
 
 // ---------------------------------------------------------------------------------------------
 
-void PPTWriterBase::exportPPT()
+void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData )
 {
     if ( !InitSOIface() )
         return;
@@ -211,7 +211,7 @@ void PPTWriterBase::exportPPT()
     maDestPageSize = MapSize( awt::Size( nWidth, nHeight ) );
 
     DBG(printf( "call exportDocumentPre()\n"));
-    exportPPTPre();
+    exportPPTPre(rMediaData);
 
     if ( !GetStyleSheets() )
         return;
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index b88fcc9f7b3a..b0624b400ed9 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -357,7 +357,14 @@ bool PowerPointExport::exportDocument() throw()
     mXModel.set( getModel(), UNO_QUERY );
     mXStatusIndicator.set( getStatusIndicator(), UNO_QUERY );
 
-    exportPPT();
+    rtl::OUString sBaseURI( RTL_CONSTASCII_USTRINGPARAM("BaseURI") );
+    std::vector< PropertyValue > aProperties;
+    PropertyValue aProperty;
+    aProperty.Name = sBaseURI;
+    aProperty.Value = makeAny( getFileUrl() );
+    aProperties.push_back( aProperty );
+
+    exportPPT(aProperties);
 
     mPresentationFS->singleElementNS( XML_p, XML_sldSz,
                                       XML_cx, IS( PPTtoEMU( maDestPageSize.Width ) ),