include/xmloff/xmltkmap.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 548ab842a845e1e51922c8928be4ee57c8909146 Author: Stephan Bergmann <[email protected]> Date: Tue Sep 6 14:36:28 2016 +0200 Again avoid UBSan "left shift of 65536 by 16 places cannot be represented... ...in type 'int'"; i.e., re-apply 11cc9bdc21be241f2feb3ab4822d9d365dba4f96 "Avoid UBSan 'left shift of 65536 by 16 places cannot be represented..." after 67ef208b2b586603e205105a384231645d7f6712 "Fixes for migrating SvXMLImport to use FastParser" removed that fix, for no apparent reason. Change-Id: I8379d2ae8a39ce8a655688d1168d8de67186472a diff --git a/include/xmloff/xmltkmap.hxx b/include/xmloff/xmltkmap.hxx index c9f0bee..89cfd65 100644 --- a/include/xmloff/xmltkmap.hxx +++ b/include/xmloff/xmltkmap.hxx @@ -44,7 +44,7 @@ struct SvXMLTokenMapEntry nPrefixKey( nPrefix ), eLocalName( eName ), nToken( nTok ), - nFastToken( ( sal_Int32( nPrefixKey + 1 ) ) << 16 | eLocalName ) + nFastToken( sal_uInt32( nPrefixKey + 1 ) << 16 | eLocalName ) { if ( nFastTok ) // alternative value for duplicate/dummy tokens nFastToken = nFastTok; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
