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

[Pranam Lashkari (via logerrit)]

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

New commits:
commit 1e96228637bd547636fb9084f938c1f822965c19
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Thu Jul 23 00:11:20 2020 +0530
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Jul 24 12:40:36 2020 +0200

    LOK: send state of ShowResolvedAnnotations
    
    Change-Id: Icd8756719bc75bbd780cbf25d21f7834a1d7fc8b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99252
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 730c105434fe..e97a4039118e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2766,7 +2766,8 @@ static void doc_iniUnoCommands ()
         OUString(".uno:ParaspaceIncrease"),
         OUString(".uno:ParaspaceDecrease"),
         OUString(".uno:AcceptTrackedChange"),
-        OUString(".uno:RejectTrackedChange")
+        OUString(".uno:RejectTrackedChange"),
+        OUString(".uno:ShowResolvedAnnotations")
     };
 
     util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index caf91b81c420..edc07fb0416a 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1198,7 +1198,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
              aEvent.FeatureURL.Path == "NumberFormatCurrency" ||
              aEvent.FeatureURL.Path == "NumberFormatPercent" ||
              aEvent.FeatureURL.Path == "NumberFormatDecimal" ||
-             aEvent.FeatureURL.Path == "NumberFormatDate")
+             aEvent.FeatureURL.Path == "NumberFormatDate" ||
+             aEvent.FeatureURL.Path == "ShowResolvedAnnotations")
     {
         bool aBool;