[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source
Pranam Lashkari (via logerrit)
logerrit at kemper.freedesktop.org
Thu Aug 20 07:57:54 UTC 2020
desktop/source/lib/init.cxx | 7 ++++---
sfx2/source/control/unoctitm.cxx | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit ecf66f5b61b362f454fcc0ace6739a5ee03a4cbf
Author: Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Thu Aug 20 03:57:17 2020 +0530
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 20 09:57:22 2020 +0200
LOK: send state of FreezePanes
Change-Id: I817117d05f7f0f75f65c8e6dbf6105d120ab275d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101031
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4d96e34333ea..9e3d24ff8973 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2804,7 +2804,6 @@ static void doc_iniUnoCommands ()
OUString(".uno:AcceptTrackedChange"),
OUString(".uno:RejectTrackedChange"),
OUString(".uno:ShowResolvedAnnotations"),
- OUString(".uno:FreezePanesColumn"),
OUString(".uno:InsertBreak"),
OUString(".uno:InsertEndnote"),
OUString(".uno:InsertFootnote"),
@@ -2831,9 +2830,11 @@ static void doc_iniUnoCommands ()
OUString(".uno:Substract"),
OUString(".uno:DistributeSelection"),
OUString(".uno:Intersect"),
- OUString(".uno:FreezePanesRow"),
OUString(".uno:BorderInner"),
- OUString(".uno:BorderOuter")
+ OUString(".uno:BorderOuter"),
+ OUString(".uno:FreezePanes"),
+ OUString(".uno:FreezePanesColumn"),
+ OUString(".uno:FreezePanesRow")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 01a398800813..4c86f6eec6a7 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1016,7 +1016,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "AlignMiddle" ||
aEvent.FeatureURL.Path == "AlignDown" ||
aEvent.FeatureURL.Path == "TraceChangeMode" ||
- aEvent.FeatureURL.Path == "FormatPaintbrush")
+ aEvent.FeatureURL.Path == "FormatPaintbrush" ||
+ aEvent.FeatureURL.Path == "FreezePanes")
{
bool bTemp = false;
aEvent.State >>= bTemp;
More information about the Libreoffice-commits
mailing list