sal_uLong to sal_uInt32 for CRC32

Change-Id: Id13e07f479615b8eb39d05e6534f514277cc3d03

4 files changed, 14 insertions, 11 deletions

diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index c51072753963..db9f332d7b8a 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -787,7 +787,7 @@ void getBitmapData( const BitmapEx& aBmpEx, sal_uInt8*& tgadata, sal_uInt8*& tga
 
 sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQualityLevel )
 {
-    sal_uLong bmpChecksum = bmpSource.GetChecksum();
+    const sal_uInt32 bmpChecksum = bmpSource.GetChecksum();
 
     ChecksumCache::iterator it = mBitmapCache.find(bmpChecksum);
 
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index d600fb9e5694..87891dcce71d 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -421,10 +421,12 @@ bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresentation
 }
 
 
+namespace
+{
 
-sal_uLong GetBitmapChecksum( const MetaAction* pAction )
+sal_uInt32 GetBitmapChecksum( const MetaAction* pAction )
 {
-    sal_uLong nChecksum = 0;
+    sal_uInt32 nChecksum = 0;
     const MetaActionType nType = pAction->GetType();
 
     switch( nType )
@@ -452,6 +454,7 @@ sal_uLong GetBitmapChecksum( const MetaAction* pAction )
     return nChecksum;
 }
 
+}
 
 void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
 {
@@ -506,8 +509,8 @@ bool EqualityBitmap::operator()( const ObjectRepresentation& rObjRep1,
     const GDIMetaFile& aMtf2 = rObjRep2.GetRepresentation();
     if( aMtf1.GetActionSize() == 1 && aMtf2.GetActionSize() == 1 )
     {
-        sal_uLong nChecksum1 = GetBitmapChecksum( aMtf1.GetAction( 0 ) );
-        sal_uLong nChecksum2 = GetBitmapChecksum( aMtf2.GetAction( 0 ) );
+        const sal_uInt32 nChecksum1 = GetBitmapChecksum( aMtf1.GetAction( 0 ) );
+        const sal_uInt32 nChecksum2 = GetBitmapChecksum( aMtf2.GetAction( 0 ) );
         return ( nChecksum1 == nChecksum2 );
     }
     else
@@ -1299,7 +1302,7 @@ bool SVGFilter::implExportTextEmbeddedBitmaps()
             MetaAction* pAction = aMtf.GetAction( 0 );
             if( pAction )
             {
-                sal_uLong nId = GetBitmapChecksum( pAction );
+                const sal_uInt32 nId = GetBitmapChecksum( pAction );
                 sId = "bitmap(" + OUString::number( nId ) + ")";
                 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sId );
 
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index ce0e03bd2d2a..73c01f2f7fdc 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1359,7 +1359,7 @@ void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction
     }
 
     // bitmap placeholder element
-    sal_uLong nId = SVGActionWriter::GetChecksum( pAction );
+    const sal_uInt32 nId = SVGActionWriter::GetChecksum( pAction );
     OUString sId = "bitmap-placeholder("  + msShapeId + "." +
                    OUString::number( nId ) + ")";
 
@@ -1381,7 +1381,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
         const GDIMetaFile& rMtf = *mpTextEmbeddedBitmapMtf;
 
         OUString sId, sRefId;
-        sal_uLong nId, nChecksum = 0;
+        sal_uInt32 nChecksum = 0;
         Point aPt;
         Size  aSz;
         sal_uLong nCount = rMtf.GetActionSize();
@@ -1415,7 +1415,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
             // <g id="?" > (used by animations)
             {
                 // embedded bitmap id
-                nId = SVGActionWriter::GetChecksum( pAction );
+                const sal_uInt32 nId = SVGActionWriter::GetChecksum( pAction );
                 sId = "embedded-bitmap(";
                 sId += msShapeId;
                 sId += ".";
@@ -1779,7 +1779,7 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
      return aPathData;
 }
 
-sal_uLong SVGActionWriter::GetChecksum( const MetaAction* pAction )
+sal_uInt32 SVGActionWriter::GetChecksum( const MetaAction* pAction )
 {
     GDIMetaFile aMtf;
     MetaAction* pA = const_cast<MetaAction*>(pAction);
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 928aad0ea132..e96e5169ff08 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -357,7 +357,7 @@ private:
 public:
 
     static OUString  GetPathString( const tools::PolyPolygon& rPolyPoly, bool bLine );
-    static sal_uLong        GetChecksum( const MetaAction* pAction );
+    static sal_uInt32       GetChecksum( const MetaAction* pAction );
 
 public: