From bb1ad6209de5433fc9f5848539d937f14cc215ce Mon Sep 17 00:00:00 2001 From: Jim Raykowski Date: Mon, 11 Jan 2021 13:34:05 -0900 Subject: 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 --- svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svx') 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() ) -- cgit v1.2.3