[Libreoffice-commits] core.git: sc/source sw/source

[Maxim Monastirsky]

 sc/source/ui/view/tabvwsh2.cxx       |   12 ++++++++++++
 sw/source/uibase/uiview/viewstat.cxx |    5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 107a4740f63860f0901f51217b16cefa62a827ac
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Mon Jul 13 20:23:39 2015 +0300

    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

diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 1efe8d6..fefe124 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 cfc2f02..aabd463 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;