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

[Adam Co]

 sw/source/core/text/pormulti.cxx |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 221643376f1bd5bd6be1738c0ea1b62fb646aaca
Author: Adam Co <rattles2013 at gmail.com>
Date:   Thu Oct 10 13:43:05 2013 +0200

    fdo#66399 - fix rendering of 'two lines in one'
    
    Change-Id: I0362714a270af47f1a0bd839f6ecbc257d5e088d
    Reviewed-on: https://gerrit.libreoffice.org/6187
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 05bf26f..95e0f91 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -2006,7 +2006,16 @@ sal_Bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
             if( pLine )
             {
                 GetInfo().SetMulti( sal_True );
-                CalcNewBlock( pLine, NULL, rMulti.Width() );
+
+                // If the fourth element bSkipKashida of function CalcNewBlock is true, multiportion will be showed in justification.
+                // Kashida (Persian) is a type of justification used in some cursive scripts, particularly Arabic.
+                // In contrast to white-space justification, which increases the length of a line of text by expanding spaces between words or individual letters,
+                // kashida justification is accomplished by elongating characters at certain chosen points.
+                // Kashida justification can be combined with white-space justification to various extents.
+                // The default value of bSkipKashida (the 4th parameter passed to 'CalcNewBlock') is false.
+                // Only when Adjust is SVX_ADJUST_BLOCK ( alignment is justify ), multiportion will be showed in justification in new code.
+                CalcNewBlock( pLine, NULL, rMulti.Width(), GetAdjust() != SVX_ADJUST_BLOCK );
+
                 GetInfo().SetMulti( sal_False );
             }
             rInf.SetIdx( nStartIdx );