[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source

[Libreoffice Gerrit user]

 editeng/source/editeng/impedit3.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6a25245b37437e66f501338f17d6b54825a266d3
Author:     AlicVB <dev at lnaa.fr>
AuthorDate: Wed Oct 17 22:03:24 2018 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Wed Nov 28 22:47:59 2018 +0100

    tdf#120525 fix linespacing <100% for impress
    
    apply linespacing changes even for fonts with big descent values
    
    Change-Id: If1763da1ea015822d90a5c7410ca90dcaa71d22f
    Reviewed-on: https://gerrit.libreoffice.org/61894
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 87239dbf7d57d812cdecbf75f6e86afaa4864abb)
    Reviewed-on: https://gerrit.libreoffice.org/64190
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 7cc6dfddb695..fc383b9555ad 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1451,10 +1451,10 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
                     sal_uInt16 nNewAscent = pLine->GetTxtHeight() * nPropLineSpace / 100 * 4 / 5; // 80%
                     if ( !nAscent || nAscent > nNewAscent )
                     {
-                        sal_uInt16 nHeight = pLine->GetHeight() * nPropLineSpace / 100;
-                        pLine->SetHeight( nHeight, pLine->GetTxtHeight() );
                         pLine->SetMaxAscent( nNewAscent );
                     }
+                    sal_uInt16 nHeight = pLine->GetHeight() * nPropLineSpace / 100;
+                    pLine->SetHeight( nHeight, pLine->GetTxtHeight() );
                 }
                 else if ( rLSItem.GetPropLineSpace() && ( rLSItem.GetPropLineSpace() != 100 ) )
                 {