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 /cui | |
| parent | fdo#46808, Convert to getProcessComponentContext() (diff) | |
| download | core-591ef7844079e93ff627c7e194c04d520d2f1d55.tar.gz core-591ef7844079e93ff627c7e194c04d520d2f1d55.zip | |
fdo#46808, Use singleton util::theMacroExpander new-style constructor
And deprecate the old-style service util::MacroExpander
Change-Id: Ifcefe31a8f8c68c6d44d6ec19616727eb607e1cd
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/treeopt.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index bbd9f6fd818b..358a56570adf 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -58,7 +58,7 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/loader/CannotActivateFactoryException.hpp> -#include <com/sun/star/util/XMacroExpander.hpp> +#include <com/sun/star/util/theMacroExpander.hpp> #include <comphelper/processfactory.hxx> #include <editeng/optitems.hxx> #include <editeng/unolingu.hxx> @@ -824,15 +824,14 @@ void OfaTreeOptionsDialog::ActivateLastSelection() } // MacroExpander to convert "expand"-URL to "file"-URL - Reference< XMacroExpander > m_xMacroExpander; + Reference< XMacroExpander > xMacroExpander; bool bMustExpand = ( INetURLObject( sLastURL ).GetProtocol() == INET_PROT_FILE ); if ( bMustExpand ) { Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); - m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( - xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ), UNO_QUERY ); + xMacroExpander = theMacroExpander::get(xContext); } SvTreeListEntry* pTemp = aTreeLB.First(); @@ -853,7 +852,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() sTemp = ::rtl::Uri::decode( sTemp, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); // expand string - sPageURL = m_xMacroExpander->expandMacros( sTemp ); + sPageURL = xMacroExpander->expandMacros( sTemp ); } if ( ( !bIsFromExtensionManager |