From b030ba2e13a02c231783966b23ded76247bb9690 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 19 May 2016 14:46:50 +0100 Subject: 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 --- toolkit/source/awt/vclxsystemdependentwindow.cxx | 2 +- toolkit/source/awt/vclxtopwindow.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'toolkit/source') diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 40001ef230e6..18e4a0224122 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -72,7 +72,7 @@ css::uno::Any VCLXSystemDependentWindow::getWindowHandle( const css::uno::Sequen vcl::Window* pWindow = GetWindow(); if ( pWindow ) { - const SystemEnvData* pSysData = static_cast(pWindow)->GetSystemChildSystemData(); + const SystemEnvData* pSysData = static_cast(pWindow)->GetSystemData(); if( pSysData ) { #if defined(_WIN32) diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index bb7453c975dc..a04f968ff219 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -83,7 +83,7 @@ css::uno::Any VCLXTopWindow_Base::getWindowHandle( const css::uno::Sequence< sal vcl::Window* pWindow = GetWindowImpl(); if ( pWindow ) { - const SystemEnvData* pSysData = static_cast(pWindow)->GetWindowSystemData(); + const SystemEnvData* pSysData = static_cast(pWindow)->GetSystemData(); if( pSysData ) { #if defined (_WIN32) -- cgit