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

Justin Luth justin_luth at sil.org
Thu Jan 19 04:11:49 UTC 2017


 sw/source/core/text/itrpaint.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 7c817d73402583f1b077d31a695c565a53468887
Author: Justin Luth <justin_luth at sil.org>
Date:   Wed Jan 18 22:29:08 2017 +0300

    tdf#35021 TAB_OVER_MARGIN pdf support for left/center/dec
    
    also related to tdf#93637 which first raised the issue of
    pdf support for right-tabovermargin.
    
    Change-Id: Icabe2d0ac2dfe9181edde9dadfb0ab85f9ed4402
    Reviewed-on: https://gerrit.libreoffice.org/33279
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index be1b63a..76987a3 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -170,12 +170,15 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
         SwLinePortion* pPorIter = pPor;
         while( pPorIter )
         {
-            if( pPorIter->IsTabRightPortion() )
+            if( pPorIter->InTabGrp() )
             {
-               const SwTabRightPortion *pRightTabPor = static_cast<SwTabRightPortion*>(pPorIter);
-               const SwTwips nTabPos = nTmpLeft + pRightTabPor->GetTabPos();
+               const SwTabPortion* pTabPor = static_cast<SwTabPortion*>(pPorIter);
+               const SwTwips nTabPos = nTmpLeft + pTabPor->GetTabPos();
                 if( nMaxRight < nTabPos )
-                    nMaxRight = std::min( rPaint.Right(), nTabPos );
+                {
+                    nMaxRight = rPaint.Right();
+                    break;
+                }
             }
             pPorIter = pPorIter->GetPortion();
         }


More information about the Libreoffice-commits mailing list