diff options
| -rw-r--r-- | forms/source/component/ImageControl.cxx | 2 | ||||
| -rw-r--r-- | forms/source/component/imgprod.cxx | 2 | ||||
| -rw-r--r-- | svtools/inc/svtools/imageresourceaccess.hxx | 6 | ||||
| -rw-r--r-- | svtools/source/misc/imageresourceaccess.cxx | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index a466a9d2bcf9..8100ce2551dc 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -420,7 +420,7 @@ sal_Bool OImageControlModel::impl_updateStreamForURL_lck( const ::rtl::OUString& if ( ::svt::GraphicAccess::isSupportedURL( _rURL ) ) { - xImageStream = ::svt::GraphicAccess::getImageXStream( getContext().getLegacyServiceFactory(), _rURL ); + xImageStream = ::svt::GraphicAccess::getImageXStream( getContext().getUNOContext(), _rURL ); } else { diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 46f688a38a0a..282e936a91ca 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -236,7 +236,7 @@ void ImageProducer::SetImage( const ::rtl::OUString& rPath ) if ( ::svt::GraphicAccess::isSupportedURL( maURL ) ) { - mpStm = ::svt::GraphicAccess::getImageStream( ::comphelper::getProcessServiceFactory(), maURL ); + mpStm = ::svt::GraphicAccess::getImageStream( ::comphelper::getProcessComponentContext(), maURL ); } else if( !maURL.isEmpty() ) { 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 } //........................................................................ |