diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 12:50:46 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 14:19:03 +0100 |
commit | 2c757293b819118780eef3a30bb4434528d38673 (patch) | |
tree | 35beab468034fbeab06137452542d0d9191bb309 /unotools/source/config/confignode.cxx | |
parent | 2ce31e56efaf1e429ecc13fd80b6767cb9ea585b (diff) |
reduce static_initialization_and_destruction chain
Change-Id: I0c1b2f2d908c31d1510662880c13504d81445a6a
Diffstat (limited to 'unotools/source/config/confignode.cxx')
-rw-r--r-- | unotools/source/config/confignode.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 3c290d7ab88f..5f933e84a50a 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -488,19 +488,14 @@ namespace utl //======================================================================== namespace { - //-------------------------------------------------------------------- - static const ::rtl::OUString& lcl_getProviderServiceName( ) - { - static ::rtl::OUString s_sProviderServiceName( "com.sun.star.configuration.ConfigurationProvider" ); - return s_sProviderServiceName; - } + static const char s_sProviderServiceName[] = "com.sun.star.configuration.ConfigurationProvider"; //-------------------------------------------------------------------- Reference< XMultiServiceFactory > lcl_getConfigProvider( const ::comphelper::ComponentContext& i_rContext ) { try { - Reference< XMultiServiceFactory > xProvider( i_rContext.createComponent( lcl_getProviderServiceName() ), UNO_QUERY_THROW ); + Reference< XMultiServiceFactory > xProvider( i_rContext.createComponent(s_sProviderServiceName), UNO_QUERY_THROW ); return xProvider; } catch ( const Exception& ) @@ -614,7 +609,7 @@ namespace utl { try { - Reference< XMultiServiceFactory > xConfigFactory( _rxORB->createInstance( lcl_getProviderServiceName( ) ), UNO_QUERY ); + Reference< XMultiServiceFactory > xConfigFactory( _rxORB->createInstance(s_sProviderServiceName), UNO_QUERY ); if ( xConfigFactory.is() ) return createWithProvider( xConfigFactory, _rPath, _nDepth, _eMode, _bLazyWrite ); } |