summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Budea <aron.budea@collabora.com>2020-04-24 17:01:47 +0200
committerAron Budea <aron.budea@collabora.com>2020-07-01 20:02:10 +0200
commitb0a3883a45edac3c8f9bccf6926b34d9da8f30e8 (patch)
treeaf6afb3d0888219f338ba678eed53d93683768f2
parent70246cf9c6fc36ae2f669eb349b795de2543968a (diff)
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.budea@collabora.com>
-rw-r--r--desktop/source/lib/init.cxx12
-rw-r--r--sfx2/source/control/unoctitm.cxx15
2 files changed, 25 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8b86eb2e4b8f..eabca148f850 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2639,6 +2639,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"),
@@ -2687,9 +2688,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 c9ae7b6e32fe..760376d7b767 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1070,6 +1070,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" ||
@@ -1124,8 +1131,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 ? OUStringLiteral("enabled") : OUStringLiteral("disabled"));
}