Revert "long->sal_Int32 in tools/gen.hxx"

This reverts commit 8bc951daf79decbd8a599a409c6d33c5456710e0.

As discussed at
<https://lists.freedesktop.org/archives/libreoffice/2018-April/079955.html>
"long->sal_Int32 in tools/gen.hxx", that commit caused lots of problems with
signed integer overflow, and the original plan was to redo it to consistently
use sal_Int64 instead of sal_Int32.  <https://gerrit.libreoffice.org/#/c/52471/>
"sal_Int32->sal_Int64 in tools/gen.hxx" tried that.  However, it failed
miserably on Windows, causing odd failures like not writing out Pictures/*.svm
streams out into .odp during CppunitTest_sd_export_ooxml2.  So the next best
approach is to just revert the original commit, at least for now.

Includes revert of follow-up 8c50aff2175e85c54957d98ce32af40a3a87e168 "Fix
Library_vclplug_qt5".

Change-Id: Ia8bf34272d1ed38aac00e5d07a9d13fb03f439ae
Reviewed-on: https://gerrit.libreoffice.org/52532
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

10 files changed, 32 insertions, 32 deletions

diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 6c5dc905a3e9..16de568794f8 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -82,7 +82,7 @@ public:
     virtual void                SetMinClientSize( long nWidth, long nHeight ) override;
     virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
     virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
-    virtual void                GetClientSize( sal_Int32& rWidth, sal_Int32& rHeight ) override;
+    virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
     virtual void                GetWorkArea( tools::Rectangle& rRect ) override;
     virtual SalFrame*           GetParent() const override;
     virtual void                SetWindowState( const SalFrameState* pState ) override;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 30571d2cf077..c2b53e270648 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -124,7 +124,7 @@ public:
     virtual void                SetMinClientSize( long nWidth, long nHeight ) override;
     virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
     virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
-    virtual void                GetClientSize( sal_Int32& rWidth, sal_Int32& rHeight ) override;
+    virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
     virtual void                GetWorkArea( tools::Rectangle& rRect ) override;
     virtual SalFrame*           GetParent() const override;
     virtual void                SetWindowState( const SalFrameState* pState ) override;
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index cc668f0d2f66..8f9c04017a66 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -72,7 +72,7 @@ class AquaSalInfoPrinter : public SalInfoPrinter
     virtual bool                SetPrinterData( ImplJobSetup* pSetupData ) override;
     virtual bool                SetData( JobSetFlags i_nFlags, ImplJobSetup* i_pSetupData ) override;
     virtual void                GetPageInfo( const ImplJobSetup* i_pSetupData,
-                                             sal_Int32& o_rOutWidth, sal_Int32& o_rOutHeight,
+                                             long& o_rOutWidth, long& o_rOutHeight,
                                              Point& rPageOffset,
                                              Size& rPaperSize ) override;
     virtual sal_uInt32          GetCapabilities( const ImplJobSetup* i_pSetupData, PrinterCapType i_nType ) override;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 4da52068ca58..c04f0a8f767e 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -147,7 +147,7 @@ public:
     virtual void            SetMinClientSize( long nWidth, long nHeight ) = 0;
     virtual void            SetMaxClientSize( long nWidth, long nHeight ) = 0;
     virtual void            SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) = 0;
-    virtual void            GetClientSize( sal_Int32& rWidth, sal_Int32& rHeight ) = 0;
+    virtual void            GetClientSize( long& rWidth, long& rHeight ) = 0;
     virtual void            GetWorkArea( tools::Rectangle& rRect ) = 0;
     virtual SalFrame*       GetParent() const = 0;
     // Note: x will be mirrored at parent if UI mirroring is active
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 70f2b1a4bf9c..71ef1eae1c08 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -202,11 +202,11 @@ public:
     SalLayoutFlags              GetLayout() const { return m_nLayout; }
     void                        SetLayout( SalLayoutFlags aLayout ) { m_nLayout = aLayout;}
 
-    void                        mirror( sal_Int32& nX, const OutputDevice *pOutDev ) const;
+    void                        mirror( long& nX, const OutputDevice *pOutDev ) const;
     // only called mirror2 to avoid ambiguity
     SAL_WARN_UNUSED_RESULT
-    sal_Int32                   mirror2( sal_Int32 nX, const OutputDevice *pOutDev ) const;
-    void                        mirror( sal_Int32& nX, sal_Int32 nWidth, const OutputDevice *pOutDev, bool bBack = false ) const;
+    long                        mirror2( long nX, const OutputDevice *pOutDev ) const;
+    void                        mirror( long& nX, long nWidth, const OutputDevice *pOutDev, bool bBack = false ) const;
     bool                        mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev ) const;
     void                        mirror( tools::Rectangle& rRect, const OutputDevice*, bool bBack = false ) const;
     void                        mirror( vcl::Region& rRgn, const OutputDevice *pOutDev ) const;
@@ -220,12 +220,12 @@ public:
     bool                        SetClipRegion( const vcl::Region&, const OutputDevice *pOutDev );
 
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
-    void                        DrawPixel( sal_Int32 nX, sal_Int32 nY, const OutputDevice *pOutDev );
-    void                        DrawPixel( sal_Int32 nX, sal_Int32 nY, Color nColor, const OutputDevice *pOutDev );
+    void                        DrawPixel( long nX, long nY, const OutputDevice *pOutDev );
+    void                        DrawPixel( long nX, long nY, Color nColor, const OutputDevice *pOutDev );
 
-    void                        DrawLine( sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2, const OutputDevice *pOutDev );
+    void                        DrawLine( long nX1, long nY1, long nX2, long nY2, const OutputDevice *pOutDev );
 
-    void                        DrawRect( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, const OutputDevice *pOutDev );
+    void                        DrawRect( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev );
 
     void                        DrawPolyLine( sal_uInt32 nPoints, SalPoint const * pPtAry, const OutputDevice *pOutDev );
 
@@ -277,9 +277,9 @@ public:
 
     // CopyArea --> No RasterOp, but ClipRegion
     void                        CopyArea(
-                                    sal_Int32 nDestX, sal_Int32 nDestY,
-                                    sal_Int32 nSrcX, sal_Int32 nSrcY,
-                                    sal_Int32 nSrcWidth, sal_Int32 nSrcHeight,
+                                    long nDestX, long nDestY,
+                                    long nSrcX, long nSrcY,
+                                    long nSrcWidth, long nSrcHeight,
                                     const OutputDevice *pOutDev );
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
@@ -308,18 +308,18 @@ public:
                                     const OutputDevice *pOutDev );
 
     SalBitmap*                  GetBitmap(
-                                    sal_Int32 nX, sal_Int32 nY,
-                                    sal_Int32 nWidth, sal_Int32 nHeight,
+                                    long nX, long nY,
+                                    long nWidth, long nHeight,
                                     const OutputDevice *pOutDev );
 
     Color                       GetPixel(
-                                    sal_Int32 nX, sal_Int32 nY,
+                                    long nX, long nY,
                                     const OutputDevice *pOutDev );
 
     // invert --> ClipRegion (only Windows)
     void                        Invert(
-                                    sal_Int32 nX, sal_Int32 nY,
-                                    sal_Int32 nWidth, sal_Int32 nHeight,
+                                    long nX, long nY,
+                                    long nWidth, long nHeight,
                                     SalInvert nFlags,
                                     const OutputDevice *pOutDev );
 
@@ -330,8 +330,8 @@ public:
                                     const OutputDevice *pOutDev );
 
     bool                        DrawEPS(
-                                    sal_Int32 nX, sal_Int32 nY,
-                                    sal_Int32 nWidth, sal_Int32 nHeight,
+                                    long nX, long nY,
+                                    long nWidth, long nHeight,
                                     void* pPtr,
                                     sal_uLong nSize,
                                     const OutputDevice *pOutDev );
@@ -417,8 +417,8 @@ public:
                                     const OutputDevice* pOutDev );
 
     bool                        DrawAlphaRect(
-                                    sal_Int32 nX, sal_Int32 nY,
-                                    sal_Int32 nWidth, sal_Int32 nHeight,
+                                    long nX, long nY,
+                                    long nWidth, long nHeight,
                                     sal_uInt8 nTransparency,
                                     const OutputDevice *pOutDev );
 
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 5a70751c9112..d9da1a6d80ed 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -71,7 +71,7 @@ public:
     virtual bool                    SetData( JobSetFlags nFlags, ImplJobSetup* pSetupData ) = 0;
 
     virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
-                                                 sal_Int32& rOutWidth, sal_Int32& rOutHeight,
+                                                 long& rOutWidth, long& rOutHeight,
                                                  Point& rPageOffset,
                                                  Size& rPaperSize ) = 0;
     virtual sal_uInt32              GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) = 0;
diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h
index c00b589471dc..9d80de32f99b 100644
--- a/vcl/inc/unx/genprn.h
+++ b/vcl/inc/unx/genprn.h
@@ -44,7 +44,7 @@ public:
     virtual bool                    SetPrinterData( ImplJobSetup* pSetupData ) override;
     virtual bool                    SetData( JobSetFlags nFlags, ImplJobSetup* pSetupData ) override;
     virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
-                                                 sal_Int32& rOutWidth, sal_Int32& rOutHeight,
+                                                 long& rOutWidth, long& rOutHeight,
                                                  Point& rPageOffset,
                                                  Size& rPaperSize ) override;
     virtual sal_uInt32              GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index dc6f512c4526..3db18f03fbcf 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -462,7 +462,7 @@ public:
     virtual void                SetMinClientSize( long nWidth, long nHeight ) override;
     virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
     virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
-    virtual void                GetClientSize( sal_Int32& rWidth, sal_Int32& rHeight ) override;
+    virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
     virtual void                GetWorkArea( tools::Rectangle& rRect ) override;
     virtual SalFrame*           GetParent() const override;
     virtual void                SetWindowState( const SalFrameState* pState ) override;
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 0dd228c0b13f..3f45cd5d853c 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -49,11 +49,11 @@ private:
     static BitmapBuffer*        ImplCreateDIB(
                                     Drawable aDrawable,
                                     SalX11Screen nXScreen,
-                                    sal_Int32 nDrawableDepth,
-                                    sal_Int32 nX,
-                                    sal_Int32 nY,
-                                    sal_Int32 nWidth,
-                                    sal_Int32 nHeight,
+                                    long nDrawableDepth,
+                                    long nX,
+                                    long nY,
+                                    long nWidth,
+                                    long nHeight,
                                     bool bGrey
                                 );
 
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 5deb7f009325..92bfcbfb9d31 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -221,7 +221,7 @@ public:
     virtual void                SetMinClientSize( long nWidth, long nHeight ) override;
     virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
     virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
-    virtual void                GetClientSize( sal_Int32& rWidth, sal_Int32& rHeight ) override;
+    virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
     virtual void                GetWorkArea( tools::Rectangle& rRect ) override;
     virtual SalFrame*           GetParent() const override;
     virtual void                SetWindowState( const SalFrameState* pState ) override;