summaryrefslogtreecommitdiffstats
path: root/vcl
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-02-03 15:21:22 +1100
committerCaolán McNamara <caolanm@redhat.com>2014-02-05 14:28:42 +0000
commita7395942aecd2523ab392b09018dcc1a05527077 (patch)
tree83f741c84ce0dcdce8d4ec79fc7955eb747fae47 /vcl
parentfdo#74424 Use Window::GetOutDev() to access ImplIsRecordLayout() (diff)
downloadcore-a7395942aecd2523ab392b09018dcc1a05527077.tar.gz
core-a7395942aecd2523ab392b09018dcc1a05527077.zip
fdo#74424 Use Window::GetOutDev() to access ImplReleaseGraphics()
Part of the decoupling of Window from OutputDevice. We now get the Window's OutputDevice instance and manipulate this. Do not rely on the inherited function. Change-Id: Idde976aacd1bea2871cc72509a59c17af6f560f5 Reviewed-on: https://gerrit.libreoffice.org/7790 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/window.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0833331252a2..1760a2e002d0 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1130,7 +1130,8 @@ void Window::ImplRemoveWindow( sal_Bool bRemoveFrameData )
if ( bRemoveFrameData )
{
// release the graphic
- ImplReleaseGraphics();
+ OutputDevice *pOutDev = GetOutDev();
+ pOutDev->ImplReleaseGraphics();
}
}
@@ -3154,7 +3155,8 @@ void Window::ImplUpdateWindowPtr( Window* pWindow )
if ( mpWindowImpl->mpFrameWindow != pWindow->mpWindowImpl->mpFrameWindow )
{
// release graphic
- ImplReleaseGraphics();
+ OutputDevice *pOutDev = GetOutDev();
+ pOutDev->ImplReleaseGraphics();
}
mpWindowImpl->mpFrameData = pWindow->mpWindowImpl->mpFrameData;
@@ -4656,7 +4658,8 @@ Window::~Window()
}
// release SalGraphics
- ImplReleaseGraphics();
+ OutputDevice *pOutDev = GetOutDev();
+ pOutDev->ImplReleaseGraphics();
// notify ImplDelData subscribers of this window about the window deletion
ImplDelData* pDelData = mpWindowImpl->mpFirstDel;