diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2019-06-04 15:49:12 -0800 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2019-10-08 11:19:53 +0200 |
| commit | fe3c08b5905a837cb63f57cefc8e43787c96b9c6 (patch) | |
| tree | e844d20cb66910c4f7fd768d66794972c051d9c3 /cui | |
| parent | Related: tdf#124601 DOC import: improve fLayoutInCell handling (diff) | |
| download | core-fe3c08b5905a837cb63f57cefc8e43787c96b9c6.tar.gz core-fe3c08b5905a837cb63f57cefc8e43787c96b9c6.zip | |
tdf#83618 Make line spacing values agree
Change-Id: I372a673bbad442d28314498248b12ce7f86fce09
Reviewed-on: https://gerrit.libreoffice.org/73737
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
(cherry picked from commit 849b837d1a3b185a8dd893a8f6eaed53605bcab1)
Reviewed-on: https://gerrit.libreoffice.org/80314
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/paragrph.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 9c9bca1963c8..67e1817b1c0e 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -54,6 +54,8 @@ #include <sfx2/request.hxx> #include <svl/intitem.hxx> +#include <sfx2/viewfrm.hxx> + const sal_uInt16 SvxStdParagraphTabPage::pStdRanges[] = { SID_ATTR_PARA_LINESPACE, // 10033 @@ -228,7 +230,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) m_xLineDistAtMetricBox->get_value_changed_from_saved() ) ) { nWhich = GetWhich( SID_ATTR_PARA_LINESPACE ); - MapUnit eUnit = pPool->GetMetric( nWhich ); + MapUnit eUnit = SfxViewFrame::Current()->GetPool().GetMetric( nWhich ); SvxLineSpacingItem aSpacing( static_cast<const SvxLineSpacingItem&>(GetItemSet().Get( nWhich )) ); @@ -719,7 +721,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl const SvxLineSpacingItem &rAttr ) { - MapUnit eUnit = GetItemSet().GetPool()->GetMetric( rAttr.Which() ); + MapUnit eUnit = SfxViewFrame::Current()->GetPool().GetMetric( rAttr.Which() ); switch( rAttr.GetLineSpaceRule() ) { |