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 /include/editeng/editview.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 'include/editeng/editview.hxx')
-rw-r--r-- | include/editeng/editview.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 62c37d942cca..176de82f65e5 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -33,7 +33,7 @@ class ImpEditEngine; class ImpEditView; class SvxSearchItem; class SvxFieldItem; -class Window; +namespace vcl { class Window; } class Pointer; class KeyEvent; class MouseEvent; @@ -85,14 +85,14 @@ private: EDITENG_DLLPRIVATE EditView& operator=( const EditView& ); public: - EditView( EditEngine* pEng, Window* pWindow ); + EditView( EditEngine* pEng, vcl::Window* pWindow ); virtual ~EditView(); void SetEditEngine( EditEngine* pEditEngine ); EditEngine* GetEditEngine() const; - void SetWindow( Window* pWin ); - Window* GetWindow() const; + void SetWindow( vcl::Window* pWin ); + vcl::Window* GetWindow() const; void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); void Invalidate(); @@ -136,7 +136,7 @@ public: void InsertText( const OUString& rNew, bool bSelect = false ); - bool PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL ); + bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = NULL ); bool MouseButtonUp( const MouseEvent& rMouseEvent ); bool MouseButtonDown( const MouseEvent& rMouseEvent ); @@ -187,7 +187,7 @@ public: void SetAnchorMode( EVAnchorMode eMode ); EVAnchorMode GetAnchorMode() const; - void CompleteAutoCorrect( Window* pFrameWin = NULL ); + void CompleteAutoCorrect( vcl::Window* pFrameWin = NULL ); EESpellState StartSpeller( bool bMultipleDoc = false ); EESpellState StartThesaurus(); |