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

[Aron Budea (via logerrit)]

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

New commits:
commit 5a08b856e5a5f722e6b49d2e5e526593a4ad65de
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Fri Apr 24 17:01:47 2020 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Wed Jul 1 23:03:04 2020 +0200

    Send various state changes to LOK
    
    Change-Id: I0d5dc63015364cd1586555b6dced81afa50745bf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92865
    Tested-by: Jenkins
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    (cherry picked from commit f2e059ca3b1d55c721c6a698e6761536534224ba)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97585
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9bd636910959..29439f85912c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2669,6 +2669,7 @@ static void doc_iniUnoCommands ()
         OUString(".uno:InsertRowsAfter"),
         OUString(".uno:InsertColumnsBefore"),
         OUString(".uno:InsertColumnsAfter"),
+        OUString(".uno:MergeCells"),
         OUString(".uno:DeleteRows"),
         OUString(".uno:DeleteColumns"),
         OUString(".uno:DeleteTable"),
@@ -2717,9 +2718,20 @@ static void doc_iniUnoCommands ()
         OUString(".uno:InsertPageHeader"),
         OUString(".uno:InsertPageFooter"),
         OUString(".uno:OnlineAutoFormat"),
+        OUString(".uno:InsertObjectChart"),
+        OUString(".uno:InsertSection"),
+        OUString(".uno:InsertAnnotation"),
+        OUString(".uno:InsertPagebreak"),
+        OUString(".uno:InsertColumnBreak"),
+        OUString(".uno:HyperlinkDialog"),
         OUString(".uno:InsertSymbol"),
         OUString(".uno:EditRegion"),
         OUString(".uno:ThesaurusDialog"),
+        OUString(".uno:FormatArea"),
+        OUString(".uno:FormatLine"),
+        OUString(".uno:FormatColumns"),
+        OUString(".uno:Watermark"),
+        OUString(".uno:ResetAttributes"),
         OUString(".uno:Orientation"),
         OUString(".uno:ObjectAlignLeft"),
         OUString(".uno:ObjectAlignRight"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 693e11746349..5d7ed29ac9f7 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1070,6 +1070,13 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
              aEvent.FeatureURL.Path == "InsertRowsAfter" ||
              aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
              aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
+             aEvent.FeatureURL.Path == "MergeCells" ||
+             aEvent.FeatureURL.Path == "InsertObjectChart" ||
+             aEvent.FeatureURL.Path == "InsertSection" ||
+             aEvent.FeatureURL.Path == "InsertAnnotation" ||
+             aEvent.FeatureURL.Path == "InsertPagebreak" ||
+             aEvent.FeatureURL.Path == "InsertColumnBreak" ||
+             aEvent.FeatureURL.Path == "HyperlinkDialog" ||
              aEvent.FeatureURL.Path == "InsertSymbol" ||
              aEvent.FeatureURL.Path == "InsertPage" ||
              aEvent.FeatureURL.Path == "DeletePage" ||
@@ -1124,8 +1131,12 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
              aEvent.FeatureURL.Path == "OutlineRight" ||
              aEvent.FeatureURL.Path == "OutlineLeft" ||
              aEvent.FeatureURL.Path == "OutlineDown" ||
-             aEvent.FeatureURL.Path == "OutlineUp")
-
+             aEvent.FeatureURL.Path == "OutlineUp" ||
+             aEvent.FeatureURL.Path == "FormatArea" ||
+             aEvent.FeatureURL.Path == "FormatLine" ||
+             aEvent.FeatureURL.Path == "FormatColumns" ||
+             aEvent.FeatureURL.Path == "Watermark" ||
+             aEvent.FeatureURL.Path == "ResetAttributes")
     {
         aBuffer.append(aEvent.IsEnabled ? OUStringLiteral("enabled") : OUStringLiteral("disabled"));
     }