summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-11-10 23:12:52 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2014-11-11 01:58:01 +0000
commitdf2dbdc283a5af85e7250e4ba94ba8dfef96932b (patch)
treeac079c258a05b7f17bc10f7cb0e22fcd210f89c7 /vcl/source/window
parentb9efff1c738af14ae4ee89732e3bb09e515e7959 (diff)
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 'vcl/source/window')
-rw-r--r--vcl/source/window/clipping.cxx8
-rw-r--r--vcl/source/window/window.cxx8
2 files changed, 12 insertions, 4 deletions
diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx
index 42b2c922c826..d3e40d9e0237 100644
--- a/vcl/source/window/clipping.cxx
+++ b/vcl/source/window/clipping.cxx
@@ -854,10 +854,10 @@ void Window::ImplSaveOverlapBackground()
mpWindowImpl->mpFrameData->mnAllSaveBackSize += nSaveBackSize;
Point aDevPt;
- OutputDevice *pOutDev = mpWindowImpl->mpFrameWindow->GetOutDev();
- pOutDev->ImplGetFrameDev( Point( mnOutOffX, mnOutOffY ),
- aDevPt, aOutSize,
- *(mpWindowImpl->mpOverlapData->mpSaveBackDev) );
+ Window* pWin = mpWindowImpl->mpFrameWindow;
+ pWin->getFrameDev( Point( mnOutOffX, mnOutOffY ),
+ aDevPt, aOutSize,
+ *(mpWindowImpl->mpOverlapData->mpSaveBackDev) );
mpWindowImpl->mpOverlapData->mpNextBackWin = mpWindowImpl->mpFrameData->mpFirstBackWin;
mpWindowImpl->mpFrameData->mpFirstBackWin = this;
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 369124162a41..737eeb9ee504 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1196,6 +1196,14 @@ void Window::ImplInitWindowData( WindowType nType )
mbEnableRTL = Application::GetSettings().GetLayoutRTL(); // true: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
}
+void Window::getFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, OutputDevice& rDev )
+{
+ bool bOldMap = mbMap;
+ mbMap = false;
+ rDev.DrawOutDev( rDevPt, rDevSize, rPt, rDevSize, *this );
+ mbMap = bOldMap;
+}
+
ImplWinData* Window::ImplGetWinData() const
{
if ( !mpWindowImpl->mpWinData )