[Libreoffice-commits] core.git: sw/source

[Justin Luth (via logerrit)]

 sw/source/core/text/itrform2.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7e99d1010e90becb255d9f64fe2604e4d950e01e
Author:     Justin Luth <justin.l...@collabora.com>
AuthorDate: Fri Mar 31 14:28:02 2023 -0400
Commit:     Justin Luth <jl...@mail.com>
CommitDate: Sat Apr 8 23:38:12 2023 +0200

    itrform2 use GetTextFrame consistently
    
    It make code reading easier if you use the same term
    for the same item.
    
    Change-Id: Iaf64a374a87eeb0ed01869b7772ab671d4b0ef41
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149896
    Reviewed-by: Justin Luth <jl...@mail.com>
    Tested-by: Jenkins

diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 3e5d03ff7521..a6a8229721d0 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -2728,12 +2728,12 @@ void SwTextFormatter::CalcFlyWidth( SwTextFormatInfo 
&rInf )
         if( GetTextFrame()->getFramePrintArea().Left() < 0 )
             nFrameLeft += GetTextFrame()->getFramePrintArea().Left();
         if( aInter.Left() < nFrameLeft )
-            aInter.Left( nFrameLeft );
+            aInter.Left(nFrameLeft); // both sets left and reduces width
 
         tools::Long nAddMar = 0;
-        if ( m_pFrame->IsRightToLeft() )
+        if (GetTextFrame()->IsRightToLeft())
         {
-            nAddMar = m_pFrame->getFrameArea().Right() - Right();
+            nAddMar = GetTextFrame()->getFrameArea().Right() - Right();
             if ( nAddMar < 0 )
                 nAddMar = 0;
         }