sal_uLong to sal_uInt32 for CRC32

Change-Id: Id13e07f479615b8eb39d05e6534f514277cc3d03

8 files changed, 16 insertions, 16 deletions

diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index 1fa17f8bb84d..412dcecda242 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -40,7 +40,7 @@ class ImpBitmap
 {
 private:
     sal_uLong           mnRefCount;
-    sal_uLong           mnChecksum;
+    sal_uInt32          mnChecksum;
     SalBitmap*          mpSalBitmap;
 
 public:
@@ -68,8 +68,8 @@ public:
     void                ImplIncRefCount() { mnRefCount++; }
     void                ImplDecRefCount() { mnRefCount--; }
 
-    inline void         ImplSetChecksum( sal_uLong nChecksum ) { mnChecksum = nChecksum; }
-    inline sal_uLong    ImplGetChecksum() const { return mnChecksum; }
+    inline void         ImplSetChecksum( sal_uInt32 nChecksum ) { mnChecksum = nChecksum; }
+    inline sal_uInt32   ImplGetChecksum() const { return mnChecksum; }
 
     bool                ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag );
     bool                ImplReplace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol );
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 6baed716244b..b68e6d3484d0 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -145,7 +145,7 @@ private:
     GfxLink             ImplGetLink();
     bool                ImplIsLink() const;
 
-    sal_uLong               ImplGetChecksum() const;
+    sal_uInt32          ImplGetChecksum() const;
 
     bool                ImplExportNative( SvStream& rOStm ) const;
 
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index bd03f5423c5f..c1f8f4b4123a 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -31,7 +31,7 @@
 
 sal_uLong Animation::mnAnimCount = 0UL;
 
-sal_uLong AnimationBitmap::GetChecksum() const
+sal_uInt32 AnimationBitmap::GetChecksum() const
 {
     sal_uInt32  nCrc = aBmpEx.GetChecksum();
     SVBT32      aBT32;
@@ -206,7 +206,7 @@ sal_uLong Animation::GetSizeBytes() const
     return nSizeBytes;
 }
 
-sal_uLong Animation::GetChecksum() const
+sal_uInt32 Animation::GetChecksum() const
 {
     SVBT32      aBT32;
     sal_uInt32  nCrc = GetBitmapEx().GetChecksum();
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 16e300c19de5..9a69eb0f8af1 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -286,9 +286,9 @@ bool Bitmap::HasGreyPalette() const
     return bRet;
 }
 
-sal_uLong Bitmap::GetChecksum() const
+sal_uInt32 Bitmap::GetChecksum() const
 {
-    sal_uLong nRet = 0UL;
+    sal_uInt32 nRet = 0;
 
     if( mpImpBmp )
     {
@@ -329,9 +329,9 @@ sal_uLong Bitmap::GetChecksum() const
                                       pRAcc->GetPaletteEntryCount() * sizeof( BitmapColor ) );
                 }
 
-                nCrc = rtl_crc32( nCrc, pRAcc->GetBuffer(), pRAcc->GetScanlineSize() * pRAcc->Height() );
+                nRet = rtl_crc32( nCrc, pRAcc->GetBuffer(), pRAcc->GetScanlineSize() * pRAcc->Height() );
 
-                mpImpBmp->ImplSetChecksum( nRet = nCrc );
+                mpImpBmp->ImplSetChecksum( nRet );
             }
 
             if (pRAcc) ReleaseAccess( pRAcc );
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index e59d4ab2f76a..1a28a2536c21 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -308,7 +308,7 @@ sal_uLong BitmapEx::GetSizeBytes() const
     return nSizeBytes;
 }
 
-sal_uLong BitmapEx::GetChecksum() const
+sal_uInt32 BitmapEx::GetChecksum() const
 {
     sal_uInt32  nCrc = aBitmap.GetChecksum();
     SVBT32      aBT32;
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 55cb26bf05f7..9979e3cc3fe1 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2340,14 +2340,14 @@ GDIMetaFile GDIMetaFile::GetMonochromeMtf( const Color& rColor ) const
     return aRet;
 }
 
-sal_uLong GDIMetaFile::GetChecksum() const
+sal_uInt32 GDIMetaFile::GetChecksum() const
 {
     GDIMetaFile         aMtf;
     SvMemoryStream      aMemStm( 65535, 65535 );
     ImplMetaWriteData   aWriteData;
     SVBT16              aBT16;
     SVBT32              aBT32;
-    sal_uLong               nCrc = 0;
+    sal_uInt32          nCrc = 0;
 
     aWriteData.meActualCharSet = aMemStm.GetStreamCharSet();
     for( size_t i = 0, nObjCount = GetActionSize(); i < nObjCount; i++ )
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index cd7cfc36a203..93acaa1d8914 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -535,7 +535,7 @@ bool Graphic::IsLink() const
     return mpImpGraphic->ImplIsLink();
 }
 
-sal_uLong Graphic::GetChecksum() const
+sal_uInt32 Graphic::GetChecksum() const
 {
     return mpImpGraphic->ImplGetChecksum();
 }
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index e7626e347f82..9dc9a32297a4 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1360,9 +1360,9 @@ bool ImpGraphic::ImplIsLink() const
     return ( mpGfxLink != NULL );
 }
 
-sal_uLong ImpGraphic::ImplGetChecksum() const
+sal_uInt32 ImpGraphic::ImplGetChecksum() const
 {
-    sal_uLong nRet = 0;
+    sal_uInt32 nRet = 0;
 
     if( ImplIsSupportedGraphic() && !ImplIsSwapOut() )
     {