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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/source/deployment/registry/component/dp_component.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 0704e9243327..2f6d8988ec7f 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -42,7 +42,7 @@ #include "com/sun/star/loader/XImplementationLoader.hpp" #include "com/sun/star/io/XInputStream.hpp" #include "com/sun/star/ucb/NameClash.hpp" -#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/theMacroExpander.hpp" #include <list> #include <boost/unordered_map.hpp> #include <vector> @@ -1083,11 +1083,7 @@ Reference<XComponentContext> raise_uno_process( { OSL_ASSERT( xContext.is() ); - ::rtl::OUString url( - Reference<util::XMacroExpander>( - xContext->getValueByName( "/singletons/com.sun.star.util.theMacroExpander" ), - UNO_QUERY_THROW )-> - expandMacros( "$URE_BIN_DIR/uno" ) ); + ::rtl::OUString url( util::theMacroExpander::get(xContext)->expandMacros( "$URE_BIN_DIR/uno" ) ); ::rtl::OUStringBuffer buf; buf.appendAscii( "uno:pipe,name=" ); |