diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-05-21 17:44:32 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-05-21 21:09:57 +0200 |
| commit | 2634bc59092b24217d984a5845365d703bdb08d2 (patch) | |
| tree | a3b7324d54aefb57d5f012c7aeb1b80d07fce75b /sw/source/filter/xml/xmlithlp.cxx | |
| parent | c912c4b02b2dc4cd5aa62d77e92e1731c6cbde65 (diff) | |
sw: replace most static_cast<sal_uInt16>() calls with o3tl::narrowing()
o3tl::narrowing() is a better way to handle this, as that way the
integer conversion is still implicit, which allows detecting integer
truncation at runtime (with suitable compiler flags).
Change-Id: I499abda3be6943e8c111c56df390e72939586221
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115948
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/source/filter/xml/xmlithlp.cxx')
| -rw-r--r-- | sw/source/filter/xml/xmlithlp.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index 552170949d91..57f845e206f8 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -26,6 +26,7 @@ #include <xmloff/xmluconv.hxx> #include <osl/diagnose.h> +#include <o3tl/safeint.hxx> #include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/text/HoriOrientation.hpp> @@ -114,7 +115,7 @@ bool sw_frmitems_parseXMLBorder( std::u16string_view rValue, else if( !rHasWidth && rUnitConverter.convertMeasureToCore(nTemp, aToken, 0, USHRT_MAX)) { - rWidth = static_cast<sal_uInt16>(nTemp); + rWidth = o3tl::narrowing<sal_uInt16>(nTemp); rHasWidth = true; } else |