summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-11-01 10:41:27 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-11-05 16:43:14 +0100
commitb70a330d4f06daaeeff940b2f935c8089d8a7be6 (patch)
treef0b36db556be8e416ba6cfbf2315d74425d007ee /unotools
parent8ec2fed7c88674258ce716e69ae31d8f9be7223c (diff)
fdo#46808, rename method
Rename utl::OConfigurationTreeRoot::tryCreateWithServiceFactory to utl::OConfigurationTreeRoot::tryCreateWithComponentContext Change-Id: Ib39b44b21d206b5fdfa4162106fbdeb30b1dd37c
Diffstat (limited to 'unotools')
-rw-r--r--unotools/inc/unotools/confignode.hxx2
-rw-r--r--unotools/source/config/confignode.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/unotools/inc/unotools/confignode.hxx b/unotools/inc/unotools/confignode.hxx
index 1189a9b59f0c..beb02ec2f2fe 100644
--- a/unotools/inc/unotools/confignode.hxx
+++ b/unotools/inc/unotools/confignode.hxx
@@ -302,7 +302,7 @@ namespace utl
the configuration could be initialized, errors in the creation of the specific node (e.g. because the
given node path does not exist) are still asserted.</p>
*/
- static OConfigurationTreeRoot tryCreateWithServiceFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+ static OConfigurationTreeRoot tryCreateWithComponentContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::rtl::OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True );
/** commit all changes made on the subtree the object is the root for<p/>
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index ca87f2744622..859e8df0e031 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -592,10 +592,10 @@ namespace utl
}
//------------------------------------------------------------------------
- OConfigurationTreeRoot OConfigurationTreeRoot::tryCreateWithServiceFactory( const Reference< XComponentContext >& rxContext,
+ OConfigurationTreeRoot OConfigurationTreeRoot::tryCreateWithComponentContext( const Reference< XComponentContext >& rxContext,
const ::rtl::OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , sal_Bool _bLazyWrite )
{
- OSL_ENSURE( rxContext.is(), "OConfigurationTreeRoot::tryCreateWithServiceFactory: invalid service factory!" );
+ OSL_ENSURE( rxContext.is(), "OConfigurationTreeRoot::tryCreateWithComponentContext: invalid XComponentContext!" );
try
{
Reference< XMultiServiceFactory > xConfigFactory = theDefaultProvider::get( rxContext );