From 3af0114a295d2a6c600117adb5bcd6689c0c787e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 12 Jun 2013 15:58:17 +0200 Subject: 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 --- xmloff/source/style/xmlnumfe.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'xmloff/source/style/xmlnumfe.cxx') diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 8beeab70abe3..8e0b23b6c8d6 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -400,8 +400,11 @@ void SvXMLNumFmtExport::WriteCurrencyElement_Impl( const OUString& rString, if ( !rExt.isEmpty() ) { - sal_Int32 nLang = rExt.toInt32(16); // hex - if ( nLang < 0 ) // extension string may contain "-" separator + // rExt should be a 16-bit hex value max FFFF which may contain a + // leading "-" separator (that is not a minus sign, but toInt32 can be + // used to parse it, with post-processing as necessary): + sal_Int32 nLang = rExt.toInt32(16); + if ( nLang < 0 ) nLang = -nLang; AddLanguageAttr_Impl( nLang ); // adds to pAttrList } -- cgit