diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-20 20:34:31 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-21 17:36:08 +0300 |
| commit | 3c7a7b538e8ca8b310ae9778ae9ace5ae937a4f1 (patch) | |
| tree | a3d8e93b88cbb4d90dad02cb981f1d33e7547d20 /sc | |
| parent | 01eea7fe40c939311bf1920b6e8b4391a93c2e82 (diff) | |
Simplify
Change-Id: I6fff5af5d623bff6f8adedf6f3d42d849ea4d24b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh2.cxx | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 3a2536d7f9c4..ce3c4a5b7e49 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -168,9 +168,6 @@ private: SfxBroadcaster* pAccessibilityBroadcaster; - static const int MASTERENUMCOMMANDS = 6; - OUString aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; - // ugly hack for Add button in ScNameDlg boost::ptr_map<OUString, ScRangeName> maRangeMap; bool mbInSwitch; diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index fefe124b4b15..6bf6439cbbeb 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -310,7 +310,6 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) SFX_REQUEST_ARG( rReq, pEnumCommand, SfxStringItem, nNewId, false ); if ( pEnumCommand ) { - aCurrShapeEnumCommand[ nNewId - SID_DRAWTBX_CS_BASIC ] = pEnumCommand->GetValue(); SfxBindings& rBind = GetViewFrame()->GetBindings(); rBind.Invalidate( nNewId ); rBind.Update( nNewId ); @@ -441,10 +440,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) 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 ) ); - } + rSet.Put( SfxBoolItem( nWhich, nDrawSfxId == nWhich ) ); break; } nWhich = aIter.NextWhich(); |