diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /svx/source/gallery2/galmisc.cxx | |
parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'svx/source/gallery2/galmisc.cxx')
-rw-r--r-- | svx/source/gallery2/galmisc.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 9ec75fe04a86..bad9fefaeb8b 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -562,7 +562,7 @@ void GalleryTransferable::DragFinished( sal_Int8 nDropAction ) mpTheme->SetDragPos( 0 ); if ( nDropAction ) { - Window *pFocusWindow = Application::GetFocusWindow(); + vcl::Window *pFocusWindow = Application::GetFocusWindow(); if ( pFocusWindow ) pFocusWindow->GrabFocusToDocument(); } @@ -576,12 +576,12 @@ void GalleryTransferable::ObjectReleased() delete mpURL, mpURL = NULL; } -void GalleryTransferable::CopyToClipboard( Window* pWindow ) +void GalleryTransferable::CopyToClipboard( vcl::Window* pWindow ) { TransferableHelper::CopyToClipboard( pWindow ); } -void GalleryTransferable::StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, +void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer, sal_Int32 nDragImage ) { INetURLObject aURL; |