diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-11-10 23:23:13 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-11-11 09:11:38 +0000 |
| commit | 896ac21a92d7617f2a1795ce7df3612493e12ba0 (patch) | |
| tree | 79a053fdeaedec1dc5f35220c23b1d11dc9c1f52 /include | |
| parent | 269b0b40814defe0241e8c79c1834e488ea13bc5 (diff) | |
vcl: move OutputDevice::ImplDrawFrameDev() to Window
I have moved ImplDrawFrameDev() from OutputDevice to Window, because it
deals with frames which is clearly the responsibility of the Window class,
not the OutputDevice class which shouldn't really care about it at all.
I've also renamed it to drawFrameDev() as it's a private function.
Change-Id: I45fd50e8e34fe4a97730c3c857080e4e1ddb1c17
Reviewed-on: https://gerrit.libreoffice.org/12340
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 11 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index c8990171e3e9..a59b642c02bf 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -481,17 +481,6 @@ public: ///@} - /** @name Frame functions - */ - ///@{ - -private: - - SAL_DLLPRIVATE void ImplDrawFrameDev ( const Point& rPt, const Point& rDevPt, const Size& rDevSize, - const OutputDevice& rOutDev, const vcl::Region& rRegion ); - ///@} - - /** @Name Direct OutputDevice drawing functions */ ///@{ diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 2e072bab91f2..7e09b262d0ce 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -539,7 +539,11 @@ private: SAL_DLLPRIVATE void ImplInitWindowData( WindowType nType ); SAL_DLLPRIVATE void getFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, - OutputDevice& rOutDev ); + OutputDevice& rOutDev ); + + + SAL_DLLPRIVATE void drawFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, + const OutputDevice& rOutDev, const vcl::Region& rRegion ); SAL_DLLPRIVATE void ImplSetFrameParent( const vcl::Window* pParent ); |