diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2021-01-11 13:34:05 -0900 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-01-14 08:35:15 +0100 |
| commit | bb1ad6209de5433fc9f5848539d937f14cc215ce (patch) | |
| tree | 86c62239369d7ba1f21249560760b1efa81bbe81 | |
| parent | a4a301c67f4de992d2f4bc66721abd21ebd67494 (diff) | |
tdf#83618 Make line spacing values agree crash fix
The intent of this patch is to fix the crash reported at https://
bugzilla.redhat.com/show_bug.cgi?id=1913828 by reverting changes made to
cui/source/tabpages/paragraph.cxx in commit
849b837d1a3b185a8dd893a8f6eaed53605bcab1 and changing the change made to
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx to use the
already available pointer to the current SfxViewFrame instead of calling
the SfxViewFrame::Current function again.
Change-Id: I0c440c576c2afe4fb98ed54d51d91ea16a7f902a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109113
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | cui/source/tabpages/paragrph.cxx | 6 | ||||
| -rw-r--r-- | svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 6ad843bdc9b3..eaa0daf23cfe 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -51,8 +51,6 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> -#include <sfx2/viewfrm.hxx> - const sal_uInt16 SvxStdParagraphTabPage::pStdRanges[] = { SID_ATTR_PARA_LINESPACE, // 10033 @@ -232,7 +230,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) m_xLineDistAtMetricBox->get_value_changed_from_saved() ) ) { nWhich = GetWhich( SID_ATTR_PARA_LINESPACE ); - MapUnit eUnit = SfxViewFrame::Current()->GetPool().GetMetric( nWhich ); + MapUnit eUnit = pPool->GetMetric( nWhich ); SvxLineSpacingItem aSpacing( static_cast<const SvxLineSpacingItem&>(GetItemSet().Get( nWhich )) ); @@ -722,7 +720,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl const SvxLineSpacingItem &rAttr ) { - MapUnit eUnit = SfxViewFrame::Current()->GetPool().GetMetric( rAttr.Which() ); + MapUnit eUnit = GetItemSet().GetPool()->GetMetric( rAttr.Which() ); switch( rAttr.GetLineSpaceRule() ) { diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 3066d8f08e32..2efea182c0d4 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -115,7 +115,7 @@ void ParaLineSpacingControl::Initialize() if( eState >= SfxItemState::DEFAULT ) { - MapUnit eUnit = SfxViewFrame::Current()->GetPool().GetMetric( currSPItem->Which() ); + MapUnit eUnit = pCurrent->GetPool().GetMetric(currSPItem->Which()); meLNSpaceUnit = eUnit; switch( currSPItem->GetLineSpaceRule() ) |