[Libreoffice-commits] core.git: 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 4824218c896ae2dfec8a5ca21a116dcc8f44ceee
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: Wed Sep 2 09:10:10 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>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101520
    Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f3ba0d498b98..f28718093836 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2821,6 +2821,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:BorderInner"),
         OUString(".uno:BorderOuter"),
         OUString(".uno:FreezePanes"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 782e005a4247..aa9dfb6019c5 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1158,6 +1158,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(u"enabled") : OUStringLiteral(u"disabled"));