desktop/source/lib/init.cxx | 12 ++++++++++++
sfx2/source/control/unoctitm.cxx | 15 +++++++++++++--
2 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit 09407951bba3808483bb2e7d2fd7e4b8660b134b
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Fri Apr 24 17:01:47 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jul 22 18:25:27 2020 +0200
Send various state changes to LOK
Change-Id: I0d5dc63015364cd1586555b6dced81afa50745bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92865
Tested-by: Jenkins
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
(cherry picked from commit f2e059ca3b1d55c721c6a698e6761536534224ba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97585
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
(cherry picked from commit 5a08b856e5a5f722e6b49d2e5e526593a4ad65de)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97794
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2e5f9380fa44..7e6b71c77c1e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2661,6 +2661,7 @@ static void doc_iniUnoCommands ()
OUString(".uno:InsertRowsAfter"),
OUString(".uno:InsertColumnsBefore"),
OUString(".uno:InsertColumnsAfter"),
+ OUString(".uno:MergeCells"),
OUString(".uno:DeleteRows"),
OUString(".uno:DeleteColumns"),
OUString(".uno:DeleteTable"),
@@ -2709,9 +2710,20 @@ static void doc_iniUnoCommands ()
OUString(".uno:InsertPageHeader"),
OUString(".uno:InsertPageFooter"),
OUString(".uno:OnlineAutoFormat"),
+ OUString(".uno:InsertObjectChart"),
+ OUString(".uno:InsertSection"),
+ OUString(".uno:InsertAnnotation"),
+ OUString(".uno:InsertPagebreak"),
+ OUString(".uno:InsertColumnBreak"),
+ OUString(".uno:HyperlinkDialog"),
OUString(".uno:InsertSymbol"),
OUString(".uno:EditRegion"),
OUString(".uno:ThesaurusDialog"),
+ OUString(".uno:FormatArea"),
+ OUString(".uno:FormatLine"),
+ OUString(".uno:FormatColumns"),
+ OUString(".uno:Watermark"),
+ OUString(".uno:ResetAttributes"),
OUString(".uno:Orientation"),
OUString(".uno:ObjectAlignLeft"),
OUString(".uno:ObjectAlignRight"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index b8955d6ba1c5..405208e03766 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1068,6 +1068,13 @@ static void InterceptLOKStateChangeEvent(sal_uInt16
nSID, SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "InsertRowsAfter" ||
aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
+ aEvent.FeatureURL.Path == "MergeCells" ||
+ aEvent.FeatureURL.Path == "InsertObjectChart" ||
+ aEvent.FeatureURL.Path == "InsertSection" ||
+ aEvent.FeatureURL.Path == "InsertAnnotation" ||
+ aEvent.FeatureURL.Path == "InsertPagebreak" ||
+ aEvent.FeatureURL.Path == "InsertColumnBreak" ||
+ aEvent.FeatureURL.Path == "HyperlinkDialog" ||
aEvent.FeatureURL.Path == "InsertSymbol" ||
aEvent.FeatureURL.Path == "InsertPage" ||
aEvent.FeatureURL.Path == "DeletePage" ||
@@ -1122,8 +1129,12 @@ static void InterceptLOKStateChangeEvent(sal_uInt16
nSID, SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "OutlineRight" ||
aEvent.FeatureURL.Path == "OutlineLeft" ||
aEvent.FeatureURL.Path == "OutlineDown" ||
- aEvent.FeatureURL.Path == "OutlineUp")
-
+ aEvent.FeatureURL.Path == "OutlineUp" ||
+ aEvent.FeatureURL.Path == "FormatArea" ||
+ aEvent.FeatureURL.Path == "FormatLine" ||
+ aEvent.FeatureURL.Path == "FormatColumns" ||
+ aEvent.FeatureURL.Path == "Watermark" ||
+ aEvent.FeatureURL.Path == "ResetAttributes")
{
aBuffer.append(aEvent.IsEnabled ? OUString("enabled") :
OUString("disabled"));
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
