diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-25 14:30:01 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-26 07:34:56 +0100 |
commit | b792e4ee22d7b625a214f6eceb1c223f35b9a606 (patch) | |
tree | 21dfaf1604cf2b2e159251f5dbb54c2b6c7dbf39 /vcl/inc | |
parent | 4e1a2eb8b1ed1ab3e899e4f25246782165fc3ba4 (diff) |
sal_uLong->sal_uInt32 in drawEPS
Change-Id: I58beedfee1a55df971e778ba2aa3b6989ba53663
Reviewed-on: https://gerrit.libreoffice.org/68341
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/headless/svpgdi.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/openglgdiimpl.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/qt5/Qt5Graphics.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/quartz/salgdi.h | 2 | ||||
-rw-r--r-- | vcl/inc/salgdi.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/salgdiimpl.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/genpspgraphics.h | 2 | ||||
-rw-r--r-- | vcl/inc/unx/salgdi.h | 2 | ||||
-rw-r--r-- | vcl/inc/win/salgdi.h | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 89e141b78d21..1f00f21249e9 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -255,7 +255,7 @@ public: virtual void invert( long nX, long nY, long nWidth, 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_uLong nSize ) override; + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ) override; virtual SystemGraphicsData GetGraphicsData() const override; diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index 132a64327e42..9c888ae62906 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -330,7 +330,7 @@ public: long nX, long nY, long nWidth, long nHeight, void* pPtr, - sal_uLong nSize ) override; + sal_uInt32 nSize ) override; /** Render bitmap with alpha channel diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx index b11f926f72bb..fe7e3b3012f0 100644 --- a/vcl/inc/qt5/Qt5Graphics.hxx +++ b/vcl/inc/qt5/Qt5Graphics.hxx @@ -142,7 +142,7 @@ public: 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_uLong nSize) override; + sal_uInt32 nSize) override; virtual bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 63bf71090c21..adb5d30429ff 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -264,7 +264,7 @@ public: virtual void invert( long nX, long nY, long nWidth, 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_uLong nSize ) override; + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ) override; virtual bool blendBitmap( const SalTwoRect&, const SalBitmap& rBitmap ) override; diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 5313f24c73b8..fdd93ce00813 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -336,7 +336,7 @@ public: long nX, long nY, long nWidth, long nHeight, void* pPtr, - sal_uLong nSize, + sal_uInt32 nSize, const OutputDevice *pOutDev ); // native widget rendering functions @@ -534,7 +534,7 @@ protected: long nX, long nY, long nWidth, long nHeight, void* pPtr, - sal_uLong nSize ) = 0; + sal_uInt32 nSize ) = 0; /** * Query if a position is inside the native widget part. diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx index a6dc4a808ee9..aafeded45dcc 100644 --- a/vcl/inc/salgdiimpl.hxx +++ b/vcl/inc/salgdiimpl.hxx @@ -171,7 +171,7 @@ public: long nX, long nY, long nWidth, long nHeight, void* pPtr, - sal_uLong nSize ) = 0; + sal_uInt32 nSize ) = 0; virtual bool blendBitmap( const SalTwoRect&, diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index b3fff8b8c05d..393f7fc181b3 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -176,7 +176,7 @@ public: SalInvert nFlags ) override; virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, - void* pPtr, sal_uIntPtr nSize ) override; + void* pPtr, sal_uInt32 nSize ) override; virtual bool blendBitmap( const SalTwoRect&, const SalBitmap& rBitmap ) override; virtual bool blendAlphaBitmap( const SalTwoRect&, diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 7bc0e1934994..22f6d8604b83 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -225,7 +225,7 @@ public: virtual void invert( long nX, long nY, long nWidth, 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_uIntPtr nSize ) override; + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ) override; virtual bool blendBitmap( const SalTwoRect&, diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 1d0f2d51204f..22c4a8f2e8c5 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -261,7 +261,7 @@ protected: virtual void invert( long nX, long nY, long nWidth, 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_uIntPtr nSize ) override; + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ) override; // native widget rendering methods that require mirroring virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion, |