fdo#46808, convert svt::GraphicAccess to XComponentContext

Change-Id: I081158bc43bf39ad165c14d8ada31dd0142ca82c

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
     {

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() )
     {

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
                 );
     };

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
     }
 
 //........................................................................