diff options
author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2015-08-29 14:28:34 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-09-01 16:28:48 +0100 |
commit | c8a46ee5199f42f1f888d5bee765da83a608918f (patch) | |
tree | 058f1169576d60451f4c112661f79865a8d3d011 /filter | |
parent | 31ae4863782b4dfb07573bb96124bb03e44837a7 (diff) |
truncate checksum to 32-bit when it slips inside a file stream
Change-Id: I2cedf8acf73f71529f4090ff2f9fce7ab7663e68
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/svg/svgexport.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 12 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.hxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 1773740f5754..75ccb4541272 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -1302,7 +1302,7 @@ bool SVGFilter::implExportTextEmbeddedBitmaps() MetaAction* pAction = aMtf.GetAction( 0 ); if( pAction ) { - BitmapChecksum nId = GetBitmapChecksum( pAction ); + sal_uInt32 nId = (sal_uInt32)(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 62b9f29afd26..c6665bc3ee50 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 - BitmapChecksum nId = SVGActionWriter::GetChecksum( pAction ); + 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; - BitmapChecksum nId, nChecksum = 0; + sal_uInt32 nId, nChecksum = 0; Point aPt; Size aSz; sal_uLong nCount = rMtf.GetActionSize(); @@ -1396,7 +1396,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() case( MetaActionType::BMPSCALE ): { const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction); - nChecksum = pA->GetBitmap().GetChecksum(); + nChecksum = (sal_uInt32)(pA->GetBitmap().GetChecksum()); aPt = pA->GetPoint(); aSz = pA->GetSize(); } @@ -1404,7 +1404,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() case( MetaActionType::BMPEXSCALE ): { const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction); - nChecksum = pA->GetBitmapEx().GetChecksum(); + nChecksum = (sal_uInt32)(pA->GetBitmapEx().GetChecksum()); aPt = pA->GetPoint(); aSz = pA->GetSize(); } @@ -1779,13 +1779,13 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo return aPathData; } -BitmapChecksum SVGActionWriter::GetChecksum( const MetaAction* pAction ) +sal_uInt32 SVGActionWriter::GetChecksum( const MetaAction* pAction ) { GDIMetaFile aMtf; MetaAction* pA = const_cast<MetaAction*>(pAction); pA->Duplicate(); aMtf.AddAction( pA ); - return aMtf.GetChecksum(); + return (sal_uInt32)(aMtf.GetChecksum()); } void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 280bd52c18f7..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 BitmapChecksum GetChecksum( const MetaAction* pAction ); + static sal_uInt32 GetChecksum( const MetaAction* pAction ); public: |