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 /svx/source/sidebar/graphic | |
| parent | Resolves: #i122026# adjust names of newly introduced UNO commands (diff) | |
| download | core-0b2c09a180f076230a1f1ac3ecf4725e82aada4c.tar.gz core-0b2c09a180f076230a1f1ac3ecf4725e82aada4c.zip | |
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 'svx/source/sidebar/graphic')
| -rw-r--r-- | svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 8 | ||||
| -rw-r--r-- | svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 1e5103d1a133..f55a408b4fdb 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -272,8 +272,11 @@ void GraphicPropertyPanel::DataChanged( void GraphicPropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) + const SfxPoolItem* pState, + const bool bIsEnabled) { + (void)bIsEnabled; + switch( nSID ) { case SID_ATTR_GRAF_LUMINANCE: @@ -439,6 +442,9 @@ void GraphicPropertyPanel::NotifyItemUpdate( } } + + + ////////////////////////////////////////////////////////////////////////////// SfxBindings* GraphicPropertyPanel::GetBindings() diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index c5bd01cd9bf4..d5e0c093c9c8 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -48,7 +48,8 @@ public: virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, - const SfxPoolItem* pState); + const SfxPoolItem* pState, + const bool bIsEnabled); SfxBindings* GetBindings(); |