diff options
author | Andre Fischer <af@apache.org> | 2013-05-17 09:44:46 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-22 11:34:39 +0100 |
commit | 485a5ff16ab355a6e51050539d94b5ceedde6021 (patch) | |
tree | b0aefeae5934fb79104ff672211e7a5a9d2bc09e /include | |
parent | 52181e48798a9fdee6788f723d4ed0478ed40683 (diff) |
Resolves: #i122315# Disable 'More Options' buttons when...
their commands are disabled
(cherry picked from commit 10e1831ad2e9597c5197bafb6e03b098f8e81454)
Conflicts:
sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx
sfx2/source/sidebar/SidebarToolBox.cxx
sfx2/source/sidebar/TitleBar.cxx
Change-Id: Iff83e024bd58ce4a6f27a8cde66b287d3bf710a3
(cherry picked from commit 76ca8f7f178f5e9698d23ac0b1212922f2ddf39b)
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/sidebar/SidebarToolBox.hxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index bb96a9ee69eb..b22bbc8e13fe 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -48,6 +48,8 @@ public: Window* pParentWindow, const ResId& rResId, const cssu::Reference<css::frame::XFrame>& rxFrame); + SidebarToolBox ( + Window* pParentWindow); virtual ~SidebarToolBox (void); void SetBorderWindow (const Window* pBorderWindow); @@ -67,6 +69,11 @@ public: sal_uInt16 GetItemIdForSubToolbarName ( const ::rtl::OUString& rsCOmmandName) const; + void SetController ( + const sal_uInt16 nItemId, + const cssu::Reference<css::frame::XToolbarController>& rxController, + const ::rtl::OUString& rsCommandName); + private: bool mbParentIsBorder; Image maItemSeparator; @@ -79,6 +86,7 @@ private: }; typedef ::std::map<sal_uInt16, ItemDescriptor> ControllerContainer; ControllerContainer maControllers; + bool mbAreHandlersRegistered; DECL_LINK(DropDownClickHandler, ToolBox*); DECL_LINK(ClickHandler, ToolBox*); @@ -93,6 +101,7 @@ private: const sal_Int32 nItemWidth = 0); void UpdateIcons ( const cssu::Reference<css::frame::XFrame>& rxFrame); + void RegisterHandlers (void); }; |