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

[Caolán McNamara]

 sw/source/uibase/uiview/view0.cxx |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 21dde7a09e2cfe7b48d2fec1edc7a94fa94af5c3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 2 12:30:53 2017 +0100

    Related: tdf#112395 disabled slot with Put leaks entry
    
    Change-Id: I326424551c280140db03b4c92ef450cc04f18813
    Reviewed-on: https://gerrit.libreoffice.org/43040
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 1a62e8ee7e91..8f859fafd6c2 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -268,30 +268,28 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
                 aBool.SetValue( SwViewOption::IsTableBoundaries() ); break;
             case SID_TOGGLE_NOTES:
             {
-                aBool.SetValue( pOpt->IsPostIts());
                 if (!GetPostItMgr()->HasNotes())
                 {
-                    aBool.SetWhich( nWhich );
-                    rSet.Put( aBool );
                     rSet.DisableItem(nWhich);
                     nWhich = 0;
                 }
+                else
+                    aBool.SetValue( pOpt->IsPostIts());
                 break;
             }
             case FN_VIEW_HIDDEN_PARA:
                 aBool.SetValue( pOpt->IsShowHiddenPara()); break;
             case FN_VIEW_HIDE_WHITESPACE:
             {
-                if (pOpt->getBrowseMode() ||
-                    !pOpt->CanHideWhitespace())
+                if (pOpt->getBrowseMode() || !pOpt->CanHideWhitespace())
                 {
                     rSet.DisableItem(nWhich);
                     nWhich = 0;
                 }
                 else
                     aBool.SetValue(pOpt->IsHideWhitespaceMode());
+                break;
             }
-            break;
             case SID_GRID_VISIBLE:
                 aBool.SetValue( pOpt->IsGridVisible() ); break;
             case SID_GRID_USE: