From 827c46e7d75000cb03b0ce21759f9d0825f0c096 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Sep 2014 11:20:40 +0200 Subject: fdo#82577: Handle Window Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a --- svx/source/tbxctrls/lboxctrl.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svx/source/tbxctrls/lboxctrl.cxx') diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 5dea6904fca6..c2b2b553cbb4 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -73,7 +73,7 @@ public: bool IsUserSelected() const { return bUserSel; } void SetUserSelected( bool bVal ) { bUserSel = bVal; } - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; }; SvxPopupWindowListBox::SvxPopupWindowListBox(sal_uInt16 nSlotId, const OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx) @@ -109,7 +109,7 @@ void SvxPopupWindowListBox::PopupModeEnd() if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if (pShellWnd) pShellWnd->GrabFocus(); } @@ -123,7 +123,7 @@ void SvxPopupWindowListBox::StateChanged( SfxPopupWindow::StateChanged( nSID, eState, pState ); } -Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow() +vcl::Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow() { // allows forwarding key events in the correct window // without setting the focus -- cgit