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

[Julien Nabet]

 sc/source/ui/view/tabvwsha.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit ad0fc224acb42cad766813972689deb5e4bb3c32
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Nov 21 20:43:35 2017 +0100

    Disabled slot with Put leaks entry (tabvwsha/sc)
    
    Same as https://cgit.freedesktop.org/libreoffice/core/commit/?id=21dde7a09e2cfe7b48d2fec1edc7a94fa94af5c3
    
    Change-Id: Ie4e3fcf097a6aa7b9a019947a677701723f98bf3
    Reviewed-on: https://gerrit.libreoffice.org/45052
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index a0eb6aec055d..861ced08b5a6 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -425,18 +425,18 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
                 break;
             case FID_CHG_ACCEPT:
                 {
-                    rSet.Put(SfxBoolItem(FID_CHG_ACCEPT,
-                            pThisFrame->HasChildWindow(FID_CHG_ACCEPT)));
-                    if(pDoc->GetChangeTrack()==nullptr)
+                    if(
+                       ( !pDoc->GetChangeTrack() &&  !pThisFrame->HasChildWindow(FID_CHG_ACCEPT) )
+                       ||
+                       ( pDocShell && pDocShell->IsDocShared() )
+                      )
                     {
-                        if ( !pThisFrame->HasChildWindow(FID_CHG_ACCEPT) )
-                        {
-                            rSet.DisableItem( nWhich);
-                        }
+                        rSet.DisableItem( nWhich);
                     }
-                    if ( pDocShell && pDocShell->IsDocShared() )
+                    else
                     {
-                        rSet.DisableItem( nWhich );
+                        rSet.Put(SfxBoolItem(FID_CHG_ACCEPT,
+                            pThisFrame->HasChildWindow(FID_CHG_ACCEPT)));
                     }
                 }
                 break;