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 /sc/source/ui/sidebar | |
| 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 'sc/source/ui/sidebar')
6 files changed, 18 insertions, 6 deletions
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 3fb7bb278bb8..0ba24366334d 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -382,8 +382,11 @@ void AlignmentPropertyPanel::HandleContextChange( void AlignmentPropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) + const SfxPoolItem* pState, + const bool bIsEnabled) { + (void)bIsEnabled; + switch(nSID) { case SID_H_ALIGNCELL: diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 07d3e06540b0..a5a0a58f533a 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -53,7 +53,8 @@ public: virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, - const SfxPoolItem* pState); + const SfxPoolItem* pState, + const bool bIsEnabled); SfxBindings* GetBindings(); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index fe48df6ccf03..2ee40a9dc836 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -446,8 +446,11 @@ void CellAppearancePropertyPanel::HandleContextChange( void CellAppearancePropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) + const SfxPoolItem* pState, + const bool bIsEnabled) { + (void)bIsEnabled; + switch(nSID) { case SID_BACKGROUND_COLOR: diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 184cd9580588..00b747ef0990 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -61,7 +61,8 @@ public: virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, - const SfxPoolItem* pState); + const SfxPoolItem* pState, + const bool bIsEnabled); SfxBindings* GetBindings(); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 2f5a805b3043..9a7e2cbd3a50 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -262,8 +262,11 @@ void NumberFormatPropertyPanel::HandleContextChange( void NumberFormatPropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) + const SfxPoolItem* pState, + const bool bIsEnabled) { + (void)bIsEnabled; + switch(nSID) { case SID_NUMBER_TYPE_FORMAT: diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 98102f476297..cf7087cb3ad9 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -50,7 +50,8 @@ public: virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, - const SfxPoolItem* pState); + const SfxPoolItem* pState, + const bool bIsEnabled); SfxBindings* GetBindings(); |