[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - cui/source svx/source

[Jim Raykowski (via logerrit)]

 cui/source/tabpages/paragrph.cxx                        |    6 ++----
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit cd4b646040b56c1b75dd9913c6d1f5b2751f155f
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Mon Jan 11 13:34:05 2021 -0900
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jan 12 11:59:45 2021 +0100

    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/+/109114
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 5f6ae38d3ad9..a39fc84c6d83 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 )) );
 
@@ -724,7 +722,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 4e52822f71c4..1f6618b360cf 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() )