diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-19 14:46:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-19 15:53:14 +0100 |
| commit | b030ba2e13a02c231783966b23ded76247bb9690 (patch) | |
| tree | 82cfbea3c5ba32cbfb456f3564ef2dfc1e10d62d /canvas/source | |
| parent | ab25d7cfec956b6c31551ee5c00bd6bcae4b0bb5 (diff) | |
Resolve: "TODO(Q1): Make GetSystemData method virtual"
and remove the casting silliness, allowing the removal of
cairo_cairo.?xx
If anything is to go wrong I'd guess it'll be the windows directx stuff.
Change-Id: I3e22c07b9c26ade9b27a245fdd8408de540643f4
Diffstat (limited to 'canvas/source')
| -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 e69171418869..6beb18312a8c 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->GetSystemChildSystemData(); + const SystemEnvData *pData = mpWindow->GetSystemData(); 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 99966893e0a6..8f1f0a9da483 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.GetWindowSystemData(); + const SystemEnvData *pData = rWindow.GetSystemData(); 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 6beb07d0355d..50a44999b28c 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->GetSystemChildSystemData()->aWindow; + const unx::Window aXWindow=pChildWindow->GetSystemData()->aWindow; unx::glXSwapBuffers(reinterpret_cast<unx::Display*>(mpDisplay), aXWindow); pChildWindow->Show(); |