use tools::Long in vcl

Change-Id: Ice1055021e8568634e9a66ba89d3bb4ef4e731df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104522
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 36 insertions, 36 deletions

diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 51007916b43b..cdcdcc0b1a73 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -36,10 +36,10 @@ public:
     // override all pure virtual methods
     virtual void                    ResetClipRegion() override;
     virtual void                    BeginSetClipRegion( sal_uInt32 nRects ) override;
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override;
     virtual void                    EndSetClipRegion() override;
 
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override;
     virtual void                    Show( bool bVisible ) override;
 
     virtual const SystemEnvData*    GetSystemData() const override;
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 9faf8b8230f4..6d003d545398 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -44,10 +44,10 @@ class SvpSalFrame : public SalFrame
 #ifndef IOS
     cairo_surface_t*                    m_pSurface;
 #endif
-    long                                m_nMinWidth;
-    long                                m_nMinHeight;
-    long                                m_nMaxWidth;
-    long                                m_nMaxHeight;
+    tools::Long                                m_nMinWidth;
+    tools::Long                                m_nMinHeight;
+    tools::Long                                m_nMaxWidth;
+    tools::Long                                m_nMaxHeight;
 
     SystemEnvData                       m_aSystemChildData;
 
@@ -77,10 +77,10 @@ public:
 
     virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) override;
     virtual void                Show( bool bVisible, bool bNoActivate = false ) override;
-    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( long& rWidth, long& rHeight ) override;
+    virtual void                SetMinClientSize( tools::Long nWidth, tools::Long nHeight ) override;
+    virtual void                SetMaxClientSize( tools::Long nWidth, tools::Long nHeight ) override;
+    virtual void                SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt16 nFlags ) override;
+    virtual void                GetClientSize( tools::Long& rWidth, tools::Long& rHeight ) override;
     virtual void                GetWorkArea( tools::Rectangle& rRect ) override;
     virtual SalFrame*           GetParent() const override;
     virtual void                SetWindowState( const SalFrameState* pState ) override;
@@ -91,7 +91,7 @@ public:
     virtual void                ToTop( SalFrameToTop nFlags ) override;
     virtual void                SetPointer( PointerStyle ePointerStyle ) override;
     virtual void                CaptureMouse( bool bMouse ) override;
-    virtual void                SetPointerPos( long nX, long nY ) override;
+    virtual void                SetPointerPos( tools::Long nX, tools::Long nY ) override;
     using SalFrame::Flush;
     virtual void                Flush() override;
     virtual void                SetInputContext( SalInputContext* pContext ) override;
@@ -109,7 +109,7 @@ public:
     virtual bool                SetPluginParent( SystemParentData* pNewParent ) override;
     virtual void                ResetClipRegion() override;
     virtual void                BeginSetClipRegion( sal_uInt32 nRects ) override;
-    virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                UnionClipRegion( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override;
     virtual void                EndSetClipRegion() override;
 
     /*TODO: functional implementation */
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index c88c136f5066..0ce14b3a5274 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -145,7 +145,7 @@ protected:
         const basegfx::B2DPoint& rY,
         const SalBitmap& rSourceBitmap,
         const SalBitmap* pAlphaBitmap) override;
-    virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) override;
+    virtual bool drawAlphaRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency ) override;
 
     cairo_t* createTmpCompatibleCairoContext() const;
 
@@ -156,7 +156,7 @@ public:
     virtual SalGraphicsImpl* GetImpl() const override { return nullptr; };
     virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override;
     virtual sal_uInt16      GetBitCount() const override;
-    virtual long            GetGraphicsWidth() const override;
+    virtual tools::Long            GetGraphicsWidth() const override;
 
     virtual void            ResetClipRegion() override;
     virtual bool            setClipRegion( const vcl::Region& ) override;
@@ -187,8 +187,8 @@ public:
                                               int nGlyphs,
                                               FontSubsetInfo& rInfo
                                               ) override;
-    virtual const void*     GetEmbedFontData(const PhysicalFontFace*, long* pDataLen) override;
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) override;
+    virtual const void*     GetEmbedFontData(const PhysicalFontFace*, tools::Long* pDataLen) override;
+    virtual void            FreeEmbedFontData( const void* pData, tools::Long nDataLen ) override;
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
                                             std::vector< sal_Int32 >& rWidths,
@@ -197,10 +197,10 @@ public:
                             GetTextLayout(int nFallbackLevel) override;
     virtual void            DrawTextLayout( const GenericSalLayout& ) override;
     virtual bool            supportsOperation( OutDevSupportType ) const override;
-    virtual void            drawPixel( long nX, long nY ) override;
-    virtual void            drawPixel( long nX, long nY, Color nColor ) override;
-    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 ) override;
-    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void            drawPixel( tools::Long nX, tools::Long nY ) override;
+    virtual void            drawPixel( tools::Long nX, tools::Long nY, Color nColor ) override;
+    virtual void            drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 ) override;
+    virtual void            drawRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override;
 
     virtual bool            drawPolyPolygon(
                                 const basegfx::B2DHomMatrix& rObjectToDevice,
@@ -237,12 +237,12 @@ public:
 
     virtual bool implDrawGradient(basegfx::B2DPolyPolygon const & rPolyPolygon, SalGradient const & rGradient) override;
 
-    virtual void            copyArea( long nDestX,
-                                      long nDestY,
-                                      long nSrcX,
-                                      long nSrcY,
-                                      long nSrcWidth,
-                                      long nSrcHeight,
+    virtual void            copyArea( tools::Long nDestX,
+                                      tools::Long nDestY,
+                                      tools::Long nSrcX,
+                                      tools::Long nSrcY,
+                                      tools::Long nSrcWidth,
+                                      tools::Long nSrcHeight,
                                       bool bWindowInvalidate) override;
     virtual void            copyBits( const SalTwoRect& rPosAry,
                                       SalGraphics* pSrcGraphics ) override;
@@ -257,12 +257,12 @@ public:
     virtual void            drawMask( const SalTwoRect& rPosAry,
                                       const SalBitmap& rSalBitmap,
                                       Color nMaskColor ) override;
-    virtual std::shared_ptr<SalBitmap> getBitmap( long nX, long nY, long nWidth, long nHeight ) override;
-    virtual Color           getPixel( long nX, long nY ) override;
-    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) override;
+    virtual std::shared_ptr<SalBitmap> getBitmap( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override;
+    virtual Color           getPixel( tools::Long nX, tools::Long nY ) override;
+    virtual void            invert( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, SalInvert nFlags ) override;
     virtual void            invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
 
-    virtual bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ) override;
+    virtual bool        drawEPS( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, void* pPtr, sal_uInt32 nSize ) override;
 
     virtual SystemGraphicsData GetGraphicsData() const override;
 
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index ae1290729b4c..e95353a0c227 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -135,7 +135,7 @@ public:
     // pData allows for using a system dependent graphics or device context
     virtual std::unique_ptr<SalVirtualDevice>
                             CreateVirtualDevice( SalGraphics* pGraphics,
-                                                     long &nDX, long &nDY,
+                                                     tools::Long &nDX, tools::Long &nDY,
                                                      DeviceFormat eFormat, const SystemGraphicsData *pData = nullptr ) override;
 
     // Printer
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index 7ec66670957e..f7270a3ee0e6 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -38,7 +38,7 @@ class VCL_DLLPUBLIC SvpSalVirtualDevice : public SalVirtualDevice
     basegfx::B2IVector                  m_aFrameSize;
     std::vector< SvpSalGraphics* >      m_aGraphics;
 
-    void CreateSurface(long nNewDX, long nNewDY, sal_uInt8 *const pBuffer);
+    void CreateSurface(tools::Long nNewDX, tools::Long nNewDY, sal_uInt8 *const pBuffer);
 
 protected:
     SvpSalGraphics* AddGraphics(SvpSalGraphics* aGraphics);
@@ -51,16 +51,16 @@ public:
     virtual SalGraphics*    AcquireGraphics() override;
     virtual void            ReleaseGraphics( SalGraphics* pGraphics ) override;
 
-    virtual bool        SetSize( long nNewDX, long nNewDY ) override;
-    virtual bool        SetSizeUsingBuffer( long nNewDX, long nNewDY,
+    virtual bool        SetSize( tools::Long nNewDX, tools::Long nNewDY ) override;
+    virtual bool        SetSizeUsingBuffer( tools::Long nNewDX, tools::Long nNewDY,
                                             sal_uInt8 * pBuffer
                                           ) override;
 
     cairo_surface_t* GetSurface() const { return m_pSurface; }
 
     // SalGeometryProvider
-    virtual long GetWidth() const override;
-    virtual long GetHeight() const override;
+    virtual tools::Long GetWidth() const override;
+    virtual tools::Long GetHeight() const override;
 };
 
 #endif // INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX