diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-06-12 15:58:17 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-06-13 17:08:36 +0200 |
| commit | 3af0114a295d2a6c600117adb5bcd6689c0c787e (patch) | |
| tree | 262f32143b99a8754e517be454681267cadaa85f /xmlscript | |
| parent | 4edbfa892bfe6ca81c88363b2249e0b7d5eef31f (diff) | |
Introduce O[U]String::toUInt32
...which has become necessary since bd60d41176da540b01d7583cfe00637431967f39
"Handle oveflow in O(U)String::toInt() functions" reduces values in the range
(SAL_MAX_INT32 .. SAL_MAX_UINT32] to zero, but some calls of toInt32(16) relied
on getting a correct (unsigned) value for the whole input range ["0" ..
"FFFFFFFF"] (see libreoffice-4-1 commit 9bf6c83367cedb7be81bf67f30d2147d26c7a8c3
"Revert overflow checks in O[U]String::toInt{32,64} again").
Audited all uses of toInt32/64 with non-decimal radix. (There is still a TODO
comment in oox/source/helper/attributelist.cxx, and
stoc/source/typeconv/convert.cxx will still need some love and test code.)
Change-Id: Iadaca1c0e41dab553687d0ce41c20c10cd657a95
Diffstat (limited to 'xmlscript')
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/imp_share.hxx | 2 | ||||
| -rw-r--r-- | xmlscript/source/xmllib_imexp/imp_share.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index d82dffaf8dd1..2df45c0b1ca0 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -45,7 +45,7 @@ inline sal_Int32 toInt32( OUString const & rStr ) SAL_THROW(()) { sal_Int32 nVal; if (rStr.getLength() > 2 && rStr[ 0 ] == '0' && rStr[ 1 ] == 'x') - nVal = rStr.copy( 2 ).toInt32( 16 ); + nVal = rStr.copy( 2 ).toUInt32( 16 ); else nVal = rStr.toInt32(); return nVal; diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx index bbeeea6bcc31..d0eaf94141a1 100644 --- a/xmlscript/source/xmllib_imexp/imp_share.hxx +++ b/xmlscript/source/xmllib_imexp/imp_share.hxx @@ -45,7 +45,7 @@ inline sal_Int32 toInt32( OUString const & rStr ) SAL_THROW(()) sal_Int32 nVal; if (rStr.getLength() > 2 && rStr[ 0 ] == '0' && rStr[ 1 ] == 'x') { - nVal = rStr.copy( 2 ).toInt32( 16 ); + nVal = rStr.copy( 2 ).toUInt32( 16 ); } else { |