diff options
| author | Noel Grandin <noel@peralex.com> | 2013-03-05 15:44:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-03-07 08:23:42 +0200 |
| commit | f084fc5c80ad8b57f7a22a2a5fc506f90e0e24b8 (patch) | |
| tree | 360b739c5e1065a48e5a75016a7b960a63b68d0f /unotools | |
| parent | e721452988b54eb2e02c3885fde288be70bcf1f1 (diff) | |
fdo#46808, simplify OConfigurationTreeRoot constructor
.. doesn't need to take comphelper::ComponentContext as a param
anymore, can now use Reference<XComponentContext>
Change-Id: Ie5fbe0c9e8459cc612426ffa9474f955b28593e3
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/inc/unotools/confignode.hxx | 2 | ||||
| -rw-r--r-- | unotools/source/config/confignode.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/unotools/inc/unotools/confignode.hxx b/unotools/inc/unotools/confignode.hxx index 184250cb6200..08e86429ede4 100644 --- a/unotools/inc/unotools/confignode.hxx +++ b/unotools/inc/unotools/confignode.hxx @@ -249,7 +249,7 @@ namespace utl /** creates a configuration tree for the given path in the given mode */ OConfigurationTreeRoot( - const ::comphelper::ComponentContext& i_rContext, + const css::uno::Reference<css::uno::XComponentContext> & i_rContext, const ::rtl::OUString& i_rNodePath, const bool i_bUpdatable ); diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 08cc4e16fdbe..9692bb083baa 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -482,11 +482,11 @@ namespace utl namespace { //-------------------------------------------------------------------- - Reference< XMultiServiceFactory > lcl_getConfigProvider( const ::comphelper::ComponentContext& i_rContext ) + Reference< XMultiServiceFactory > lcl_getConfigProvider( const Reference<XComponentContext> & i_rContext ) { try { - Reference< XMultiServiceFactory > xProvider = theDefaultProvider::get( i_rContext.getUNOContext() ); + Reference< XMultiServiceFactory > xProvider = theDefaultProvider::get( i_rContext ); return xProvider; } catch ( const Exception& ) @@ -534,8 +534,8 @@ namespace utl } //------------------------------------------------------------------------ - OConfigurationTreeRoot::OConfigurationTreeRoot( const ::comphelper::ComponentContext& i_rContext, const ::rtl::OUString& i_rNodePath, const bool i_bUpdatable ) - :OConfigurationNode( lcl_createConfigurationRoot( lcl_getConfigProvider( i_rContext.getLegacyServiceFactory() ), + OConfigurationTreeRoot::OConfigurationTreeRoot( const Reference<XComponentContext> & i_rContext, const ::rtl::OUString& i_rNodePath, const bool i_bUpdatable ) + :OConfigurationNode( lcl_createConfigurationRoot( lcl_getConfigProvider( i_rContext ), i_rNodePath, i_bUpdatable, -1, false ).get() ) ,m_xCommitter() { |