fdo#46808, convert drawing::GraphicExportFilter to new style

Change-Id: Icd456209406ee8f4dc4ea1f966058f71dce08d58

4 files changed, 24 insertions, 25 deletions

diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index e17dfb8bdf1d..4f81901dd511 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Any.h>
 #include <unotools/syslocale.hxx>
+#include <comphelper/processfactory.hxx>
 #include "vcl/svapp.hxx"
 
 using namespace ::rtl;
@@ -47,7 +48,7 @@ uno::Reference< uno::XInterface >
     SAL_CALL SvFilterOptionsDialog_CreateInstance(
         const uno::Reference< lang::XMultiServiceFactory > & _rxFactory )
 {
-    return static_cast< ::cppu::OWeakObject* > ( new SvFilterOptionsDialog( _rxFactory ) );
+    return static_cast< ::cppu::OWeakObject* > ( new SvFilterOptionsDialog( comphelper::getComponentContext(_rxFactory) ) );
 }
 
 OUString SvFilterOptionsDialog_getImplementationName()
@@ -74,8 +75,8 @@ uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog_getSupportedServiceName
 
 // -----------------------------------------------------------------------------
 
-SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< lang::XMultiServiceFactory > xMgr ) :
-    mxMgr               ( xMgr ),
+SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< uno::XComponentContext >& rxContext ) :
+    mxContext           ( rxContext ),
     meFieldUnit         ( FUNIT_CM ),
     mbExportSelection   ( sal_False )
 {
@@ -214,7 +215,7 @@ sal_Int16 SvFilterOptionsDialog::execute()
 
             aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat );
             sal_Bool bIsPixelFormat( aGraphicFilter.IsExportPixelFormat( nFormat ) );
-            if ( ExportDialog( aFltCallDlgPara, mxMgr, mxSourceDocument, mbExportSelection, bIsPixelFormat ).Execute() == RET_OK )
+            if ( ExportDialog( aFltCallDlgPara, mxContext, mxSourceDocument, mbExportSelection, bIsPixelFormat ).Execute() == RET_OK )
                 nRet = ui::dialogs::ExecutableDialogResults::OK;
 
             delete pResMgr;
diff --git a/svtools/source/filter/SvFilterOptionsDialog.hxx b/svtools/source/filter/SvFilterOptionsDialog.hxx
index 918d0a94597c..3bbc3cff35b0 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.hxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.hxx
@@ -22,12 +22,13 @@
 
 #include <tools/fldunit.hxx>
 #include <cppuhelper/implbase5.hxx>
+#include <com/sun/star/beans/XPropertyAccess.hpp>
+#include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/document/XExporter.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 class SvFilterOptionsDialog : public cppu::WeakImplHelper5
 <
@@ -38,8 +39,8 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper5
     com::sun::star::lang::XServiceInfo
 >
 {
-    const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-        mxMgr;
+    const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+        mxContext;
     com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
         maMediaDescriptor;
     com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
@@ -53,7 +54,7 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper5
 
 public:
 
-    SvFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB );
+    SvFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB );
     ~SvFilterOptionsDialog();
 
     // XInterface
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 384057d10e7b..b7c30adcc100 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -27,17 +27,15 @@
 #include <vcl/FilterConfigItem.hxx>
 #include <svtools/svtools.hrc>
 #include <svtools/svtresid.hxx>
-#include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/drawing/GraphicExportFilter.hpp>
+#include <com/sun/star/drawing/XDrawView.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/drawing/XDrawView.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/graphic/PrimitiveFactory2D.hpp>
 #include <com/sun/star/geometry/AffineMatrix2D.hpp>
-#include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/document/XFilter.hpp>
+#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <unotools/streamwrap.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
@@ -358,7 +356,7 @@ awt::Size ExportDialog::GetOriginalSize()
     }
     else
     {
-        uno::Reference< graphic::XPrimitiveFactory2D > xPrimitiveFactory = graphic::PrimitiveFactory2D::create( comphelper::getComponentContext(mxMgr) );
+        uno::Reference< graphic::XPrimitiveFactory2D > xPrimitiveFactory = graphic::PrimitiveFactory2D::create( mxContext );
 
         basegfx::B2DHomMatrix aViewTransformation( Application::GetDefaultDevice()->GetViewTransformation() );
         com::sun::star::geometry::AffineMatrix2D aTransformation;
@@ -457,9 +455,8 @@ sal_Bool ExportDialog::GetGraphicStream()
             uno::Reference < io::XStream > xStream( new utl::OStreamWrapper( *mpTempStream ) );
             uno::Reference < io::XOutputStream > xOutputStream( xStream->getOutputStream() );
 
-            uno::Reference< document::XExporter > xGraphicExporter(
-                mxMgr->createInstance(OUString("com.sun.star.drawing.GraphicExportFilter")), uno::UNO_QUERY_THROW);
-            uno::Reference< document::XFilter > xFilter( xGraphicExporter, uno::UNO_QUERY_THROW );
+            uno::Reference< drawing::XGraphicExportFilter > xGraphicExporter =
+                drawing::GraphicExportFilter::create( mxContext );
 
             sal_Int32 nProperties = 2;
             uno::Sequence< beans::PropertyValue > aFilterData( nProperties );
@@ -484,7 +481,7 @@ sal_Bool ExportDialog::GetGraphicStream()
             if ( xSourceDoc.is() )
             {
                 xGraphicExporter->setSourceDocument( xSourceDoc );
-                xFilter->filter( aDescriptor );
+                xGraphicExporter->filter( aDescriptor );
                 bRet = sal_True;
 
                 if ( mnFormat == FORMAT_JPG )
@@ -561,12 +558,12 @@ sal_Bool ExportDialog::IsTempExportAvailable() const
 }
 
 ExportDialog::ExportDialog(FltCallDialogParameter& rPara,
-    const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > rxMgr,
+    const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
     const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxSourceDocument,
     sal_Bool bExportSelection, sal_Bool bIsPixelFormat)
     : ModalDialog(rPara.pWindow, "GraphicExportDialog", "svt/ui/graphicexport.ui")
     , mrFltCallPara(rPara)
-    , mxMgr(rxMgr)
+    , mxContext(rxContext)
     , mxSourceDocument(rxSourceDocument)
     , mpSbCompression(NULL)
     , mpNfCompression(NULL)
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index fd33a9dfaa77..389a72542ade 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -48,8 +48,8 @@ private:
 
     FltCallDialogParameter& mrFltCallPara;
 
-    const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-        mxMgr;
+    const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+        mxContext;
     const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&
         mxSourceDocument;
 
@@ -175,7 +175,7 @@ private:
 
 public:
                         ExportDialog( FltCallDialogParameter& rPara,
-                            const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > rxMgr,
+                            const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
                                 const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxSourceDocument,
                                     sal_Bool bExportSelection, sal_Bool bIsExportVectorFormat );
                         ~ExportDialog();