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 /cui/source/inc/hltpbase.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 'cui/source/inc/hltpbase.hxx')
| -rw-r--r-- | cui/source/inc/hltpbase.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index d63bd1c563ca..02e42c5e7e71 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -59,7 +59,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE ); + SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart = INET_PROT_FILE ); }; @@ -79,7 +79,7 @@ private: mxDocumentFrame; protected: - Window* mpDialog; + vcl::Window* mpDialog; bool mbStdControlsInit; @@ -111,7 +111,7 @@ protected: public: SvxHyperlinkTabPageBase ( - Window *pParent, + vcl::Window *pParent, IconChoiceDialog* pDlg, const OString& rID, const OUString& rUIXMLDescription, @@ -134,7 +134,7 @@ public: virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - bool IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); } + bool IsMarkWndVisible () { return ((vcl::Window*)mpMarkWnd)->IsVisible(); } Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } bool MoveToExtraWnd ( Point aNewPos, bool bDisConnectDlg = false ); @@ -147,8 +147,8 @@ protected: virtual void SetMarkWndShouldOpen(bool bOpen); void ShowMarkWnd (); - void HideMarkWnd () { ( ( Window* ) mpMarkWnd )->Hide(); } - void InvalidateMarkWnd () { ( ( Window* ) mpMarkWnd )->Invalidate(); } + void HideMarkWnd () { ( ( vcl::Window* ) mpMarkWnd )->Hide(); } + void InvalidateMarkWnd () { ( ( vcl::Window* ) mpMarkWnd )->Invalidate(); } SfxDispatcher* GetDispatcher() const; |