framework/inc/uielement/toolbarmanager.hxx | 23 +++++++++--------------
framework/source/uielement/toolbarmanager.cxx | 13 +------------
2 files changed, 10 insertions(+), 26 deletions(-)
New commits:
commit 56907b06f1cb9e938dfeb91165077dd99334fb8f
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Date: Wed Nov 25 11:53:22 2015 +0100
Cleanup toolbarmanager
* Remove unused fields/methods/includes
* Formatting
Change-Id: Ia4a2fba258ddf00e8fe507338f7f8c7388631f0b
Reviewed-on: https://gerrit.libreoffice.org/20164
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/framework/inc/uielement/toolbarmanager.hxx
b/framework/inc/uielement/toolbarmanager.hxx
index 655228a..6fa1b1b 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -139,8 +139,6 @@ class ToolBarManager : public ToolbarManager_Base
virtual bool MenuItemAllowed( sal_uInt16 ) const;
void RemoveControllers();
- sal_Int32 RetrievePropertiesFromCommand( const OUString& aCmdURL );
- css::uno::Sequence< css::beans::PropertyValue > GetPropsForCommand(
const OUString& rCmdURL );
void CreateControllers();
void UpdateControllers();
//for update controller via Support Visiable
@@ -160,9 +158,9 @@ class ToolBarManager : public ToolbarManager_Base
void impl_elementChanged(bool _bRemove,const
css::ui::ConfigurationEvent& Event );
protected:
- typedef std::unordered_map< sal_uInt16, css::uno::Reference<
css::frame::XStatusListener > > ToolBarControllerMap;
- typedef ::std::vector< css::uno::Reference<
css::frame::XSubToolbarController > > SubToolBarControllerVector;
- typedef BaseHash< SubToolBarControllerVector >
SubToolBarToSubToolBarControllerMap;
+ typedef std::unordered_map< sal_uInt16, css::uno::Reference<
css::frame::XStatusListener > > ToolBarControllerMap;
+ typedef ::std::vector< css::uno::Reference<
css::frame::XSubToolbarController > > SubToolBarControllerVector;
+ typedef BaseHash< SubToolBarControllerVector >
SubToolBarToSubToolBarControllerMap;
typedef std::unordered_map< sal_uInt16, css::uno::Reference<
css::container::XIndexAccess > > MenuDescriptionMap;
@@ -176,7 +174,7 @@ class ToolBarManager : public ToolbarManager_Base
long m_lImageRotation;
- VclPtr<ToolBox> m_pToolBar;
+ VclPtr<ToolBox>
m_pToolBar;
OUString
m_aModuleIdentifier;
OUString
m_aResourceName;
@@ -195,14 +193,11 @@ class ToolBarManager : public ToolbarManager_Base
css::uno::Reference< css::ui::XUIConfigurationManager >
m_xUICfgMgr;
css::uno::Reference< css::ui::XUIConfigurationManager >
m_xDocUICfgMgr;
- CommandToInfoMap
m_aCommandMap;
- SubToolBarToSubToolBarControllerMap
m_aSubToolBarControllerMap;
- Timer
m_aAsyncUpdateControllersTimer;
- OUString
m_sIconTheme;
- MenuDescriptionMap m_aMenuMap;
- css::uno::Reference< css::ui::XAcceleratorConfiguration >
m_xDocAcceleratorManager;
- css::uno::Reference< css::ui::XAcceleratorConfiguration >
m_xModuleAcceleratorManager;
- css::uno::Reference< css::ui::XAcceleratorConfiguration >
m_xGlobalAcceleratorManager;
+ CommandToInfoMap
m_aCommandMap;
+ SubToolBarToSubToolBarControllerMap
m_aSubToolBarControllerMap;
+ Timer
m_aAsyncUpdateControllersTimer;
+ OUString
m_sIconTheme;
+ MenuDescriptionMap
m_aMenuMap;
};
}
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 49588d7..c218e89 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -31,34 +31,29 @@
#include <com/sun/star/ui/ItemType.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/theUICommandDescription.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/awt/XDockableWindow.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/ui/DockingArea.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/frame/theToolbarControllerFactory.hpp>
-#include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp>
#include <com/sun/star/ui/XUIElementSettings.hpp>
#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/ImageType.hpp>
#include <com/sun/star/ui/UIElementType.hpp>
-#include <comphelper/sequence.hxx>
-#include <com/sun/star/frame/status/Visibility.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
-#include <svtools/imgdef.hxx>
#include <svtools/toolboxcontroller.hxx>
#include <unotools/cmdoptions.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/mediadescriptor.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
#include <svtools/miscopt.hxx>
#include <svl/imageitm.hxx>
#include <svtools/framestatuslistener.hxx>
@@ -621,12 +616,6 @@ void SAL_CALL ToolBarManager::dispose() throw(
RuntimeException, std::exception
m_xFrame.clear();
m_xContext.clear();
- Reference< XComponent > xCompGAM( m_xGlobalAcceleratorManager,
UNO_QUERY );
- if ( xCompGAM.is() )
- xCompGAM->dispose();
- m_xGlobalAcceleratorManager.clear();
- m_xModuleAcceleratorManager.clear();
- m_xDocAcceleratorManager.clear();
// stop timer to prevent timer events after dispose
// do it last because other calls could restart timer in StateChanged()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
