diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-03 20:29:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-03 20:30:18 +0100 |
| commit | 179810cdf254177197a3108e970d9555468cd265 (patch) | |
| tree | 2250c1dc9ed3c637a682e6a30c6cafac945fd133 /framework | |
| parent | 9de4fe985349401fda68e8384860b14ef6b071d2 (diff) | |
Further clean-up
Change-Id: I20049b482c831e4ac2221fddfe80deb9847e72c3
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 8 | ||||
| -rw-r--r-- | framework/source/uielement/imagebuttontoolbarcontroller.cxx | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 45af778e3b78..a3e57c7f7608 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -24,10 +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/theMacroExpander.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <rtl/ustrbuf.hxx> -#include <rtl/uri.hxx> #include <comphelper/getexpandeduri.hxx> #include <comphelper/processfactory.hxx> #include <vcl/dibtools.hxx> @@ -339,7 +336,6 @@ class AddonsOptions_Impl : public ConfigItem AddonToolBars m_aCachedToolBarPartProperties; std::vector< OUString > m_aCachedToolBarPartResourceNames; Sequence< Sequence< PropertyValue > > m_aCachedHelpMenuProperties; - Reference< util::XMacroExpander > m_xMacroExpander; ImageManager m_aImageManager; Sequence< Sequence< PropertyValue > > m_aEmptyAddonToolBar; MergeMenuInstructionContainer m_aCachedMergeMenuInsContainer; @@ -410,10 +406,6 @@ AddonsOptions_Impl::AddonsOptions_Impl() m_aPropMergeStatusbarNames[ OFFSET_MERGESTATUSBAR_MERGECONTEXT ] = PROPERTYNAME_MERGESTATUSBAR_MERGECONTEXT; m_aPropMergeStatusbarNames[ OFFSET_MERGESTATUSBAR_STATUSBARITEMS ] = PROPERTYNAME_MERGESTATUSBAR_STATUSBARITEMS; - Reference< XComponentContext > xContext( - comphelper::getProcessComponentContext() ); - m_xMacroExpander = util::theMacroExpander::get(xContext); - ReadConfigurationData(); // Enable notification mechanism of our baseclass. diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 43ebc34c3817..820722b0d41b 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/frame/XControlNotificationListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <rtl/uri.hxx> #include <osl/mutex.hxx> #include <comphelper/getexpandeduri.hxx> #include <comphelper/processfactory.hxx> |