[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source sfx2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Dec 15 16:09:02 UTC 2018
desktop/source/lib/init.cxx | 3 ++-
sfx2/source/control/unoctitm.cxx | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit bd5f75d44a55c0608dc328ca74b19302955bf67f
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Dec 14 17:36:41 2018 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Sat Dec 15 17:08:43 2018 +0100
lok: Handle Special character menu item's state correctly in online
Change-Id: Iaa962fe5a590ef16e710fdd49d02d564f10f0f9f
Reviewed-on: https://gerrit.libreoffice.org/65188
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
(cherry picked from commit 13998b050f445bac3593a8bb77b7320d1be9990d)
Reviewed-on: https://gerrit.libreoffice.org/65202
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 33bac792668f..f534d9a9b23a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1916,7 +1916,8 @@ static void doc_iniUnoCommands ()
OUString(".uno:TransformDialog"),
OUString(".uno:InsertPageHeader"),
OUString(".uno:InsertPageFooter"),
- OUString(".uno:OnlineAutoFormat")
+ OUString(".uno:OnlineAutoFormat"),
+ OUString(".uno:InsertSymbol")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index b831af5521d2..76c2745b4ff6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1077,6 +1077,7 @@ static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const c
aEvent.FeatureURL.Path == "InsertRowsAfter" ||
aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
+ aEvent.FeatureURL.Path == "InsertSymbol" ||
aEvent.FeatureURL.Path == "DeleteRows" ||
aEvent.FeatureURL.Path == "DeleteColumns" ||
aEvent.FeatureURL.Path == "DeleteTable" ||
More information about the Libreoffice-commits
mailing list