diff options
| author | Henry Castro <hcastro@collabora.com> | 2016-07-06 13:15:17 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2016-07-06 18:05:12 +0000 |
| commit | 880e013d7c9a4457de4fe6c7038a25f1b5a03c4c (patch) | |
| tree | d30d0126a882ed20a582976074dacbd968b07e5d | |
| parent | 57440dfcbd552f1e601d74d888f3887b126f8cb1 (diff) | |
sc lok: add toolbar item wrap text and merge cells
Change-Id: I266b7171ee0a8a324ee8f71680f76c132b5c5fbd
Reviewed-on: https://gerrit.libreoffice.org/26985
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/unoctitm.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 352ccd595a99..da3a459ec6d2 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1009,7 +1009,9 @@ static void doc_iniUnoCommands () OUString(".uno:SelectionMode"), OUString(".uno:PageStatus"), OUString(".uno:LayoutStatus"), - OUString(".uno:Context") + OUString(".uno:Context"), + OUString(".uno:WrapText"), + OUString(".uno:ToggleMergeCells") }; util::URL aCommandURL; diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 138a82b573c4..d759fa4556f5 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1051,7 +1051,9 @@ static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const c aBuffer.append(aString); } } - else if (aEvent.FeatureURL.Path == "InsertMode") + else if (aEvent.FeatureURL.Path == "InsertMode" || + aEvent.FeatureURL.Path == "WrapText" || + aEvent.FeatureURL.Path == "ToggleMergeCells") { sal_Bool aBool; |