we don't want any of these to be streamed out/in as 64bit values

3 files changed, 21 insertions, 21 deletions

diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 6475d28824ee..3d2ce16baf43 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -226,7 +226,7 @@ private:
     void METPartialArcAtCurPos(Point aCenter, double fMultiplier,
                                double fStartAngle, double fSweepAngle);
     void METChrStr(Point aPt, String aStr);
-    void METSetArcParams(long nP, long nQ, long nR, long nS);
+    void METSetArcParams(sal_Int32 nP, sal_Int32 nQ, sal_Int32 nR, sal_Int32 nS);
     void METSetColor(Color aColor);
     void METSetBackgroundColor(Color aColor);
     void METSetMix(RasterOp eROP);
@@ -352,8 +352,8 @@ void METWriter::WritePoint(Point aPt)
 {
     Point aNewPt = pCompDev->LogicToLogic( aPt, aPictureMapMode, aTargetMapMode );
 
-    *pMET << (long) ( aNewPt.X() - aPictureRect.Left() )
-          << (long) ( aPictureRect.Bottom() - aNewPt.Y() );
+    *pMET << (sal_Int32) ( aNewPt.X() - aPictureRect.Left() )
+          << (sal_Int32) ( aPictureRect.Bottom() - aNewPt.Y() );
 }
 
 
@@ -1359,7 +1359,7 @@ void METWriter::METFullArc(Point aCenter, double fMultiplier)
     WillWriteOrder(14);
     *pMET << (sal_uInt8)0xc7 << (sal_uInt8)12;
     WritePoint(aCenter);
-    *pMET << (long)(fMultiplier*65536.0+0.5);
+    *pMET << (sal_Int32)(fMultiplier*65536.0+0.5);
 }
 
 
@@ -1375,9 +1375,9 @@ void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier,
     WillWriteOrder(22);
     *pMET << (sal_uInt8)0xa3 << (sal_uInt8)20;
     WritePoint(aCenter);
-    *pMET << (long)(fMultiplier*65536.0+0.5);
-    *pMET << (long)(fStartAngle*65536.0+0.5);
-    *pMET << (long)(fSweepAngle*65536.0+0.5);
+    *pMET << (sal_Int32)(fMultiplier*65536.0+0.5);
+    *pMET << (sal_Int32)(fStartAngle*65536.0+0.5);
+    *pMET << (sal_Int32)(fSweepAngle*65536.0+0.5);
 }
 
 
@@ -1395,7 +1395,7 @@ void METWriter::METChrStr( Point aPt, String aUniStr )
 }
 
 
-void METWriter::METSetArcParams(long nP, long nQ, long nR, long nS)
+void METWriter::METSetArcParams(sal_Int32 nP, sal_Int32 nQ, sal_Int32 nR, sal_Int32 nS)
 {
     WillWriteOrder(18);
     *pMET << (sal_uInt8)0x22 << (sal_uInt8)16 << nP << nQ << nR << nS;
@@ -1456,13 +1456,13 @@ void METWriter::METSetChrCellSize(Size aSize)
     aMETChrCellSize=aSize;
     WillWriteOrder(10);
     if (aSize.Width()==0) aSize.Width()=aSize.Height();
-    *pMET << (sal_uInt8)0x33 << (sal_uInt8)8 << (long)aSize.Width() << (long)aSize.Height();
+    *pMET << (sal_uInt8)0x33 << (sal_uInt8)8 << (sal_Int32)aSize.Width() << (sal_Int32)aSize.Height();
 }
 
 
 void METWriter::METSetChrAngle(short nAngle)
 {
-    long nax,nay;
+    sal_Int32 nax, nay;
 
     if (nMETChrAngle==nAngle) return;
     nMETChrAngle=nAngle;
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 4ab95842cd4d..c9e433cce28b 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -771,10 +771,10 @@ sal_uLong OS2METReader::ReadLittleEndian3BytesLong()
 
 long OS2METReader::ReadCoord(sal_Bool b32)
 {
-    long l;
+    sal_Int32 l;
 
     if (b32) *pOS2MET >> l;
-    else  { short s;*pOS2MET >> s; l=(long)s; }
+    else  { short s;*pOS2MET >> s; l=(sal_Int32)s; }
     return l;
 }
 
@@ -1116,7 +1116,7 @@ void OS2METReader::ReadFullArc(sal_Bool bGivenPos, sal_uInt16 nOrderSize)
 void OS2METReader::ReadPartialArc(sal_Bool bGivenPos, sal_uInt16 nOrderSize)
 {
     Point aP0, aCenter,aPStart,aPEnd;
-    long nP,nQ,nR,nS,nStart, nSweep;
+    sal_Int32 nP,nQ,nR,nS,nStart, nSweep;
     Rectangle aRect;
     sal_uInt32 nMul; sal_uInt16 nMulS;
     double fStart, fEnd;
@@ -1145,10 +1145,10 @@ void OS2METReader::ReadPartialArc(sal_Bool bGivenPos, sal_uInt16 nOrderSize)
     *pOS2MET >> nStart >> nSweep;
     fStart=((double)nStart)/65536.0/180.0*3.14159265359;
     fEnd=fStart+((double)nSweep)/65536.0/180.0*3.14159265359;
-    aPStart=Point(aCenter.X()+(long)( cos(fStart)*nP),
-                  aCenter.Y()+(long)(-sin(fStart)*nQ));
-    aPEnd=  Point(aCenter.X()+(long)( cos(fEnd)*nP),
-                  aCenter.Y()+(long)(-sin(fEnd)*nQ));
+    aPStart=Point(aCenter.X()+(sal_Int32)( cos(fStart)*nP),
+                  aCenter.Y()+(sal_Int32)(-sin(fStart)*nQ));
+    aPEnd=  Point(aCenter.X()+(sal_Int32)( cos(fEnd)*nP),
+                  aCenter.Y()+(sal_Int32)(-sin(fEnd)*nQ));
 
     aRect=Rectangle(aCenter.X()-nP,aCenter.Y()-nQ,
                     aCenter.X()+nP,aCenter.Y()+nQ);
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 6fdbcd4c3773..94cf7dfa8cc1 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3459,10 +3459,10 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject
                 SvMemoryStream aSt( sizeof( GraphicAttr ) );
                 aSt << static_cast<sal_uInt16>(pGraphicAttr->GetDrawMode())
                     << static_cast<sal_uInt32>(pGraphicAttr->GetMirrorFlags())
-                    << pGraphicAttr->GetLeftCrop()
-                    << pGraphicAttr->GetTopCrop()
-                    << pGraphicAttr->GetRightCrop()
-                    << pGraphicAttr->GetBottomCrop()
+                    << static_cast<sal_Int32>(pGraphicAttr->GetLeftCrop())
+                    << static_cast<sal_Int32>(pGraphicAttr->GetTopCrop())
+                    << static_cast<sal_Int32>(pGraphicAttr->GetRightCrop())
+                    << static_cast<sal_Int32>(pGraphicAttr->GetBottomCrop())
                     << pGraphicAttr->GetRotation()
                     << pGraphicAttr->GetLuminance()
                     << pGraphicAttr->GetContrast()