diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-03-16 02:22:20 +1100 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-22 04:17:13 +0000 |
| commit | d4855da9e9718b31b371376ee8a469e9e26495af (patch) | |
| tree | 32f0e4e8b640618d25a982b809b9106c90e193a5 /include | |
| parent | 0e0755e3903d54ec3942094060ca84e37e78264b (diff) | |
fdo#74702 Moved CopyArea() Window specific function
There is Window specific code in OutputDevice::CopyArea(...).
I have moved this to a protected function CopyAreaFinal(...).
Conflicts:
include/vcl/print.hxx
vcl/source/gdi/outdev2.cxx
Change-Id: I9098ec960527a2aca6154ac6e791b947a8e4f78e
Reviewed-on: https://gerrit.libreoffice.org/8605
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/print.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 933f199419ae..76f6011f3b59 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1036,7 +1036,10 @@ public: void CopyArea( const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize, sal_uInt16 nFlags = 0 ); +protected: + virtual void CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags); +public: void DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap ); void DrawBitmap( const Point& rDestPt, const Size& rDestSize, diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index deade5f894db..287152171b43 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -285,7 +285,6 @@ protected: virtual void ImplPrintMask ( const Bitmap& rMask, const Color& rMaskColor, const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ); - bool DrawTransformBitmapExDirect( const basegfx::B2DHomMatrix& aFullTransform, const BitmapEx& rBitmapEx); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 8d76850eb7fc..007cf8888e44 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -578,6 +578,8 @@ protected: virtual sal_uInt16 getDefaultAccessibleRole() const; virtual OUString getDefaultAccessibleName() const; + virtual void CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags); + public: bool HasMirroredGraphics() const; |