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

[Szymon KÅ‚os (via logerrit)]

 desktop/source/lib/init.cxx      |    6 ++++++
 sfx2/source/control/unoctitm.cxx |    6 ++++++
 2 files changed, 12 insertions(+)

New commits:
commit 66d48bd6090f826dbbcb0802f0cb05322c1f8b26
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Aug 4 12:58:49 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Aug 4 14:57:56 2020 +0200

    lok: send state updates for shape editing commands
    
    Change-Id: I0fcb8ef76df89723ee74aa96a003e0d49d558872
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100081
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d655a60e6863..89269803af04 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2793,6 +2793,12 @@ static void doc_iniUnoCommands ()
         OUString(".uno:AlignMiddle"),
         OUString(".uno:AlignDown"),
         OUString(".uno:TraceChangeMode"),
+        OUString(".uno:Combine"),
+        OUString(".uno:Merge"),
+        OUString(".uno:Dismantle"),
+        OUString(".uno:Substract"),
+        OUString(".uno:DistributeSelection"),
+        OUString(".uno:Intersect"),
         OUString(".uno:FreezePanesRow")
     };
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 5e841bd382c6..01a398800813 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1156,6 +1156,12 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
              aEvent.FeatureURL.Path == "CharmapControl" ||
              aEvent.FeatureURL.Path == "EnterGroup" ||
              aEvent.FeatureURL.Path == "LeaveGroup" ||
+             aEvent.FeatureURL.Path == "Combine" ||
+             aEvent.FeatureURL.Path == "Merge" ||
+             aEvent.FeatureURL.Path == "Dismantle" ||
+             aEvent.FeatureURL.Path == "Substract" ||
+             aEvent.FeatureURL.Path == "DistributeSelection" ||
+             aEvent.FeatureURL.Path == "Intersect" ||
              aEvent.FeatureURL.Path == "ResetAttributes")
     {
         aBuffer.append(aEvent.IsEnabled ? OUStringLiteral("enabled") : OUStringLiteral("disabled"));