diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-08 11:02:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-11 08:02:13 +0200 |
| commit | 591ef7844079e93ff627c7e194c04d520d2f1d55 (patch) | |
| tree | 39c16f140ef2eae20f00a6c078d49519d4bd6bdc /ucb | |
| parent | 81c967e06e4247dec7ecb9ffec695ba31cb4f057 (diff) | |
fdo#46808, Use singleton util::theMacroExpander new-style constructor
And deprecate the old-style service util::MacroExpander
Change-Id: Ifcefe31a8f8c68c6d44d6ec19616727eb607e1cd
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/expand/ucpexpand.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index bf6846823f56..9dd95fa5d7fd 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -29,7 +29,7 @@ #include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/registry/XRegistryKey.hpp" -#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/theMacroExpander.hpp" #include "com/sun/star/ucb/XContentProvider.hpp" #define EXPAND_PROTOCOL "vnd.sun.star.expand" @@ -54,7 +54,7 @@ typedef ::cppu::WeakComponentImplHelper2< class ExpandContentProviderImpl : protected MutexHolder, public t_impl_helper { uno::Reference< uno::XComponentContext > m_xComponentContext; - uno::Reference< util::XMacroExpander > m_xMacroExpander; + uno::Reference< util::XMacroExpander > m_xMacroExpander; OUString expandUri( uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) const; @@ -67,10 +67,7 @@ public: uno::Reference< uno::XComponentContext > const & xComponentContext ) : t_impl_helper( m_mutex ), m_xComponentContext( xComponentContext ), - m_xMacroExpander( - xComponentContext->getValueByName( - "/singletons/com.sun.star.util.theMacroExpander" ), - uno::UNO_QUERY_THROW ) + m_xMacroExpander( util::theMacroExpander::get(xComponentContext) ) {} virtual ~ExpandContentProviderImpl() throw (); |