diff options
author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2015-08-27 15:25:11 +0200 |
---|---|---|
committer | Marco Cecchetti <marco.cecchetti@collabora.com> | 2015-08-31 19:31:13 +0200 |
commit | 057c2a227a65c3dbab42ed740327d0d9bda706cf (patch) | |
tree | 9b90665cf8010382f5bccd4baea93692410d1afe /filter/source/svg | |
parent | f48893ab4e86757564bec0f64d3c9d440497d047 (diff) |
Switching to 64-bit checksum: substituted sal_uLong with BitmapChecksum
A typedef sal_uLong BitmapChecksum;
has been added to include/vcl/checksum.hxx
Wherever needed sal_uLong and sal_Int32 has been substituted with
BitmapChecksum.
A BITMAP_CHECKSUM_BITS constant equal to the amount of bits used by the
BitmapChecksum type has been defined and used in
`GraphicID::GetIDString` (vstools/source/graphic/grfcache.cxx).
Change-Id: I74bd285089e58a8b18c06233d75b87023c7bf31b
Diffstat (limited to 'filter/source/svg')
-rw-r--r-- | filter/source/svg/svgexport.cxx | 10 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 6 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.hxx | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index a697793e5473..794c71342091 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -422,9 +422,9 @@ bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresentation -sal_uLong GetBitmapChecksum( const MetaAction* pAction ) +BitmapChecksum GetBitmapChecksum( const MetaAction* pAction ) { - sal_uLong nChecksum = 0; + BitmapChecksum nChecksum = 0; const MetaActionType nType = pAction->GetType(); switch( nType ) @@ -506,8 +506,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 ) ); + BitmapChecksum nChecksum1 = GetBitmapChecksum( aMtf1.GetAction( 0 ) ); + BitmapChecksum nChecksum2 = GetBitmapChecksum( aMtf2.GetAction( 0 ) ); return ( nChecksum1 == nChecksum2 ); } else @@ -1301,7 +1301,7 @@ bool SVGFilter::implExportTextEmbeddedBitmaps() MetaAction* pAction = aMtf.GetAction( 0 ); if( pAction ) { - sal_uLong nId = GetBitmapChecksum( pAction ); + BitmapChecksum 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 56c5f76199e3..98e8484ff5c1 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1361,7 +1361,7 @@ void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction } // bitmap placeholder element - sal_uLong nId = SVGActionWriter::GetChecksum( pAction ); + BitmapChecksum nId = SVGActionWriter::GetChecksum( pAction ); OUString sId = "bitmap-placeholder(" + msShapeId + "." + OUString::number( nId ) + ")"; @@ -1383,7 +1383,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() const GDIMetaFile& rMtf = *mpTextEmbeddedBitmapMtf; OUString sId, sRefId; - sal_uLong nId, nChecksum = 0; + BitmapChecksum nId, nChecksum = 0; Point aPt; Size aSz; sal_uLong nCount = rMtf.GetActionSize(); @@ -1781,7 +1781,7 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo return aPathData; } -sal_uLong SVGActionWriter::GetChecksum( const MetaAction* pAction ) +BitmapChecksum 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 42efe63add03..808bbadfad6b 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -371,7 +371,7 @@ private: public: static OUString GetPathString( const tools::PolyPolygon& rPolyPoly, bool bLine ); - static sal_uLong GetChecksum( const MetaAction* pAction ); + static BitmapChecksum GetChecksum( const MetaAction* pAction ); public: |