diff options
author | Noel Grandin <noel@peralex.com> | 2013-06-04 13:34:29 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-06-05 08:13:22 +0200 |
commit | 8c799984cc5b76c20baccffea818e07c440c2330 (patch) | |
tree | 1c6a595817c85386882808ea1294fa2bc581655a /framework/source/services/substitutepathvars.cxx | |
parent | c23be036a6b71324302aa8acd3858ea725c2ada6 (diff) |
fdo#46808, Convert the rest of XMultiServiceFactory in framework module
Change-Id: Ife3caf00ab37a8c344f0ab90e40337b3b5bc1571
Diffstat (limited to 'framework/source/services/substitutepathvars.cxx')
-rw-r--r-- | framework/source/services/substitutepathvars.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index eef36dd24bd8..d012b6dd4eee 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -554,7 +554,7 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( SubstitutePathVariables , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( SubstitutePathVariables , ::cppu::OWeakObject , "com.sun.star.util.PathSubstitution", IMPLEMENTATIONNAME_SUBSTITUTEPATHVARIABLES ) @@ -562,12 +562,12 @@ DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( SubstitutePathVariables DEFINE_INIT_SERVICE ( SubstitutePathVariables, {} ) -SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiServiceFactory >& xServiceManager ) : +SubstitutePathVariables::SubstitutePathVariables( const Reference< XComponentContext >& xContext ) : ThreadHelpBase(), m_aVarStart( SIGN_STARTVARIABLE ), m_aVarEnd( SIGN_ENDVARIABLE ), m_aImpl( LINK( this, SubstitutePathVariables, implts_ConfigurationNotify )), - m_xServiceManager( xServiceManager ) + m_xContext( xContext ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::SubstitutePathVariables" ); int i; @@ -684,7 +684,7 @@ OUString SubstitutePathVariables::GetWorkPath() const try { ::comphelper::ConfigurationHelper::readDirectKey( - comphelper::getComponentContext(m_xServiceManager), + m_xContext, OUString("org.openoffice.Office.Paths"), OUString("Paths/Work"), OUString("WritePath"), @@ -709,7 +709,7 @@ OUString SubstitutePathVariables::GetWorkVariableValue() const try { ::comphelper::ConfigurationHelper::readDirectKey( - comphelper::getComponentContext(m_xServiceManager), + m_xContext, OUString("org.openoffice.Office.Paths"), OUString("Variables"), OUString("Work"), |