From 49cf14a3ca8dceed39baead918b1ddaaab5f4ab3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 9 Jan 2013 15:32:10 +0200 Subject: fdo#46808, Adapt document::GraphicObjectResolver UNO service to new style The services already existed, it just did not have an IDL file Change-Id: I245f78c165dbfde11a981efd7033c5c282f4e8ad --- basic/source/uno/dlgcont.cxx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'basic/source/uno/dlgcont.cxx') diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index d5bcedc85a64..2c0054da5df0 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -28,9 +28,9 @@ #include #include #include -#include "com/sun/star/resource/XStringResourceWithStorage.hpp" -#include "com/sun/star/resource/XStringResourceWithLocation.hpp" -#include "com/sun/star/document/XGraphicObjectResolver.hpp" +#include +#include +#include #include "dlgcont.hxx" #include "sbmodule.hxx" #include @@ -238,17 +238,15 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e Reference< io::XInputStream > xInput( xISP->createInputStream() ); Reference< XNameContainer > xDialogModel( mxMSF->createInstance ( OUString( "com.sun.star.awt.UnoControlDialogModel" ) ) , UNO_QUERY ); - Reference< XComponentContext > xContext( - comphelper::getComponentContext( mxMSF ) ); + Reference< XComponentContext > xContext( comphelper::getComponentContext( mxMSF ) ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, mxOwnerDocument ); std::vector< OUString > vEmbeddedImageURLs; GraphicObject::InspectForGraphicObjectImageURL( Reference< XInterface >( xDialogModel, UNO_QUERY ), vEmbeddedImageURLs ); if ( !vEmbeddedImageURLs.empty() ) { // Export the images to the storage - Sequence< Any > aArgs( 1 ); - aArgs[ 0 ] <<= xStorage; - Reference< document::XGraphicObjectResolver > xGraphicResolver( mxMSF->createInstanceWithArguments( OUString("com.sun.star.comp.Svx.GraphicExportHelper" ), aArgs ), UNO_QUERY ); + Reference< document::XGraphicObjectResolver > xGraphicResolver = + document::GraphicObjectResolver::createWithStorage( xContext, xStorage ); std::vector< OUString >::iterator it = vEmbeddedImageURLs.begin(); std::vector< OUString >::iterator it_end = vEmbeddedImageURLs.end(); if ( xGraphicResolver.is() ) -- cgit