[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

[Mike Kaganski (via logerrit)]

 sc/source/ui/app/inputwin.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 892b077706515a71a84ec16350f4f542cc60015e
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Dec 2 12:39:56 2019 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Mon Dec 16 13:40:48 2019 +0100

    tdf#129141: paint all when in multiline mode
    
    ... otherwise it assumes that only part of first string to the right of the
    unchanged string part needs redrawing (which would be to the right of the
    control itself)
    
    Change-Id: I2833c1eb2026041b11d0b72431b164d2ee3befef
    Reviewed-on: https://gerrit.libreoffice.org/84207
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 68a8467723f69f5ab61d2bee5e83984c5584af41)
    Reviewed-on: https://gerrit.libreoffice.org/84259
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 4fd72988df22..7ead3b5df503 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1792,10 +1792,8 @@ void ScTextWnd::SetTextString( const OUString& rNewString )
         // Find position of the change, only paint the rest
         if (!mpEditEngine)
         {
-            bool bPaintAll;
-            if ( bIsRTL )
-                bPaintAll = true;
-            else
+            bool bPaintAll = mnLines > 1 || bIsRTL;
+            if (!bPaintAll)
             {
                 //  test if CTL script type is involved
                 SvtScriptType nOldScript = SvtScriptType::NONE;
@@ -1813,7 +1811,7 @@ void ScTextWnd::SetTextString( const OUString& rNewString )
 
             if ( bPaintAll )
             {
-                // if CTL is involved, the whole text has to be redrawn
+                // In multiline mode, or if CTL is involved, the whole text has to be redrawn
                 Invalidate();
             }
             else