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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8par2.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fcefe800044f89d7fbbfa46262edcf0f39dbcc09
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 7 16:05:19 2020 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Jul 8 22:17:13 2020 +0200

    ofz#23961 pad back to original length
    
    in case of multi-byte input encoding resulting in a shorter output string than
    input
    
    Change-Id: Ieb4bb7b5f4551ca22e87c573233f083901f3d3c0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98273
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 12ce9f9e8db1..f0a12ad3005e 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -615,6 +615,9 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFormat &rNum, WW8_ANLV const &rAV,
             return;
         }
         sText = OUString(reinterpret_cast<char const *>(pText), nLen, eCharSet);
+        // ofz#23961 in case of multi-byte input encoding resulting in shorter
+        // output pad to full length with something semi-arbitrary
+        comphelper::string::padToLength(sText, nLen, cBulletChar);
     }
     else
     {