Kaydet (Commit) 107a4740 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky

tdf#39478 Fix custom shapes status update

In sw it was still returning a string item, although the
slot type was changed to boolean back in 2005 with
4cce2a2f.

In sc the status update was simply missing.

Change-Id: I8a6dd157d1e401754b3a9a93dc83458dcdd4f089
üst 18f3cefd
...@@ -434,6 +434,18 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) ...@@ -434,6 +434,18 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
case SID_OBJECT_SELECT: // wichtig fuer den ollen Control-Controller case SID_OBJECT_SELECT: // wichtig fuer den ollen Control-Controller
rSet.Put( SfxBoolItem( nWhich, nDrawSfxId == SID_OBJECT_SELECT && IsDrawSelMode() ) ); rSet.Put( SfxBoolItem( nWhich, nDrawSfxId == SID_OBJECT_SELECT && IsDrawSelMode() ) );
break; 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(); nWhich = aIter.NextWhich();
} }
......
...@@ -550,7 +550,10 @@ void SwView::GetDrawState(SfxItemSet &rSet) ...@@ -550,7 +550,10 @@ void SwView::GetDrawState(SfxItemSet &rSet)
if ( bWeb ) if ( bWeb )
rSet.DisableItem( nWhich ); rSet.DisableItem( nWhich );
else 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; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment