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
---
 ucbhelper/source/provider/contenthelper.cxx    |  4 ++--
 ucbhelper/source/provider/propertyvalueset.cxx | 18 +++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'ucbhelper/source')

diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index 92deb602ad0d..d29221886bda 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -177,12 +177,12 @@ using namespace ucbhelper_impl;
 namespace ucbhelper {
 
 ContentImplHelper::ContentImplHelper(
-            const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
+            const uno::Reference< uno::XComponentContext >& rxContext,
             const rtl::Reference< ContentProviderImplHelper >& rxProvider,
             const uno::Reference<
             com::sun::star::ucb::XContentIdentifier >& Identifier )
 : m_pImpl( new ContentImplHelper_Impl ),
-  m_xSMgr( rxSMgr ),
+  m_xContext( rxContext ),
   m_xIdentifier( Identifier ),
   m_xProvider( rxProvider ),
   m_nCommandId( 0 )
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 11308d37a79f..425f8024a5b3 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -253,16 +253,14 @@ namespace ucbhelper {
 //=========================================================================
 //=========================================================================
 
-#define PROPERTYVALUESET_INIT()             \
-  m_xSMgr( rxSMgr ),                        \
-  m_pValues( new PropertyValues ),          \
-  m_bWasNull( sal_False ),                  \
-  m_bTriedToGetTypeConverter( sal_False )
-
 //=========================================================================
 PropertyValueSet::PropertyValueSet(
-                    const Reference< XMultiServiceFactory >& rxSMgr )
-: PROPERTYVALUESET_INIT()
+                    const Reference< XComponentContext >& rxContext )
+:  m_xContext( rxContext ),
+  m_pValues( new PropertyValues ),
+  m_bWasNull( sal_False ),
+  m_bTriedToGetTypeConverter( sal_False )
+
 {
 }
 
@@ -628,9 +626,7 @@ const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter()
     if ( !m_bTriedToGetTypeConverter && !m_xTypeConverter.is() )
     {
         m_bTriedToGetTypeConverter = sal_True;
-        Reference< XPropertySet > xFactoryProperties( m_xSMgr, UNO_QUERY_THROW );
-        Reference< XComponentContext > xContext( xFactoryProperties->getPropertyValue( "DefaultContext" ), UNO_QUERY_THROW );
-        m_xTypeConverter = Converter::create(xContext);
+        m_xTypeConverter = Converter::create(m_xContext);
 
         OSL_ENSURE( m_xTypeConverter.is(),
                     "PropertyValueSet::getTypeConverter() - "
-- 
cgit