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

8 files changed, 59 insertions, 59 deletions

diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index bb5efa3be97f..76468d83c34d 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -467,25 +467,25 @@ public:
     virtual void    StyleSheetChanged( SfxStyleSheet* pStyle );
     virtual void    ParagraphHeightChanged( sal_Int32 nPara );
 
-    virtual void DrawingText(
-        const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, const sal_Int32* pDXArray,
-        const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
-        const EEngineData::WrongSpellVector* pWrongSpellVector,
-        const SvxFieldData* pFieldData,
-        bool bEndOfLine,
-        bool bEndOfParagraph,
-        bool bEndOfBullet,
-        const ::com::sun::star::lang::Locale* pLocale,
-        const Color& rOverlineColor,
-        const Color& rTextLineColor);
-
-    virtual void DrawingTab(
-        const Point& rStartPos, long nWidth, const OUString& rChar,
-        const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
-        bool bEndOfLine,
-        bool bEndOfParagraph,
-        const Color& rOverlineColor,
-        const Color& rTextLineColor);
+    virtual void DrawingText( const Point& rStartPos, const OUString& rText,
+                              sal_Int32 nTextStart, sal_Int32 nTextLen,
+                              const long* pDXArray, const SvxFont& rFont,
+                              sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
+                              const EEngineData::WrongSpellVector* pWrongSpellVector,
+                              const SvxFieldData* pFieldData,
+                              bool bEndOfLine,
+                              bool bEndOfParagraph,
+                              bool bEndOfBullet,
+                              const ::com::sun::star::lang::Locale* pLocale,
+                              const Color& rOverlineColor,
+                              const Color& rTextLineColor);
+
+    virtual void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar,
+                             const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
+                             bool bEndOfLine,
+                             bool bEndOfParagraph,
+                             const Color& rOverlineColor,
+                             const Color& rTextLineColor);
     virtual OUString  GetUndoComment( sal_uInt16 nUndoId ) const;
     virtual bool    FormattingParagraph( sal_Int32 nPara );
     virtual bool    SpellNextDocument();
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 2c9b0355d710..218d9ffdfc79 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -373,7 +373,7 @@ public:
     sal_Int32           mnPara;
     sal_Int32           mnIndex;
     const SvxFont&      mrFont;
-    const sal_Int32*    mpDXArray;
+    const long*         mpDXArray;
 
     const EEngineData::WrongSpellVector*  mpWrongSpellVector;
     const SvxFieldData* mpFieldData;
@@ -402,7 +402,7 @@ public:
         const SvxFont& rFnt,
         sal_Int32 nPar,
         sal_Int32 nIdx,
-        const sal_Int32* pDXArr,
+        const long* pDXArr,
         const EEngineData::WrongSpellVector* pWrongSpellVector,
         const SvxFieldData* pFieldData,
         const ::com::sun::star::lang::Locale* pLocale,
@@ -836,25 +836,25 @@ public:
 
     void            StripPortions();
 
-    virtual void DrawingText(
-        const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen,
-        const sal_Int32* pDXArray, const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
-        const EEngineData::WrongSpellVector* pWrongSpellVector,
-        const SvxFieldData* pFieldData,
-        bool bEndOfLine,
-        bool bEndOfParagraph,
-        bool bEndOfBullet,
-        const ::com::sun::star::lang::Locale* pLocale,
-        const Color& rOverlineColor,
-        const Color& rTextLineColor);
-
-    virtual void DrawingTab(
-        const Point& rStartPos, long nWidth, const OUString& rChar,
-        const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
-        bool bEndOfLine,
-        bool bEndOfParagraph,
-        const Color& rOverlineColor,
-        const Color& rTextLineColor);
+    virtual void DrawingText( const Point& rStartPos, const OUString& rText,
+                              sal_Int32 nTextStart, sal_Int32 nTextLen,
+                              const long* pDXArray, const SvxFont& rFont,
+                              sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
+                              const EEngineData::WrongSpellVector* pWrongSpellVector,
+                              const SvxFieldData* pFieldData,
+                              bool bEndOfLine,
+                              bool bEndOfParagraph,
+                              bool bEndOfBullet,
+                              const ::com::sun::star::lang::Locale* pLocale,
+                              const Color& rOverlineColor,
+                              const Color& rTextLineColor);
+
+    virtual void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar,
+                             const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
+                             bool bEndOfLine,
+                             bool bEndOfParagraph,
+                             const Color& rOverlineColor,
+                             const Color& rTextLineColor);
 
     Size            CalcTextSize();
     Size            CalcTextSizeNTP();
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 43036503be16..e9487b5ee0c7 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -93,17 +93,17 @@ public:
                       const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const;
 
     void QuickDrawText( OutputDevice *pOut, const Point &rPos, const OUString &rTxt,
-               const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32, const sal_Int32* pDXArray = NULL ) const;
+                        const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32, const long* pDXArray = NULL ) const;
 
     Size QuickGetTextSize( const OutputDevice *pOut, const OUString &rTxt,
-                         const sal_Int32 nIdx, const sal_Int32 nLen, sal_Int32* pDXArray = NULL ) const;
+                         const sal_Int32 nIdx, const sal_Int32 nLen, long* pDXArray = NULL ) const;
 
     void DrawPrev( OutputDevice* pOut, Printer* pPrinter,
                    const Point &rPos, const OUString &rTxt,
                    const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const;
 
     static void DrawArrow( OutputDevice &rOut, const Rectangle& rRect,
-        const Size& rSize, const Color& rCol, bool bLeft );
+                           const Size& rSize, const Color& rCol, bool bLeft );
     SvxFont&    operator=( const SvxFont& rFont );
     SvxFont&    operator=( const Font& rFont );
 };
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index ef270c5db3a8..e2d042a7f9b7 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -169,7 +169,7 @@ private:
     Rectangle       maPrevRect;
     Rectangle       maNextRect;
     OUString        maDayOfWeekText;
-    sal_Int32       mnDayOfWeekAry[7];
+    long            mnDayOfWeekAry[7];
     Date            maOldFormatFirstDate;
     Date            maOldFormatLastDate;
     Date            maFirstDate;
diff --git a/include/vcl/devicecoordinate.hxx b/include/vcl/devicecoordinate.hxx
index bcc2bb2255b8..58ff3d2425dd 100644
--- a/include/vcl/devicecoordinate.hxx
+++ b/include/vcl/devicecoordinate.hxx
@@ -20,7 +20,7 @@ typedef ::basegfx::B2DPoint DevicePoint;
 #else /* !VCL_FLOAT_DEVICE_PIXEL */
 
 #include <basegfx/point/b2ipoint.hxx>
-typedef sal_Int32 DeviceCoordinate;
+typedef long DeviceCoordinate;
 typedef ::basegfx::B2IPoint DevicePoint;
 
 #endif /* ! Carpet Cushion */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 4709d24f57a7..569fd64de23d 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -473,7 +473,7 @@ private:
 
     Point       maStartPt;
     OUString    maStr;
-    sal_Int32*  mpDXAry;
+    long*       mpDXAry;
     sal_Int32   mnIndex;
     sal_Int32   mnLen;
 
@@ -486,7 +486,7 @@ public:
                         MetaTextArrayAction();
                         MetaTextArrayAction( const MetaTextArrayAction& rAction );
     MetaTextArrayAction( const Point& rStartPt, const OUString& rStr,
-                         const sal_Int32* pDXAry, sal_Int32 nIndex,
+                         const long* pDXAry, sal_Int32 nIndex,
                          sal_Int32 nLen );
 
     virtual void        Execute( OutputDevice* pOut ) SAL_OVERRIDE;
@@ -503,7 +503,7 @@ public:
     const OUString& GetText() const { return maStr; }
     sal_Int32       GetIndex() const { return mnIndex; }
     sal_Int32       GetLen() const { return mnLen; }
-    sal_Int32*      GetDXArray() const { return mpDXAry; }
+    long*           GetDXArray() const { return mpDXAry; }
 };
 
 class VCL_DLLPUBLIC MetaStretchTextAction : public MetaAction
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 66559c26ae11..dc954272d799 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1005,24 +1005,24 @@ public:
     */
     bool                        GetTextBoundRect( Rectangle& rRect,
                                                   const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
-                                                  sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
+                                                  sal_uLong nLayoutWidth = 0, const long* pDXArray = NULL ) const;
 
     Rectangle                   ImplGetTextBoundRect( const SalLayout& );
 
     bool                        GetTextOutline( PolyPolygon&,
                                                 const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0,
                                                 sal_Int32 nLen = -1, bool bOptimize = true,
-                                                sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
+                                                sal_uLong nLayoutWidth = 0, const long* pDXArray = NULL ) const;
 
     bool                        GetTextOutlines( PolyPolyVector&,
                                                  const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0,
                                                  sal_Int32 nLen = -1, bool bOptimize = true,
-                                                 sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
+                                                 sal_uLong nLayoutWidth = 0, const long* pDXArray = NULL ) const;
 
     bool                        GetTextOutlines( ::basegfx::B2DPolyPolygonVector &rVector,
                                                  const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0,
                                                  sal_Int32 nLen = -1, bool bOptimize = true,
-                                                 sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
+                                                 sal_uLong nLayoutWidth = 0, const long* pDXArray = NULL ) const;
 
 
     OUString                    GetEllipsisString( const OUString& rStr, long nMaxWidth,
@@ -1085,16 +1085,16 @@ public:
     float                       approximate_char_width() const;
 
     void                        DrawTextArray( const Point& rStartPt, const OUString& rStr,
-                                               const sal_Int32* pDXAry = NULL,
+                                               const long* pDXAry = NULL,
                                                sal_Int32 nIndex = 0,
                                                sal_Int32 nLen = -1,
                                                int flags = 0);
-    long                        GetTextArray( const OUString& rStr, sal_Int32* pDXAry = NULL,
+    long                        GetTextArray( const OUString& rStr, long* pDXAry = NULL,
                                               sal_Int32 nIndex = 0, sal_Int32 nLen = -1 ) const;
 
-    bool                        GetCaretPositions( const OUString&, sal_Int32* pCaretXArray,
+    bool                        GetCaretPositions( const OUString&, long* pCaretXArray,
                                               sal_Int32 nIndex, sal_Int32 nLen,
-                                              sal_Int32* pDXAry = NULL, long nWidth = 0,
+                                              long* pDXAry = NULL, long nWidth = 0,
                                               bool bCellBreaking = true ) const;
     void                        DrawStretchText( const Point& rStartPt, sal_uLong nWidth,
                                                  const OUString& rStr,
@@ -1237,7 +1237,7 @@ public:
 
     SystemTextLayoutData        GetSysTextLayoutData( const Point& rStartPt, const OUString& rStr,
                                                       sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
-                                                      const sal_Int32* pDXAry = NULL ) const;
+                                                      const long* pDXAry = NULL ) const;
 
     SAL_DLLPRIVATE bool         ImplIsAntiparallel() const ;
     SAL_DLLPRIVATE void         ReMirror( Point &rPoint ) const;
@@ -1247,7 +1247,7 @@ public:
     virtual bool                HasMirroredGraphics() const;
     SAL_DLLPRIVATE SalLayout*   ImplLayout( const OUString&, sal_Int32 nIndex, sal_Int32 nLen,
                                             const Point& rLogicPos = Point(0,0), long nLogicWidth=0,
-                                            const sal_Int32* pLogicDXArray=NULL, int flags=0 ) const;
+                                            const long* pLogicDXArray=NULL, int flags=0 ) const;
     SAL_DLLPRIVATE ImplLayoutArgs ImplPrepareLayoutArgs( OUString&, const sal_Int32 nIndex, const sal_Int32 nLen,
                                                          DeviceCoordinate nPixelWidth, const DeviceCoordinate* pPixelDXArray, int flags = 0 ) const;
     SAL_DLLPRIVATE SalLayout*   ImplGlyphFallbackLayout( SalLayout*, ImplLayoutArgs& ) const;
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index d4b6e9014503..49ce97cf1157 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -769,7 +769,7 @@ The following structure describes the permissions used in PDF security
                                       FontUnderline eOverline,
                                       bool bUnderlineAbove = false );
     void                DrawTextArray( const Point& rStartPt, const OUString& rStr,
-                                       const sal_Int32* pDXAry,
+                                       const long* pDXAry,
                                        sal_Int32 nIndex,
                                        sal_Int32 nLen );
     void                DrawStretchText( const Point& rStartPt, sal_uLong nWidth,