diff options
| author | Andre Fischer <af@apache.org> | 2013-04-19 08:51:45 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:16 +0100 |
| commit | 0b2c09a180f076230a1f1ac3ecf4725e82aada4c (patch) | |
| tree | cd61de0a554320ae3c6c7c5ef9ef4c412e0dd3ac /sw | |
| parent | c991fb49aa174f300be0b978d89bc63e01e0aa2b (diff) | |
Resolves: #i121960# Extend the sidebar::ControllerItem to check Disabled state
Converted TextPropertyPanel to use this new functionality.
(cherry picked from commit 5e32abe48b0833e4e370507a1e74fbb1ba98b5e3)
Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
sfx2/inc/sfx2/sidebar/ControllerItem.hxx
sfx2/source/sidebar/ControllerItem.cxx
sfx2/source/sidebar/FocusManager.cxx
sfx2/source/sidebar/SidebarChildWindow.cxx
svx/Library_svx.mk
svx/source/sidebar/text/TextPropertyPanel.cxx
svx/source/sidebar/text/TextPropertyPanel.hrc
svx/source/sidebar/text/TextPropertyPanel.hxx
svx/source/sidebar/text/TextPropertyPanel.src
svx/source/sidebar/text/TextUnderlineControl.hxx
Change-Id: I3a25bb0a02e6165ceeb6dbd9e6ecd3e94051f594
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/sidebar/PagePropertyPanel.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/sidebar/PagePropertyPanel.hxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/sidebar/WrapPropertyPanel.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/sidebar/WrapPropertyPanel.hxx | 3 |
4 files changed, 12 insertions, 4 deletions
diff --git a/sw/source/ui/sidebar/PagePropertyPanel.cxx b/sw/source/ui/sidebar/PagePropertyPanel.cxx index b731114c8a61..864742d9416f 100644 --- a/sw/source/ui/sidebar/PagePropertyPanel.cxx +++ b/sw/source/ui/sidebar/PagePropertyPanel.cxx @@ -490,8 +490,11 @@ void PagePropertyPanel::ClosePageColumnPopup() void PagePropertyPanel::NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, - const SfxPoolItem* pState) + const SfxPoolItem* pState, + const bool bIsEnabled) { + (void)bIsEnabled; + switch( nSId ) { case SID_ATTR_PAGE_COLUMN: diff --git a/sw/source/ui/sidebar/PagePropertyPanel.hxx b/sw/source/ui/sidebar/PagePropertyPanel.hxx index 311f0ee489af..267c99e28119 100644 --- a/sw/source/ui/sidebar/PagePropertyPanel.hxx +++ b/sw/source/ui/sidebar/PagePropertyPanel.hxx @@ -61,7 +61,8 @@ namespace sw { namespace sidebar { virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState, + const bool bIsEnabled); SfxBindings* GetBindings() const { diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.cxx b/sw/source/ui/sidebar/WrapPropertyPanel.cxx index d3d9a833d78f..c185d95cdb9b 100644 --- a/sw/source/ui/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/ui/sidebar/WrapPropertyPanel.cxx @@ -181,8 +181,11 @@ IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG) void WrapPropertyPanel::NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, - const SfxPoolItem* pState ) + const SfxPoolItem* pState, + const bool bIsEnabled) { + (void)bIsEnabled; + if ( eState == SFX_ITEM_AVAILABLE && pState->ISA(SfxBoolItem) ) { diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.hxx b/sw/source/ui/sidebar/WrapPropertyPanel.hxx index fb30dda5fc18..415e88029554 100644 --- a/sw/source/ui/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/ui/sidebar/WrapPropertyPanel.hxx @@ -43,7 +43,8 @@ namespace sw { namespace sidebar { virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState, + const bool bIsEnabled); private: WrapPropertyPanel( |