[Libreoffice-commits] core.git: desktop/source sfx2/source
Pranam Lashkari (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 29 08:20:40 UTC 2020
desktop/source/lib/init.cxx | 3 ++-
sfx2/source/control/unoctitm.cxx | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 02bbed0e23121b93fd574a557f54739a25f88394
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: Wed Jul 29 10:19:59 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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99256
Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 02dcab22ec7c..bac4d4da4cbd 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2770,7 +2770,8 @@ static void doc_iniUnoCommands ()
OUString(".uno:AcceptTrackedChange"),
OUString(".uno:RejectTrackedChange"),
OUString(".uno:FreezePanesColumn"),
- OUString(".uno:FreezePanesRow")
+ OUString(".uno:FreezePanesRow"),
+ OUString(".uno:ShowResolvedAnnotations")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index c47bf565279c..125c243aa9c6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1200,7 +1200,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;
More information about the Libreoffice-commits
mailing list