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/outliner.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/outliner.hxx')
-rw-r--r-- | include/editeng/outliner.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 18ac8316d799..5a020c147830 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -49,7 +49,7 @@ class SvxBulletItem; class SvxFont; class SvxSearchItem; class SvxFieldItem; -class Window; +namespace vcl { class Window; } class KeyEvent; class MouseEvent; class Pointer; @@ -203,7 +203,7 @@ private: EDITENG_DLLPRIVATE sal_Int32 ImpCalcSelectedPages( bool bIncludeFirstSelected ); public: - OutlinerView( Outliner* pOut, Window* pWindow ); + OutlinerView( Outliner* pOut, vcl::Window* pWindow ); virtual ~OutlinerView(); EditView& GetEditView() const { return *pEditView; } @@ -211,7 +211,7 @@ public: void Scroll( long nHorzScroll, long nVertScroll ); void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); - bool PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL ); + bool PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin = NULL ); bool MouseButtonDown( const MouseEvent& ); bool MouseButtonUp( const MouseEvent& ); bool MouseMove( const MouseEvent& ); @@ -221,8 +221,8 @@ public: Outliner* GetOutliner() const { return pOwner; } - void SetWindow( Window* pWindow ); - Window* GetWindow() const; + void SetWindow( vcl::Window* pWindow ); + vcl::Window* GetWindow() const; void SetReadOnly( bool bReadOnly ); bool IsReadOnly() const; |