diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-11-10 23:12:52 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-11-11 01:58:01 +0000 |
| commit | df2dbdc283a5af85e7250e4ba94ba8dfef96932b (patch) | |
| tree | ac079c258a05b7f17bc10f7cb0e22fcd210f89c7 /include | |
| parent | vcl: tabify include/vcl/window.hxx (diff) | |
| download | core-df2dbdc283a5af85e7250e4ba94ba8dfef96932b.tar.gz core-df2dbdc283a5af85e7250e4ba94ba8dfef96932b.zip | |
vcl: move OutputDevice::ImplGetFrameDev() to Window
ImplGetFrameDev() is for some unknown reason in OutputDevice, but it's
most definitely something that's specific to Window. I've moved this, and
also renamed it getFrameDev() as it's a private function.
Change-Id: Iffb2c439bee8c29ee585a0d50cfd6fbcfc28c3bc
Reviewed-on: https://gerrit.libreoffice.org/12338
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 80d8576a8612..a977936d20bb 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -487,8 +487,6 @@ public: private: - SAL_DLLPRIVATE void ImplGetFrameDev ( const Point& rPt, const Point& rDevPt, const Size& rDevSize, - OutputDevice& rOutDev ); SAL_DLLPRIVATE void ImplDrawFrameDev ( const Point& rPt, const Point& rDevPt, const Size& rDevSize, const OutputDevice& rOutDev, const vcl::Region& rRegion ); ///@} diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index fc6bc0638d7f..2e072bab91f2 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -533,10 +533,14 @@ protected: SAL_DLLPRIVATE void PushPaintHelper(PaintHelper *pHelper); SAL_DLLPRIVATE void PopPaintHelper(PaintHelper *pHelper); + private: SAL_DLLPRIVATE void ImplInitWindowData( WindowType nType ); + SAL_DLLPRIVATE void getFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, + OutputDevice& rOutDev ); + SAL_DLLPRIVATE void ImplSetFrameParent( const vcl::Window* pParent ); SAL_DLLPRIVATE void ImplInsertWindow( vcl::Window* pParent ); |