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/inc/galbrws2.hxx | |
| 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/inc/galbrws2.hxx')
| -rw-r--r-- | svx/inc/galbrws2.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 38cb724c6618..e431fd211de5 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -152,7 +152,7 @@ public: public: - GalleryBrowser2( Window* pParent, const ResId& rResId, Gallery* pGallery ); + GalleryBrowser2( vcl::Window* pParent, const ResId& rResId, Gallery* pGallery ); virtual ~GalleryBrowser2(); void SelectTheme( const OUString& rThemeName ); @@ -160,7 +160,7 @@ public: GalleryBrowserMode GetMode() const { return meMode; } void SetMode( GalleryBrowserMode eMode ); - Window* GetViewWindow() const; + vcl::Window* GetViewWindow() const; void Travel( GalleryBrowserTravel eTravel ); @@ -170,10 +170,10 @@ public: sal_Int8 AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt ); sal_Int8 ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt ); - void StartDrag( Window* pWindow, const Point* pDragPoint = NULL ); - void TogglePreview( Window* pWindow, const Point* pPreviewPoint = NULL ); - void ShowContextMenu( Window* pWindow, const Point* pContextPoint = NULL ); - bool KeyInput( const KeyEvent& rEvt, Window* pWindow ); + void StartDrag( vcl::Window* pWindow, const Point* pDragPoint = NULL ); + void TogglePreview( vcl::Window* pWindow, const Point* pPreviewPoint = NULL ); + void ShowContextMenu( vcl::Window* pWindow, const Point* pContextPoint = NULL ); + bool KeyInput( const KeyEvent& rEvt, vcl::Window* pWindow ); com::sun::star::uno::Reference< com::sun::star::frame::XFrame > GetFrame() const; com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > GetUNOContext() const { return m_xContext; } |