summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2015-07-13 20:23:39 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2015-07-13 20:40:12 +0300
commit107a4740f63860f0901f51217b16cefa62a827ac (patch)
treeedac3422d8ec065d5b79ee157515b421146805f6 /sw
parent18f3cefd507461784003a10ab9699f7cf5b678c0 (diff)
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 4cce2a2f08238e1e03055877aa89bc755ec06f59. In sc the status update was simply missing. Change-Id: I8a6dd157d1e401754b3a9a93dc83458dcdd4f089
Diffstat (limited to 'sw')
-rw-r--r--sw/source/uibase/uiview/viewstat.cxx5
1 files changed, 4 insertions, 1 deletions
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;