diff options
| author | Yusuf Keten <ketenyusuf@gmail.com> | 2020-01-04 20:39:42 +0300 |
|---|---|---|
| committer | Muhammet Kara <muhammet.kara@collabora.com> | 2020-02-04 18:05:28 +0100 |
| commit | a68157c88add7a815678155f4d7a743b010d92f5 (patch) | |
| tree | cd22f04c15dfd8b2a6ebc75b6c14ed6b8df575cc /include | |
| parent | 5a989074cd1f8afdc03d0ee4f2dc12b174f9aa19 (diff) | |
tdf#74702: Remove enum OutDevType from OutputDevice::drawOutDevDirect
Extracted DrawOutDevDirectCheck and DrawOutDevDirectProcess. DrawoutDevDirectCheck checks OutputDeviceType and define pSrcGraphics according to its type. DrawOutDevDirectProcess perform some operations about drawing out according to its type and checks some pointers for avoiding NULL pointer.
Change-Id: I24247ee42d2dd686dbd13bb5f6b24bbe8fab43ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86229
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Jenkins
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 022edb9e2a54..c991867495ea 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -559,6 +559,10 @@ protected: virtual void CopyDeviceArea( SalTwoRect& aPosAry, bool bWindowInvalidate); + virtual void DrawOutDevDirectCheck( const OutputDevice* pSrcDev, SalGraphics*& pSrcGraphics ); + + virtual void DrawOutDevDirectProcess( const OutputDevice* pSrcDev, SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ); + SAL_DLLPRIVATE void drawOutDevDirect ( const OutputDevice* pSrcDev, SalTwoRect& rPosAry ); SAL_DLLPRIVATE bool is_double_buffered_window() const; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index a78259c5f222..6d98bec0576b 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -752,6 +752,8 @@ protected: virtual void ImplAdjustNWFSizes(); virtual void CopyDeviceArea( SalTwoRect& aPosAry, bool bWindowInvalidate) override; + virtual void DrawOutDevDirectCheck(const OutputDevice* pSrcDev, SalGraphics*& pSrcGraphics) override; + virtual void DrawOutDevDirectProcess( const OutputDevice* pSrcDev, SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override; virtual void ClipToPaintRegion( tools::Rectangle& rDstRect ) override; virtual bool UsePolyPolygonForComplexGradient() override; |