unotools/source/config/fontcfg.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 32beafbad3fe21991f5aac7656b8c1b2626570aa Author: Stephan Bergmann <[email protected]> Date: Mon Dec 14 16:47:38 2015 +0100 Silence warning C4334 under --enble-64-bit MSVC ("'<<' : result of 32-bit shift implicitly converted to 64 bits") Change-Id: I738fe94ec559e2a35ffc32fb91c22c06094cff9f (cherry picked from commit c31b6e1a154d3bf94b5346343104cbc00378e51d) Reviewed-on: https://gerrit.libreoffice.org/25065 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index d343450..2b5105a 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -1004,7 +1004,7 @@ ImplFontAttrs FontSubstConfiguration::getSubstType( const css::uno::Reference< X for( int k = 0; k < 32; k++ ) if( aToken.equalsIgnoreAsciiCaseAscii( pAttribNames[k] ) ) { - type |= 1UL << k; + type |= sal_uLong(1) << k; break; } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
