summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-12-14 16:47:38 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2016-05-17 14:06:39 +0000
commit32beafbad3fe21991f5aac7656b8c1b2626570aa (patch)
treee44b26fe1155928789b39bbcc7352f2b9549a299
parentdc5ab01a75877d4f4c79b7ff734d3f41a232c31f (diff)
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 <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--unotools/source/config/fontcfg.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index d3434500769e..2b5105a26f78 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;
}
}