summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2021-01-11 13:34:05 -0900
committerXisco Fauli <xiscofauli@libreoffice.org>2021-01-14 08:35:15 +0100
commitbb1ad6209de5433fc9f5848539d937f14cc215ce (patch)
tree86c62239369d7ba1f21249560760b1efa81bbe81 /svx
parenta4a301c67f4de992d2f4bc66721abd21ebd67494 (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>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx2
1 files changed, 1 insertions, 1 deletions
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() )