From 3d4288c1c0b593421c7f6619c88584bdb7c53337 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 8 Nov 2012 13:10:01 +0200
Subject: fdo#46808, remove some more XMultiServiceFactory fields

Change-Id: I8d039a933c9fde1a24b35954bb5a1f151e9aa160
---
 ucb/source/ucp/gvfs/gvfs_content.cxx  | 16 ++++++++--------
 ucb/source/ucp/gvfs/gvfs_content.hxx  |  4 ++--
 ucb/source/ucp/gvfs/gvfs_provider.cxx |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'ucb/source/ucp/gvfs')

diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index c3ed8fd197c8..7d29e0f4faa9 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -109,11 +109,11 @@ GnomeToOUString( const char *utf8_str)
 
 
 Content::Content(
-          const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
+          const uno::Reference< uno::XComponentContext >& rxContext,
           ContentProvider* pProvider,
           const uno::Reference< ucb::XContentIdentifier >& Identifier)
   throw ( ucb::ContentCreationException )
-    : ContentImplHelper( rxSMgr, pProvider, Identifier ),
+    : ContentImplHelper( rxContext, pProvider, Identifier ),
       m_pProvider( pProvider ),
       m_bTransient( sal_False )
 {
@@ -124,12 +124,12 @@ Content::Content(
 }
 
 Content::Content(
-    const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
+    const uno::Reference< uno::XComponentContext >& rxContext,
     ContentProvider                                   * pProvider,
     const uno::Reference< ucb::XContentIdentifier >&    Identifier,
     sal_Bool                                            IsFolder)
         throw ( ucb::ContentCreationException )
-    : ContentImplHelper( rxSMgr, pProvider, Identifier ),
+    : ContentImplHelper( rxContext, pProvider, Identifier ),
       m_pProvider( pProvider ),
       m_bTransient( sal_True )
 {
@@ -343,7 +343,7 @@ uno::Any SAL_CALL Content::execute(
 
         if ( bOpenFolder && isFolder( xEnv ) ) {
             uno::Reference< ucb::XDynamicResultSet > xSet
-                = new DynamicResultSet( comphelper::getComponentContext(m_xSMgr), this, aOpenCommand, xEnv );
+                = new DynamicResultSet( m_xContext, this, aOpenCommand, xEnv );
             aRet <<= xSet;
 
         } else if ( aOpenCommand.Sink.is() ) {
@@ -517,7 +517,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
         ( new ::ucbhelper::ContentIdentifier( aURL ) );
 
     try {
-        return new ::gvfs::Content( m_xSMgr, m_pProvider, xId, !create_document );
+        return new ::gvfs::Content( m_xContext, m_pProvider, xId, !create_document );
     } catch ( ucb::ContentCreationException & ) {
         return uno::Reference< ucb::XContent >();
     }
@@ -595,7 +595,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     }
 
     rtl::Reference< ::ucbhelper::PropertyValueSet > xRow
-        = new ::ucbhelper::PropertyValueSet( m_xSMgr );
+        = new ::ucbhelper::PropertyValueSet( m_xContext );
 
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
     for( sal_Int32 n = 0; n < nProps; ++n ) {
@@ -1438,7 +1438,7 @@ Content::createTempStream(
     // Something badly wrong happened - can't seek => stream to a temporary file
     uno::Reference < io::XOutputStream > xTempOut =
         uno::Reference < io::XOutputStream >
-            ( io::TempFile::create(comphelper::getComponentContext(m_xSMgr)), uno::UNO_QUERY );
+            ( io::TempFile::create( m_xContext ), uno::UNO_QUERY );
 
     if ( !xTempOut.is() )
         cancelCommandExecution( GNOME_VFS_ERROR_IO, xEnv );
diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx
index 49fbf58e0f60..0357987eb4fd 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
@@ -185,13 +185,13 @@ public:
 public:
 
     Content( const ::com::sun::star::uno::Reference<
-         ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+         ::com::sun::star::uno::XComponentContext >& rxContext,
          ContentProvider                                *pProvider,
          const ::com::sun::star::uno::Reference<
          ::com::sun::star::ucb::XContentIdentifier >&    Identifier)
             throw ( ::com::sun::star::ucb::ContentCreationException );
     Content( const ::com::sun::star::uno::Reference<
-         ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+         ::com::sun::star::uno::XComponentContext >& rxContext,
          ContentProvider                                *pProvider,
          const ::com::sun::star::uno::Reference<
          ::com::sun::star::ucb::XContentIdentifier >&    Identifier,
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index 8a372ebf713d..442468f7dc78 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -115,7 +115,7 @@ ContentProvider::queryContent(
 
     try
     {
-        xContent = new ::gvfs::Content(uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, Identifier );
+        xContent = new ::gvfs::Content( m_xContext, this, Identifier );
         registerNewContent( xContent );
     }
     catch ( com::sun::star::ucb::ContentCreationException const & )
-- 
cgit