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/GalleryControl.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/GalleryControl.cxx')
| -rw-r--r-- | svx/source/gallery2/GalleryControl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index bf83c0d4e3a2..1498a7952b1b 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -37,7 +37,7 @@ static const sal_Int32 gnInitialVerticalSplitPosition (150); GalleryControl::GalleryControl ( SfxBindings* /*pBindings*/, - Window* pParentWindow) + vcl::Window* pParentWindow) : Window(pParentWindow, GAL_RES(RID_SVXDLG_GALLERYBROWSER)), mpGallery (Gallery::GetGalleryInstance()), mpSplitter(new GallerySplitter( @@ -171,7 +171,7 @@ void GalleryControl::Resize (void) maLastSize = aNewSize; } -bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, Window* ) +bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* ) { const sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); bool bRet = ( !rKEvt.GetKeyCode().IsMod1() && |