diff options
| -rw-r--r-- | sc/source/ui/view/tabvwsh2.cxx | 12 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewstat.cxx | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 1efe8d62b7d8..fefe124b4b15 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -434,6 +434,18 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) case SID_OBJECT_SELECT: // wichtig fuer den ollen Control-Controller rSet.Put( SfxBoolItem( nWhich, nDrawSfxId == SID_OBJECT_SELECT && IsDrawSelMode() ) ); break; + + case SID_DRAWTBX_CS_BASIC: + case SID_DRAWTBX_CS_SYMBOL: + case SID_DRAWTBX_CS_ARROW: + case SID_DRAWTBX_CS_FLOWCHART: + case SID_DRAWTBX_CS_CALLOUT: + case SID_DRAWTBX_CS_STAR: + { + bool bCurrentActive = (nDrawSfxId == nWhich) && (aCurrShapeEnumCommand[ nWhich - SID_DRAWTBX_CS_BASIC ] == sDrawCustom); + rSet.Put( SfxBoolItem( nWhich, bCurrentActive ) ); + } + break; } nWhich = aIter.NextWhich(); } diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index cfc2f0210a40..aabd463de92d 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -550,7 +550,10 @@ void SwView::GetDrawState(SfxItemSet &rSet) if ( bWeb ) rSet.DisableItem( nWhich ); else - rSet.Put(SfxStringItem(nWhich, m_aCurrShapeEnumCommand[ nWhich - SID_DRAWTBX_CS_BASIC ] )); + { + bool bCurrentActive = (m_nDrawSfxId == nWhich) && (m_aCurrShapeEnumCommand[ nWhich - SID_DRAWTBX_CS_BASIC ] == m_sDrawCustom); + rSet.Put( SfxBoolItem( nWhich, bCurrentActive ) ); + } } break; |