diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2019-11-28 14:22:26 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2019-11-29 13:43:28 +0100 |
| commit | 88b0cb4c31d0631ff8db1e4842dc1431ae6d0234 (patch) | |
| tree | 373efb887765bfa05029308917694734d2e2f0f9 /sw | |
| parent | 5e55f7a54170b25aaf82520c1cde307ece362eef (diff) | |
jsdialog: migrate after/before spacing to generic items dump
Change-Id: I18f0596baa8e1136f4546a943eafab9a13929c06
Reviewed-on: https://gerrit.libreoffice.org/83999
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/uiview/viewtab.cxx | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index f52cf5617664..f5941793eadb 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -62,8 +62,6 @@ #include <ndtxt.hxx> #include <pam.hxx> #include <comphelper/lok.hxx> -#include <LibreOfficeKit/LibreOfficeKitEnums.h> -#include <editeng/itemtype.hxx> #include <IDocumentSettingAccess.hxx> @@ -1584,24 +1582,6 @@ void SwView::StateTabWin(SfxItemSet& rSet) aUL.SetWhich( nWhich ); rSet.Put( aUL ); } - - if (comphelper::LibreOfficeKit::isActive()) - { - // TODO: set correct unit - MapUnit eTargetUnit = MapUnit::MapInch; - - OUString sUpper = GetMetricText(aUL.GetUpper(), - MapUnit::MapTwip, eTargetUnit, nullptr); - - OUString sLower = GetMetricText(aUL.GetLower(), - MapUnit::MapTwip, eTargetUnit, nullptr); - - OUString sPayload = ".uno:ULSpacing={\"upper\": \"" + sUpper + - "\", \"lower\": \"" + sLower + "\"}"; - - GetViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED, - OUStringToOString(sPayload, RTL_TEXTENCODING_ASCII_US).getStr()); - } } else { @@ -2455,6 +2435,10 @@ void SwView::StateTabWin(SfxItemSet& rSet) } nWhich = aIter.NextWhich(); } + + SfxViewShell* pViewShell = SfxViewShell::Current(); + if (pViewShell && comphelper::LibreOfficeKit::isActive()) + pViewShell->sendUnoStatus( &rSet ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |