3 files changed, 19 insertions, 17 deletions
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index ccc807093108..dcc051cc5e05 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#include <com/sun/star/drawing/GraphicExportFilter.hpp>
 #include <com/sun/star/presentation/XPresentationPage.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/document/XFilter.hpp>
@@ -57,8 +58,8 @@ using com::sun::star::task::XStatusIndicator;
 
 // -----------------------------------------------------------------------------
 
-PlaceWareExporter::PlaceWareExporter(const Reference< XMultiServiceFactory > &rxMSF)
-:   mxMSF( rxMSF )
+PlaceWareExporter::PlaceWareExporter(const Reference< XComponentContext > & rxContext)
+:   mxContext( rxContext )
 {
 }
 
@@ -290,7 +291,8 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
 {
     sal_Bool bRet = sal_False;
 
-    mxGraphicExporter = Reference< XExporter >::query( mxMSF->createInstance( OUString("com.sun.star.drawing.GraphicExportFilter") ) );
+    mxGraphicExporter = GraphicExportFilter::create( mxContext );
+
     Reference< XDrawPagesSupplier > xDrawPagesSupplier(xDoc, UNO_QUERY);
     if(!xDrawPagesSupplier.is())
         return sal_False;
@@ -482,7 +484,6 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage )
     }
 
     // create the gif
-    Reference< XFilter > xFilter( mxGraphicExporter, UNO_QUERY );
 
     Sequence< PropertyValue > aFilterData( 2 );
     aFilterData[0].Name = OUString("Width");
@@ -498,7 +499,7 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage )
     aDescriptor[2].Name = OUString("FilterData");
     aDescriptor[2].Value <<= aFilterData;
     mxGraphicExporter->setSourceDocument( xComp );
-    xFilter->filter( aDescriptor );
+    mxGraphicExporter->filter( aDescriptor );
 
     return pEntry;
 }
diff --git a/filter/source/placeware/exporter.hxx b/filter/source/placeware/exporter.hxx
index 67cb8ca03054..d9405f6d9e6a 100644
--- a/filter/source/placeware/exporter.hxx
+++ b/filter/source/placeware/exporter.hxx
@@ -19,20 +19,20 @@
 #ifndef _PLACEWARE_EXPORTER_HXX
 #define _PLACEWARE_EXPORTER_HXX
 
+#include <com/sun/star/drawing/XDrawPage.hpp>
+#include <com/sun/star/drawing/XGraphicExportFilter.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 class PageEntry;
 
 class PlaceWareExporter
 {
 public:
-    PlaceWareExporter( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+    PlaceWareExporter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
     ~PlaceWareExporter();
 
     sal_Bool doExport( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc,
@@ -44,8 +44,8 @@ public:
 private:
     PageEntry* exportPage( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >&xDrawPage );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
-    ::com::sun::star::uno::Reference< ::com::sun::star::document::XExporter > mxGraphicExporter;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XGraphicExportFilter > mxGraphicExporter;
     ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > mxInteractionHandler;
 };
 
diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx
index 6ad7e8733d6c..7e860b481830 100644
--- a/filter/source/placeware/filter.cxx
+++ b/filter/source/placeware/filter.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase4.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include "exporter.hxx"
 
@@ -47,10 +48,10 @@ class PlaceWareExportFilter : public cppu::WeakImplHelper4
 >
 {
     Reference< XComponent > mxDoc;
-    Reference< XMultiServiceFactory > mxMSF;
+    Reference< XComponentContext > mxContext;
 
 public:
-    PlaceWareExportFilter( const Reference< XMultiServiceFactory > &rxMSF);
+    PlaceWareExportFilter( const Reference< XComponentContext > &rxContext);
 
     // XFilter
     virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException);
@@ -70,8 +71,8 @@ public:
 
 // -----------------------------------------------------------------------------
 
-PlaceWareExportFilter::PlaceWareExportFilter(const Reference< XMultiServiceFactory > &rxMSF)
-:   mxMSF( rxMSF )
+PlaceWareExportFilter::PlaceWareExportFilter(const Reference< XComponentContext > &rxContext)
+:   mxContext( rxContext )
 {
 }
 
@@ -111,7 +112,7 @@ sal_Bool SAL_CALL PlaceWareExportFilter::filter( const ::com::sun::star::uno::Se
         return sal_False;
     }
 
-    PlaceWareExporter aExporter( mxMSF );
+    PlaceWareExporter aExporter( mxContext );
     return aExporter.doExport( mxDoc, xOutputStream, sURL, xInteractionHandler, xStatusIndicator );
 }
 
@@ -174,7 +175,7 @@ Sequence< OUString > SAL_CALL PlaceWareExportFilter_getSupportedServiceNames(  )
 Reference< XInterface > SAL_CALL PlaceWareExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
     throw( Exception )
 {
-    return (cppu::OWeakObject*) new PlaceWareExportFilter( rSMgr );
+    return (cppu::OWeakObject*) new PlaceWareExportFilter( comphelper::getComponentContext(rSMgr) );
 }
 
 // -----------------------------------------------------------------------------