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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 7771f885a353..30f7e0dc3ed2 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/xml/XImportFilter.hpp> #include <com/sun/star/xml/XExportFilter.hpp> -#include <com/sun/star/util/XMacroExpander.hpp> +#include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/io/Pipe.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -181,11 +181,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) css::uno::Reference<XComponentContext> xContext( comphelper::getComponentContext(m_rServiceFactory)); css::uno::Reference<XMacroExpander> - xMacroExpander( - xContext->getValueByName( - ::rtl::OUString( - "/singletons/com.sun.star.util.theMacroExpander" )), - UNO_QUERY_THROW); + xMacroExpander = theMacroExpander::get(xContext); sExpandedUrl = xMacroExpander->expandMacros(sUrl); sal_Int32 nPos = sExpandedUrl.indexOf( "vnd.sun.star.expand:" ); if (nPos != -1) |