diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-19 13:51:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-19 14:45:54 +0000 |
| commit | aea9c5ecdc17dbc15497afa4b6202f8af8a1a6d5 (patch) | |
| tree | 53c218ac59c81bee4cbda9e3d5a3ed28fca48304 /canvas | |
| parent | 2383d557e5751387451cefa33516736228429137 (diff) | |
rename to two GetSystemData methods to find all call-sites
anyplace calling GetSystemChildSystemData on a SystemChildWindow is definitely
right
anyplace calling GetWindowSystemData on a Window *might* have intended to call
GetSystemChildSystemData on a Window casted back to an underlying
SystemChildWindow.
Change-Id: I7dcf3a50d0b7ed29bc08cfdb15cc0dcb86be8fa7
Reviewed-on: https://gerrit.libreoffice.org/25158
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/directx/dx_9rm.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/directx/dx_spritedevicehelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 6beb18312a8c..e69171418869 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -608,7 +608,7 @@ namespace dxcanvas mpWindow->SetControlForeground(); mpWindow->SetControlBackground(); - const SystemEnvData *pData = mpWindow->GetSystemData(); + const SystemEnvData *pData = mpWindow->GetSystemChildSystemData(); const HWND hwnd(reinterpret_cast<HWND>(pData->hWnd)); mhWnd = const_cast<HWND>(hwnd); diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx index 8f1f0a9da483..99966893e0a6 100644 --- a/canvas/source/directx/dx_spritedevicehelper.cxx +++ b/canvas/source/directx/dx_spritedevicehelper.cxx @@ -64,7 +64,7 @@ namespace dxcanvas VCLUnoHelper::GetInterface(&rWindow), uno::UNO_QUERY_THROW) ); - const SystemEnvData *pData = rWindow.GetSystemData(); + const SystemEnvData *pData = rWindow.GetWindowSystemData(); const HWND hWnd = reinterpret_cast<HWND>(pData->hWnd); if( !IsWindow( hWnd ) ) throw lang::NoSupportException( "Passed window has invalid system window, or canvas out-of-process!" ); diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 50a44999b28c..6beb07d0355d 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -322,7 +322,7 @@ namespace oglcanvas /* * TODO: moggi: fix it! // switch buffer, sync etc. - const unx::Window aXWindow=pChildWindow->GetSystemData()->aWindow; + const unx::Window aXWindow=pChildWindow->GetSystemChildSystemData()->aWindow; unx::glXSwapBuffers(reinterpret_cast<unx::Display*>(mpDisplay), aXWindow); pChildWindow->Show(); |