summaryrefslogtreecommitdiff
path: root/filter/source/svg
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-08-31 14:09:33 +0200
committerMarco Cecchetti <marco.cecchetti@collabora.com>2015-08-31 19:31:16 +0200
commit4cdeb2cb500b8046d364d7c0517770b6b11a1103 (patch)
treee37abc194458c99c93beadd4cac458010bb99324 /filter/source/svg
parent713692722d52277b847f0baaf7d767684c5df082 (diff)
filter: avoid casting BitmapChecksum to sal_uInt32
Since BitmapChecksum is a typedef for sal_uInt64. Change-Id: I768fa5134fa6e86559f3c6cbe1071093b4e68152
Diffstat (limited to 'filter/source/svg')
-rw-r--r--filter/source/svg/svgexport.cxx2
-rw-r--r--filter/source/svg/svgwriter.cxx12
-rw-r--r--filter/source/svg/svgwriter.hxx2
3 files changed, 8 insertions, 8 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index bad1dc555c1c..794c71342091 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1301,7 +1301,7 @@ bool SVGFilter::implExportTextEmbeddedBitmaps()
MetaAction* pAction = aMtf.GetAction( 0 );
if( pAction )
{
- sal_uInt32 nId = (sal_uInt32)(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 9ec32e65cdd1..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_uInt32 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_uInt32 nId, nChecksum = 0;
+ BitmapChecksum nId, nChecksum = 0;
Point aPt;
Size aSz;
sal_uLong nCount = rMtf.GetActionSize();
@@ -1398,7 +1398,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
case( MetaActionType::BMPSCALE ):
{
const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction);
- nChecksum = (sal_uInt32)(pA->GetBitmap().GetChecksum());
+ nChecksum = pA->GetBitmap().GetChecksum();
aPt = pA->GetPoint();
aSz = pA->GetSize();
}
@@ -1406,7 +1406,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
case( MetaActionType::BMPEXSCALE ):
{
const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction);
- nChecksum = (sal_uInt32)(pA->GetBitmapEx().GetChecksum());
+ nChecksum = pA->GetBitmapEx().GetChecksum();
aPt = pA->GetPoint();
aSz = pA->GetSize();
}
@@ -1781,13 +1781,13 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
return aPathData;
}
-sal_uInt32 SVGActionWriter::GetChecksum( const MetaAction* pAction )
+BitmapChecksum SVGActionWriter::GetChecksum( const MetaAction* pAction )
{
GDIMetaFile aMtf;
MetaAction* pA = const_cast<MetaAction*>(pAction);
pA->Duplicate();
aMtf.AddAction( pA );
- return (sal_uInt32)(aMtf.GetChecksum());
+ return 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 b891cc1aa13d..c99e4cbbd6b0 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_uInt32 GetChecksum( const MetaAction* pAction );
+ static BitmapChecksum GetChecksum( const MetaAction* pAction );
public: