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

[Libreoffice Gerrit user]

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

New commits:
commit 32555d9b5c9ef37276984eaa9d9b84007fd02038
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Feb 6 17:38:35 2019 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Feb 7 08:36:50 2019 +0100

    lok: intercept the UNO command ".uno:EditRegion"
    
    Change-Id: I3a1072e6ededbd0322c4b1dcd0ef4b16ace219d1
    Reviewed-on: https://gerrit.libreoffice.org/67478
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index be692a89ec96..dae96c2e62b6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1993,7 +1993,8 @@ static void doc_iniUnoCommands ()
         OUString(".uno:InsertPageHeader"),
         OUString(".uno:InsertPageFooter"),
         OUString(".uno:OnlineAutoFormat"),
-        OUString(".uno:InsertSymbol")
+        OUString(".uno:InsertSymbol"),
+        OUString(".uno:EditRegion")
     };
 
     util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 76c2745b4ff6..c128bc5da518 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1095,7 +1095,8 @@ static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const c
              aEvent.FeatureURL.Path == "ParagraphDialog" ||
              aEvent.FeatureURL.Path == "OutlineBullet" ||
              aEvent.FeatureURL.Path == "InsertIndexesEntry" ||
-             aEvent.FeatureURL.Path == "TransformDialog")
+             aEvent.FeatureURL.Path == "TransformDialog" ||
+             aEvent.FeatureURL.Path == "EditRegion")
 
     {
         aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : OUString("disabled"));