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/DrawViewShell.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/DrawViewShell.hxx')
| -rw-r--r-- | sd/source/ui/inc/DrawViewShell.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 15add1df9891..967c7e3ce1e5 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -87,7 +87,7 @@ public: DrawViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, PageKind ePageKind = PK_STANDARD, FrameView* pFrameView = NULL); @@ -261,7 +261,7 @@ public: //false. void FreshNavigatrEntry(); void FreshNavigatrTree(); - void MakeVisible(const Rectangle& rRect, ::Window& rWin); + void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin); virtual void ReadFrameViewData(FrameView* pView) SAL_OVERRIDE; virtual void WriteFrameViewData() SAL_OVERRIDE; @@ -373,7 +373,7 @@ public: /** Relocation to a new parent window is not supported for DrawViewShell objects so this method always returns <FALSE/>. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; OUString GetSidebarContextName (void) const; |