vcl consitent use of long for corrdinate

most of length in vcl are calculated in 'long'
but array of X position tend to be in sal_Int32.
As a prep work to be able to support 'double'
as the base type of Device Coordinate, harmonize
the use of 'long' for non-float coordinate.

Change-Id: I7cb33301ff6a5e2c62247b36a4e07e168a58a323

7 files changed, 23 insertions, 23 deletions

diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index 4c31000dd4e8..7b3161fcaac8 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -345,8 +345,8 @@ private:
     void Impl_writePolygon( const Polygon& rPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor );
     void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence = 0);
     void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor );
-    void Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth );
-    void Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor );
+    void Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth );
+    void Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor );
     void Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
     void Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = NULL );
     void Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY );
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 9ea53e5bf819..dedcb983d14d 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -403,7 +403,7 @@ FlashFont& Writer::Impl_getFont( const Font& rFont )
 
 
 
-void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth )
+void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth )
 {
     const FontMetric aMetric( mpVDev->GetFontMetric() );
 
@@ -491,7 +491,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal
     }
 }
 
-void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor )
+void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor )
 {
     sal_Int32 nLen = rText.getLength();
 
@@ -524,18 +524,18 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal
     else
     {
         Size    aNormSize;
-        boost::scoped_array<sal_Int32> pOwnArray;
-        sal_Int32* pDX;
+        boost::scoped_array<long> pOwnArray;
+        long* pDX;
 
         // get text sizes
         if( pDXArray )
         {
             aNormSize = Size( mpVDev->GetTextWidth( rText ), 0 );
-            pDX = (sal_Int32*) pDXArray;
+            pDX = (long*) pDXArray;
         }
         else
         {
-            pOwnArray.reset(new sal_Int32[ nLen ]);
+            pOwnArray.reset(new long[ nLen ]);
             aNormSize = Size( mpVDev->GetTextArray( rText, pOwnArray.get() ), 0 );
             pDX = pOwnArray.get();
         }
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 5927744a6a43..a217c58f4d00 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -1957,7 +1957,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
                 METSetChrAngle( nOrientation = aGDIFont.GetOrientation() );
                 METSetChrSet(FindChrSet(aGDIFont));
                 aStr = pA->GetText().copy(pA->GetIndex(),pA->GetLen());
-                boost::scoped_array<sal_Int32> pDXAry(new sal_Int32[aStr.getLength()]);
+                boost::scoped_array<long> pDXAry(new long[aStr.getLength()]);
                 nNormSize = aVDev.GetTextArray( aStr, pDXAry.get() );
 
                 for ( i = 0; i < aStr.getLength(); i++ )
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 1675cdce0744..d8f929f8ff8a 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -158,7 +158,7 @@ private:
     void SetAttrForFrame();
     void SetAttrForText();
 
-    void WriteTextArray(Point & rPoint, const OUString& rString, const sal_Int32 * pDXAry);
+    void WriteTextArray(Point & rPoint, const OUString& rString, const long* pDXAry);
 
     void HandleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon);
     void WriteOpcodes(const GDIMetaFile & rMTF);
@@ -1306,7 +1306,7 @@ void PictWriter::SetAttrForText()
 }
 
 
-void PictWriter::WriteTextArray(Point & rPoint, const OUString& rString, const sal_Int32 * pDXAry)
+void PictWriter::WriteTextArray(Point & rPoint, const OUString& rString, const long* pDXAry)
 {
     bool bDelta;
     Point aPt;
@@ -1743,7 +1743,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
                 Point                           aPt( pA->GetPoint() );
                 OUString                        aStr = pA->GetText().copy( pA->GetIndex(),pA->GetLen() );
                 VirtualDevice                   aVirDev;
-                boost::scoped_array<sal_Int32>  pDXAry(new sal_Int32[ aStr.getLength() ]);
+                boost::scoped_array<long>       pDXAry(new long[ aStr.getLength() ]);
                 sal_Int32                       nNormSize( aVirDev.GetTextArray( aStr,pDXAry.get() ) );
                 sal_uInt16                          i;
 
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index d0f0802e5cf4..fc2d28573268 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -209,10 +209,10 @@ private:
 
     void                ImplSetClipRegion( Region& rRegion );
     void                ImplBmp( Bitmap*, Bitmap*, const Point &, double nWidth, double nHeight );
-    void                ImplText( const OUString& rUniString, const Point& rPos, const sal_Int32* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev );
+    void                ImplText( const OUString& rUniString, const Point& rPos, const long* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev );
     void                ImplSetAttrForText( const Point & rPoint );
     void                ImplWriteCharacter( sal_Char );
-    void                ImplWriteString( const OString&, VirtualDevice& rVDev, const sal_Int32* pDXArry = NULL, bool bStretch = false );
+    void                ImplWriteString( const OString&, VirtualDevice& rVDev, const long* pDXArry = NULL, bool bStretch = false );
     void                ImplDefineFont( const char*, const char* );
 
     void                ImplClosePathDraw( sal_uLong nMode = PS_RET );
@@ -2100,7 +2100,7 @@ void PSWriter::ImplWriteCharacter( sal_Char nChar )
 
 
 
-void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, const sal_Int32* pDXArry, bool bStretch )
+void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, const long* pDXArry, bool bStretch )
 {
     sal_Int32 nLen = rString.getLength();
     if ( nLen )
@@ -2132,7 +2132,7 @@ void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, co
 
 
 
-void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const sal_Int32* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev )
+void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const long* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev )
 {
     if ( rUniString.isEmpty() )
         return;
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index baea39f073f4..6851f81c2c92 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2306,7 +2306,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
 }
 
 void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
-                                     const sal_Int32* pDXArray, long nWidth,
+                                     const long* pDXArray, long nWidth,
                                      bool bApplyMapping )
 {
     const FontMetric aMetric( mpVDev->GetFontMetric() );
@@ -2396,7 +2396,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
 }
 
 void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
-                                     const sal_Int32* pDXArray, long nWidth,
+                                     const long* pDXArray, long nWidth,
                                      Color aTextColor, bool bApplyMapping )
 {
     sal_Int32                               nLen = rText.getLength();
@@ -2416,18 +2416,18 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
     else
         aPos = rPos;
 
-    boost::shared_array<sal_Int32> xTmpArray(new sal_Int32[nLen]);
+    boost::shared_array<long> xTmpArray(new long[nLen]);
     // get text sizes
     if( pDXArray )
     {
         aNormSize = Size( mpVDev->GetTextWidth( rText ), 0 );
-        memcpy(xTmpArray.get(), pDXArray, nLen * sizeof(sal_Int32));
+        memcpy(xTmpArray.get(), pDXArray, nLen * sizeof(long));
     }
     else
     {
         aNormSize = Size( mpVDev->GetTextArray( rText, xTmpArray.get() ), 0 );
     }
-    sal_Int32* pDX = xTmpArray.get();
+    long* pDX = xTmpArray.get();
 
     // if text is rotated, set transform matrix at new g element
     if( rFont.GetOrientation() )
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index d77e2f558a65..c4450a093382 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -363,8 +363,8 @@ private:
     Color                   ImplGetColorWithIntensity( const Color& rColor, sal_uInt16 nIntensity );
     Color                   ImplGetGradientColor( const Color& rStartColor, const Color& rEndColor, double fOffset );
     void                    ImplWriteMask( GDIMetaFile& rMtf, const Point& rDestPt, const Size& rDestSize, const Gradient& rGradient, sal_uInt32 nWriteFlags );
-    void                    ImplWriteText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, bool bApplyMapping = true );
-    void                    ImplWriteText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor, bool bApplyMapping );
+    void                    ImplWriteText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, bool bApplyMapping = true );
+    void                    ImplWriteText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor, bool bApplyMapping );
     void                    ImplWriteBmp( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz,
                                           bool bApplyMapping = true );