diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-11-27 12:47:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-28 20:32:29 +0100 |
| commit | 0820920e994cd2281cda34afa2235ee9aa1dd2c2 (patch) | |
| tree | 711a08ebf8d8b32c3fb3164083bc44e2d79099e5 /include/vcl/outdev.hxx | |
| parent | fc011ac027da7574baa4b431ac800020170ba8b0 (diff) | |
drawOutDevDirect always passed a non-null OutputDevice*
likewise:
DrawOutDevDirectProcess
ImplDrawWavePixel
DrawOutDevDirectCheck
and various members of SalGraphics dropping redundant nullptr checks
Change-Id: Iaa1ab7c8a605361a7c9cce0aeee974eec9ff246e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106788
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl/outdev.hxx')
| -rw-r--r-- | include/vcl/outdev.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 1b29dddf532b..c11d1abc1875 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -565,11 +565,11 @@ protected: virtual tools::Rectangle GetBackgroundComponentBounds() const; - virtual const OutputDevice* DrawOutDevDirectCheck(const OutputDevice* pSrcDev) const; + virtual const OutputDevice* DrawOutDevDirectCheck(const OutputDevice& rSrcDev) const; - virtual void DrawOutDevDirectProcess( const OutputDevice* pSrcDev, SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ); + virtual void DrawOutDevDirectProcess(const OutputDevice& rSrcDev, SalTwoRect& rPosAry, SalGraphics* pSrcGraphics); - SAL_DLLPRIVATE void drawOutDevDirect ( const OutputDevice* pSrcDev, SalTwoRect& rPosAry ); + SAL_DLLPRIVATE void drawOutDevDirect(const OutputDevice& rSrcDev, SalTwoRect& rPosAry); SAL_DLLPRIVATE bool is_double_buffered_window() const; @@ -1206,7 +1206,7 @@ private: SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& ); SAL_DLLPRIVATE void ImplDrawTextRect( tools::Long nBaseX, tools::Long nBaseY, tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ); - SAL_DLLPRIVATE static void ImplDrawWavePixel( tools::Long nOriginX, tools::Long nOriginY, tools::Long nCurX, tools::Long nCurY, Degree10 nOrientation, SalGraphics* pGraphics, OutputDevice const * pOutDev, + SAL_DLLPRIVATE static void ImplDrawWavePixel( tools::Long nOriginX, tools::Long nOriginY, tools::Long nCurX, tools::Long nCurY, Degree10 nOrientation, SalGraphics* pGraphics, const OutputDevice& rOutDev, bool bDrawPixAsRect, tools::Long nPixWidth, tools::Long nPixHeight ); SAL_DLLPRIVATE void ImplDrawWaveLine( tools::Long nBaseX, tools::Long nBaseY, tools::Long nStartX, tools::Long nStartY, tools::Long nWidth, tools::Long nHeight, tools::Long nLineWidth, Degree10 nOrientation, const Color& rColor ); SAL_DLLPRIVATE void ImplDrawWaveTextLine( tools::Long nBaseX, tools::Long nBaseY, tools::Long nX, tools::Long nY, tools::Long nWidth, FontLineStyle eTextLine, Color aColor, bool bIsAbove ); |