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 /sd/source/ui/inc/ViewShell.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 'sd/source/ui/inc/ViewShell.hxx')
| -rw-r--r-- | sd/source/ui/inc/ViewShell.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index c3ef058c1c69..7404aa653051 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -115,7 +115,7 @@ public: ViewShell ( SfxViewFrame *pFrame, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); virtual ~ViewShell (void); @@ -145,7 +145,7 @@ public: /** Return the window that is the parent of all controls of this view shell. This may or may not be the window of the frame. */ - inline ::Window* GetParentWindow (void) const { return mpParentWindow; } + inline ::vcl::Window* GetParentWindow (void) const { return mpParentWindow; } inline ::sd::View* GetView (void) const { return mpView; } inline SdrView* GetDrawView (void) const; @@ -421,7 +421,7 @@ public: all views, so the return value tells the caller if the relocation was successful. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow); + virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow); /** Depending on the given request create a new page or duplicate an existing one. A new page is created behind the given slide. @@ -568,7 +568,7 @@ protected: void doShow(); private: - ::Window* mpParentWindow; + ::vcl::Window* mpParentWindow; /** This window updater is used to keep all relevant windows up to date with reference to the digit langugage used to display digits in text shapes. |