diff options
| author | Noel Grandin <noel@peralex.com> | 2013-03-19 15:46:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-03-20 07:32:52 +0200 |
| commit | c09c64ede6a395ad4cc5a263e88d5e180b890127 (patch) | |
| tree | 2ddcf5b0e6a7ad8e53579237b2fa5d52b5cf16a7 /filter/source/svg/svgexport.cxx | |
| parent | 23a16f5d3856d6eb61d599af9e47add4c456bfb2 (diff) | |
fdo#46808, convert drawing::GraphicExportFilter to new style
Change-Id: Icd456209406ee8f4dc4ea1f966058f71dce08d58
Diffstat (limited to 'filter/source/svg/svgexport.cxx')
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index e1fea4f4d183..fdf12a736dae 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -23,8 +23,9 @@ #include "svgscript.hxx" #include "impsvgdialog.hxx" -#include <com/sun/star/util/MeasureUnit.hpp> +#include <com/sun/star/drawing/GraphicExportFilter.hpp> #include <com/sun/star/text/textfield/Type.hpp> +#include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <rtl/bootstrap.hxx> @@ -2001,33 +2002,29 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r sal_Bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& rxDrawPage ) { - Reference< XExporter > xExporter( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.drawing.GraphicExportFilter", mxContext ), UNO_QUERY ); + Reference< XGraphicExportFilter > xExporter = drawing::GraphicExportFilter::create( mxContext ); sal_Bool bRet = sal_False; - if( xExporter.is() ) - { - GDIMetaFile aMtf; - Reference< XFilter > xFilter( xExporter, UNO_QUERY ); + GDIMetaFile aMtf; - utl::TempFile aFile; - aFile.EnableKillingFile(); + utl::TempFile aFile; + aFile.EnableKillingFile(); - Sequence< PropertyValue > aDescriptor( 3 ); - aDescriptor[0].Name = "FilterName"; - aDescriptor[0].Value <<= OUString( "SVM" ); - aDescriptor[1].Name = "URL"; - aDescriptor[1].Value <<= OUString( aFile.GetURL() ); - aDescriptor[2].Name = "ExportOnlyBackground"; - aDescriptor[2].Value <<= (sal_Bool) sal_True; + Sequence< PropertyValue > aDescriptor( 3 ); + aDescriptor[0].Name = "FilterName"; + aDescriptor[0].Value <<= OUString( "SVM" ); + aDescriptor[1].Name = "URL"; + aDescriptor[1].Value <<= OUString( aFile.GetURL() ); + aDescriptor[2].Name = "ExportOnlyBackground"; + aDescriptor[2].Value <<= (sal_Bool) sal_True; - xExporter->setSourceDocument( Reference< XComponent >( rxDrawPage, UNO_QUERY ) ); - xFilter->filter( aDescriptor ); - aMtf.Read( *aFile.GetStream( STREAM_READ ) ); + xExporter->setSourceDocument( Reference< XComponent >( rxDrawPage, UNO_QUERY ) ); + xExporter->filter( aDescriptor ); + aMtf.Read( *aFile.GetStream( STREAM_READ ) ); - (*mpObjects)[ rxDrawPage ] = ObjectRepresentation( rxDrawPage, aMtf ); + (*mpObjects)[ rxDrawPage ] = ObjectRepresentation( rxDrawPage, aMtf ); - bRet = sal_True; - } + bRet = sal_True; return bRet; } |