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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 12 | ||||
| -rw-r--r-- | framework/source/uielement/imagebuttontoolbarcontroller.cxx | 6 |
2 files changed, 7 insertions, 11 deletions
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 44ee290f3834..077c3a3f90c7 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -24,7 +24,7 @@ #include <tools/stream.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/theMacroExpander.hpp" #include "com/sun/star/uno/XComponentContext.hpp" #include <rtl/ustrbuf.hxx> #include <rtl/uri.hxx> @@ -46,6 +46,7 @@ using namespace ::osl ; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::beans ; using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star; #define ROOTNODE_ADDONMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons" )) #define PATHDELIMITER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) @@ -350,7 +351,7 @@ class AddonsOptions_Impl : public ConfigItem AddonToolBars m_aCachedToolBarPartProperties; std::vector< rtl::OUString > m_aCachedToolBarPartResourceNames; Sequence< Sequence< PropertyValue > > m_aCachedHelpMenuProperties; - Reference< com::sun::star::util::XMacroExpander > m_xMacroExpander; + Reference< util::XMacroExpander > m_xMacroExpander; ImageManager m_aImageManager; Sequence< Sequence< PropertyValue > > m_aEmptyAddonToolBar; MergeMenuInstructionContainer m_aCachedMergeMenuInsContainer; @@ -407,9 +408,7 @@ AddonsOptions_Impl::AddonsOptions_Impl() Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); - m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))), - UNO_QUERY ); + m_xMacroExpander = util::theMacroExpander::get(xContext); ReadConfigurationData(); @@ -1287,8 +1286,7 @@ sal_Bool AddonsOptions_Impl::HasAssociatedImages( const ::rtl::OUString& aURL ) //***************************************************************************************************************** void AddonsOptions_Impl::SubstituteVariables( ::rtl::OUString& aURL ) { - if (( aURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( EXPAND_PROTOCOL )) == 0 ) && - m_xMacroExpander.is() ) + if (( aURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( EXPAND_PROTOCOL )) == 0 ) ) { // cut protocol ::rtl::OUString macro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) ); diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index e57af2e878dd..cabe8b14005e 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XControlNotificationListener.hpp> -#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/theMacroExpander.hpp" #include "com/sun/star/uno/XComponentContext.hpp" #include <rtl/uri.hxx> @@ -73,9 +73,7 @@ uno::Reference< util::XMacroExpander > GetMacroExpander() { uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); - m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))), - UNO_QUERY ); + m_xMacroExpander = util::theMacroExpander::get(xContext); xMacroExpander = m_xMacroExpander; } } |