diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-11-10 23:16:44 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-11-11 01:58:35 +0000 |
| commit | b7c4c78a097f76314982d8c1a9f2e58df95080a1 (patch) | |
| tree | eaaed4266b71b4e54d9c8a5176180669e7fa96f0 | |
| parent | df2dbdc283a5af85e7250e4ba94ba8dfef96932b (diff) | |
vcl: make ImplDrawOutDevDirect a protected function in OutputDevice
Also renamed it to drawOutDevDirect. We're making it protected because I'm
about to move ImplDrawFrameDev() from OutputDevice to Window, where it should
be.
Change-Id: I7a94304cdc48b858c057749532de66086eeb5020
Reviewed-on: https://gerrit.libreoffice.org/12339
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
| -rw-r--r-- | include/vcl/outdev.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/outdev/outdev.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index a977936d20bb..c8990171e3e9 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -518,9 +518,9 @@ protected: virtual void CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags); -private: + SAL_DLLPRIVATE void drawOutDevDirect ( const OutputDevice* pSrcDev, SalTwoRect& rPosAry ); - SAL_DLLPRIVATE void ImplDrawOutDevDirect ( const OutputDevice* pSrcDev, SalTwoRect& rPosAry ); +private: // not implemented; to detect misuses of DrawOutDev(...OutputDevice&); SAL_DLLPRIVATE void DrawOutDev( const Point&, const Size&, const Point&, const Size&, const Printer&) SAL_DELETED_FUNCTION; diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index e7ec62443b88..0e11f1738c7f 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -433,7 +433,7 @@ void OutputDevice::ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, cons aPosAry.mnDestY = rPt.Y(); aPosAry.mnDestWidth = rDevSize.Width(); aPosAry.mnDestHeight = rDevSize.Height(); - ImplDrawOutDevDirect( &rOutDev, aPosAry ); + drawOutDevDirect( &rOutDev, aPosAry ); // Ensure that ClipRegion is recalculated and set mbInitClipRegion = true; @@ -553,7 +553,7 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize, } else { - ImplDrawOutDevDirect( &rOutDev, aPosAry ); + drawOutDevDirect( &rOutDev, aPosAry ); // #i32109#: make destination rectangle opaque - source has no alpha mpAlphaVDev->ImplFillOpaqueRectangle( Rectangle(rDestPt, rDestSize) ); @@ -569,7 +569,7 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize, else { // no alpha at all, neither in source nor destination device - ImplDrawOutDevDirect( &rOutDev, aPosAry ); + drawOutDevDirect( &rOutDev, aPosAry ); } } } @@ -638,7 +638,7 @@ void OutputDevice::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 /*nFlags*/) // Direct OutputDevice drawing private function -void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect& rPosAry ) +void OutputDevice::drawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect& rPosAry ) { SalGraphics* pGraphics2; |