[Libreoffice-commits] core.git: vcl/unx vcl/win

[udareechk]

 vcl/unx/generic/app/wmadaptor.cxx |   22 +++++++++++-----------
 vcl/win/gdi/salgdi.cxx            |    4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit bafc68b9e72cab0de949a8f2bc49a832c3517623
Author: udareechk <udareeck at gmail.com>
Date:   Thu Sep 21 20:28:07 2017 +0530

    tdf#96505 Get rid of cargo cult long integer literals
    
    Removed 1L and 0L in vcl/ directory files
    
    Change-Id: I0f5d134e0602d00ba058d34054b3dbfbc4233983
    Reviewed-on: https://gerrit.libreoffice.org/42599
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 9eaf1dca34fd..f6ed35dfc5a1 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -1273,7 +1273,7 @@ void WMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eTy
 
         aHint.flags = 15; /* flags for functions, decoration, input mode and status */
         aHint.deco = 0;
-        aHint.func = 1L << 2;
+        aHint.func = 1 << 2;
         aHint.status = 0;
         aHint.input_mode = 0;
 
@@ -1286,28 +1286,28 @@ void WMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eTy
         else
         {
             if( nDecorationFlags & decoration_Title )
-                aHint.deco |= 1L << 3;
+                aHint.deco |= 1 << 3;
             if( nDecorationFlags & decoration_Border )
-                aHint.deco |= 1L << 1;
+                aHint.deco |= 1 << 1;
             if( nDecorationFlags & decoration_Resize )
             {
-                aHint.deco |= 1L << 2;
-                aHint.func |= 1L << 1;
+                aHint.deco |= 1 << 2;
+                aHint.func |= 1 << 1;
             }
             if( nDecorationFlags & decoration_MinimizeBtn )
             {
-                aHint.deco |= 1L << 5;
-                aHint.func |= 1L << 3;
+                aHint.deco |= 1 << 5;
+                aHint.func |= 1 << 3;
             }
             if( nDecorationFlags & decoration_MaximizeBtn )
             {
-                aHint.deco |= 1L << 6;
-                aHint.func |= 1L << 4;
+                aHint.deco |= 1 << 6;
+                aHint.func |= 1 << 4;
             }
             if( nDecorationFlags & decoration_CloseBtn )
             {
-                aHint.deco |= 1L << 4;
-                aHint.func |= 1L << 5;
+                aHint.deco |= 1 << 4;
+                aHint.func |= 1 << 5;
             }
         }
 
diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index 587b3c62bd3e..c79ecc098bcf 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -249,10 +249,10 @@ void ImplInitSalGDI()
                 pColors[ n ] = (short)( n + DITHER_MAX_SYSCOLOR );
 
             for( n = 0; n < 256; n++ )
-                pSalData->mpDitherDiff[ n ] = n % 51L;
+                pSalData->mpDitherDiff[ n ] = n % 51;
 
             for( n = 0; n < 256; n++ )
-                pSalData->mpDitherLow[ n ] = (BYTE) ( n / 51L );
+                pSalData->mpDitherLow[ n ] = (BYTE) ( n / 51 );
 
             for( n = 0; n < 256; n++ )
                 pSalData->mpDitherHigh[ n ] = (BYTE)std::min( pSalData->mpDitherLow[ n ] + 1, 5 );