[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - sfx2/source

[Jan Holesovsky (via logerrit)]

 sfx2/source/control/unoctitm.cxx |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 2b66842e21b11b8e363b3493f2462d4dc07f9dd3
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Jun 3 12:50:01 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Jun 12 10:10:51 2019 +0200

    lok: Fix status of InsertPage, DeletePage and DuplicatePage.
    
    Status true / false means checked, status enabled / disabled means the
    visibility (enablement) of the uno command.
    
    Change-Id: Ib2671984f59ffd5e6f1823a65ea42b33bdfe67d6
    Reviewed-on: https://gerrit.libreoffice.org/73384
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 0a8eefb55a2cd473bb7f07f19e23051d3e3a22c1)
    Reviewed-on: https://gerrit.libreoffice.org/73864
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 357fd4be74a2..7390a3328fa3 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1078,6 +1078,9 @@ static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const c
              aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
              aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
              aEvent.FeatureURL.Path == "InsertSymbol" ||
+             aEvent.FeatureURL.Path == "InsertPage" ||
+             aEvent.FeatureURL.Path == "DeletePage" ||
+             aEvent.FeatureURL.Path == "DuplicatePage" ||
              aEvent.FeatureURL.Path == "DeleteRows" ||
              aEvent.FeatureURL.Path == "DeleteColumns" ||
              aEvent.FeatureURL.Path == "DeleteTable" ||
@@ -1102,12 +1105,6 @@ static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const c
     {
         aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : OUString("disabled"));
     }
-    else if (aEvent.FeatureURL.Path == "InsertPage" ||
-             aEvent.FeatureURL.Path == "DeletePage" ||
-             aEvent.FeatureURL.Path == "DuplicatePage")
-    {
-        aBuffer.append(OUString::boolean(aEvent.IsEnabled));
-    }
     else if (aEvent.FeatureURL.Path == "AssignLayout" ||
              aEvent.FeatureURL.Path == "StatusSelectionMode" ||
              aEvent.FeatureURL.Path == "Signature" ||