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/svx/fmview.hxx | |
parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip |
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/svx/fmview.hxx')
-rw-r--r-- | include/svx/fmview.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 21e27fa9500e..3e116f0a278c 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -109,7 +109,7 @@ public: // for copying complete form structures, not only control models virtual SdrModel* GetMarkedObjModel() const SAL_OVERRIDE; - virtual bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) SAL_OVERRIDE; + virtual bool MouseButtonDown( const MouseEvent& _rMEvt, vcl::Window* _pWin ) SAL_OVERRIDE; /** grab the focus to the first form control on the view @param _bForceSync @@ -123,7 +123,7 @@ public: GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; // SdrView - bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; + bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL" FmFormPage* GetCurPage(); |