diff options
Diffstat (limited to 'framework/source/fwe/classes/addonsoptions.cxx')
| -rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index c1789c81a313..06dbc83c5d8c 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include "com/sun/star/util/XMacroExpander.hpp" #include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" #include <rtl/ustrbuf.hxx> #include <rtl/uri.hxx> #include <comphelper/processfactory.hxx> @@ -415,15 +414,11 @@ AddonsOptions_Impl::AddonsOptions_Impl() m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_MERGECONTEXT ] = PROPERTYNAME_MERGETOOLBAR_MERGECONTEXT; m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_TOOLBARITEMS ] = PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS; - Reference< XComponentContext > xContext; - Reference< com::sun::star::beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; - if ( xContext.is() ) - { - m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( + 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 ); - } ReadConfigurationData(); |