diff options
| -rw-r--r-- | padmin/source/helper.cxx | 2 | ||||
| -rw-r--r-- | unotools/inc/unotools/confignode.hxx | 2 | ||||
| -rw-r--r-- | unotools/source/config/confignode.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx index e9bc7ad7532c..3c2df34439f4 100644 --- a/padmin/source/helper.cxx +++ b/padmin/source/helper.cxx @@ -61,7 +61,7 @@ ResId padmin::PaResId( sal_uInt32 nId ) ::com::sun::star::lang::Locale aLocale; utl::OConfigurationNode aNode = - utl::OConfigurationTreeRoot::tryCreateWithServiceFactory( + utl::OConfigurationTreeRoot::tryCreateWithComponentContext( comphelper::getProcessComponentContext(), OUString("org.openoffice.Setup/L10N") ); if ( aNode.isValid() ) 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 ); diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 53c51dd2eb84..273e1186f430 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -1511,7 +1511,7 @@ bool AllSettings::GetLayoutRTL() const if( nUIMirroring == -1 ) { nUIMirroring = 0; // ask configuration only once - utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory( + utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext( comphelper::getProcessComponentContext(), OUString("org.openoffice.Office.Common/I18N/CTL") ); // note: case sensitive ! if ( aNode.isValid() ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 64020ff5f98c..3e39c2f27b6d 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -2139,7 +2139,7 @@ sal_Bool ToolBox::AlwaysLocked() { nAlwaysLocked = 0; // ask configuration only once - utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory( + utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext( comphelper::getProcessComponentContext(), OUString("/org.openoffice.Office.UI.GlobalSettings/Toolbars") ); // note: case sensitive ! if ( aNode.isValid() ) @@ -2152,7 +2152,7 @@ sal_Bool ToolBox::AlwaysLocked() if( bStatesEnabled == sal_True ) { // now read the locking state - utl::OConfigurationNode aNode2 = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory( + utl::OConfigurationNode aNode2 = utl::OConfigurationTreeRoot::tryCreateWithComponentContext( comphelper::getProcessComponentContext(), OUString("/org.openoffice.Office.UI.GlobalSettings/Toolbars/States") ); // note: case sensitive ! diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 6d5c36d3d783..4b5e4cd6b854 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -484,7 +484,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl if( !rSettings.GetStyleSettings().GetHighContrastMode() ) { sal_Bool bTmp = sal_False, bAutoHCMode = sal_True; - utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory( + utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext( comphelper::getProcessComponentContext(), OUString("org.openoffice.Office.Common/Accessibility") ); // note: case sensitive ! if ( aNode.isValid() ) |