diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-30 09:18:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-11 08:02:14 +0200 |
| commit | 45d416d31558eb50e75cb246198137d171387797 (patch) | |
| tree | 44888b88b5a882845f8b89d382d8a0b0a2caf0ef /svtools | |
| parent | 2e801b9933e318fe5e323e86758aa38b4b6a553d (diff) | |
fdo#46808, convert svt::GraphicAccess to XComponentContext
Change-Id: I081158bc43bf39ad165c14d8ada31dd0142ca82c
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/imageresourceaccess.hxx | 6 | ||||
| -rw-r--r-- | svtools/source/misc/imageresourceaccess.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svtools/inc/svtools/imageresourceaccess.hxx b/svtools/inc/svtools/imageresourceaccess.hxx index dec37c75d086..4f3899b14c60 100644 --- a/svtools/inc/svtools/imageresourceaccess.hxx +++ b/svtools/inc/svtools/imageresourceaccess.hxx @@ -23,7 +23,7 @@ #include "svtools/svtdllapi.h" #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> class SvStream; //........................................................................ @@ -58,7 +58,7 @@ namespace svt when you know that the image is small enough. */ SVT_DLLPUBLIC static SvStream* getImageStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::rtl::OUString& _rImageResourceURL ); @@ -67,7 +67,7 @@ namespace svt */ SVT_DLLPUBLIC static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > getImageXStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::rtl::OUString& _rImageResourceURL ); }; diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index 9d693d664a0d..7a15af515753 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -137,14 +137,14 @@ namespace svt } //-------------------------------------------------------------------- - SvStream* GraphicAccess::getImageStream( const Reference< XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _rImageResourceURL ) + SvStream* GraphicAccess::getImageStream( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rImageResourceURL ) { SvStream* pReturn = NULL; try { // get a GraphicProvider - Reference< XGraphicProvider > xProvider = ::com::sun::star::graphic::GraphicProvider::create(comphelper::getComponentContext(_rxORB)); + Reference< XGraphicProvider > xProvider = ::com::sun::star::graphic::GraphicProvider::create(_rxContext); // let it create a graphic from the given URL Sequence< PropertyValue > aMediaProperties( 1 ); @@ -181,9 +181,9 @@ namespace svt } //-------------------------------------------------------------------- - Reference< XInputStream > GraphicAccess::getImageXStream( const Reference< XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _rImageResourceURL ) + Reference< XInputStream > GraphicAccess::getImageXStream( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rImageResourceURL ) { - return new OSeekableInputStreamWrapper( getImageStream( _rxORB, _rImageResourceURL ), sal_True ); // take ownership + return new OSeekableInputStreamWrapper( getImageStream( _rxContext, _rImageResourceURL ), sal_True ); // take ownership } //........................................................................ |