diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-02-12 22:14:48 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-02-12 21:56:29 +0000 |
| commit | 81d4fbc0daa54889ccb09e6a3fadff9c70d99448 (patch) | |
| tree | e76c9281a295dda0e1b25316efc77640ad3dc3bf /framework/inc | |
| parent | e5aa7a5b5753c57969fc2e17fb334781bb2a0481 (diff) | |
tdf#42029 Use a floating toolbar to show clipped items
Change-Id: I6b366f115258ef8497807163179d3e08ab3d5e6f
Reviewed-on: https://gerrit.libreoffice.org/34180
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 739d22f5647a..9876d6b61ef8 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -94,6 +94,7 @@ class ToolBarManager : public ToolbarManager_Base void CheckAndUpdateImages(); virtual void RefreshImages(); void FillToolbar( const css::uno::Reference< css::container::XIndexAccess >& rToolBarData ); + void FillOverflowToolbar( ToolBox* pParent ); void notifyRegisteredControllers( const OUString& aUIElementName, const OUString& aCommand ); void Destroy(); @@ -113,8 +114,6 @@ class ToolBarManager : public ToolbarManager_Base }; protected: - DECL_LINK( Command, CommandEvent const *, void ); - PopupMenu * GetToolBarCustomMenu(ToolBox* pToolBar); DECL_LINK(Click, ToolBox *, void); DECL_LINK(DropdownClick, ToolBox *, void); DECL_LINK(DoubleClick, ToolBox *, void); @@ -124,13 +123,16 @@ class ToolBarManager : public ToolbarManager_Base DECL_LINK( MiscOptionsChanged, LinkParamNone*, void ); DECL_LINK( MenuButton, ToolBox *, void ); + DECL_LINK( MenuPreExecute, ToolBox *, void ); DECL_LINK( MenuSelect, Menu *, bool ); - void MenuDeactivated(); DECL_LINK(AsyncUpdateControllersHdl, Timer *, void); + DECL_LINK( OverflowEventListener, VclWindowEvent&, void ); DECL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, void*, void ); virtual bool MenuItemAllowed( sal_uInt16 ) const; + void AddCustomizeMenuItems(ToolBox* pToolBar); + void InitImageManager(); void RemoveControllers(); void CreateControllers(); void UpdateControllers(); @@ -138,7 +140,6 @@ class ToolBarManager : public ToolbarManager_Base void UpdateController( const css::uno::Reference< css::frame::XToolbarController >& xController); //end void AddFrameActionListener(); - void ImplClearPopupMenu( ToolBox *pToolBar ); void RequestImages(); ToolBoxItemBits ConvertStyleToToolboxItemBits( sal_Int32 nStyle ); css::uno::Reference< css::frame::XModel > GetModelFromFrame() const; @@ -178,6 +179,8 @@ class ToolBarManager : public ToolbarManager_Base SubToolBarToSubToolBarControllerMap m_aSubToolBarControllerMap; Timer m_aAsyncUpdateControllersTimer; OUString m_sIconTheme; + + rtl::Reference< ToolBarManager > m_aOverflowManager; }; } |