sw/source/filter/ww8/ww8par2.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 4bc9d9d0c49881ca8f66f7e744174ee6f8ff4ae3
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jul 7 16:05:19 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jul 8 15:01:30 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/+/98272
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index db9f07ec5ce6..407b6e91aae6 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -609,6 +609,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
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
