[Libreoffice-commits] core.git: unotools/source

Stephan Bergmann sbergman at redhat.com
Mon Dec 14 07:48:57 PST 2015


 unotools/source/config/fontcfg.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c31b6e1a154d3bf94b5346343104cbc00378e51d
Author: Stephan Bergmann <sbergman at redhat.com>
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

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;
                 }
         }


More information about the Libreoffice-commits mailing list