include/oox/drawingml/drawingmltypes.hxx | 2 +-
sw/qa/core/data/ooxml/fail/ofz37458-1.docx |binary
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 238951d0c539d1e294a1a12f2cf7aa806af8e116
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Aug 22 12:25:12 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 23 17:59:08 2021 +0200
ofz#37458 use o3tl::convertSaturate in convertEmuToHmm
Change-Id: Ic177ca6042cbedc4cbe70e1f35ac3d85c1fa2f7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120840
Tested-by: Jenkins
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/oox/drawingml/drawingmltypes.hxx
b/include/oox/drawingml/drawingmltypes.hxx
index 873fb76435a8..05d218fa882e 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -181,7 +181,7 @@ inline sal_Int64 convertHmmToEmu( sal_Int32 nValue )
inline sal_Int32 convertEmuToHmm( sal_Int64 nValue )
{
return getLimitedValue<sal_Int32, sal_Int64>(
- o3tl::convert(nValue, o3tl::Length::emu, o3tl::Length::mm100),
SAL_MIN_INT32,
+ o3tl::convertSaturate(nValue, o3tl::Length::emu, o3tl::Length::mm100),
SAL_MIN_INT32,
SAL_MAX_INT32);
}
diff --git a/sw/qa/core/data/ooxml/fail/ofz37458-1.docx
b/sw/qa/core/data/ooxml/fail/ofz37458-1.docx
new file mode 100644
index 000000000000..04e7d6062978
Binary files /dev/null and b/sw/qa/core/data/ooxml/fail/ofz37458-1.docx differ
