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/svdview.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/svx/svdview.hxx')
-rw-r--r-- | include/svx/svdview.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 81debfd248df..fca5eb484505 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -194,11 +194,11 @@ public: void SetMasterPagePaintCaching(bool bOn); bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; } - bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool Command(const CommandEvent& rCEvt, Window* pWin) SAL_OVERRIDE; + bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool Command(const CommandEvent& rCEvt, vcl::Window* pWin) SAL_OVERRIDE; virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; @@ -270,17 +270,17 @@ public: // ~~~~~~~~~~~~~~~~~~~~ // Einfache Events: // ~~~~~~~~~~~~~~~~ -// sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); -// sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); -// sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); -// sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); -// sal_Bool Command(const CommandEvent& rCEvt, Window* pWin); +// sal_Bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin); +// sal_Bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin); +// sal_Bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin); +// sal_Bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin); +// sal_Bool Command(const CommandEvent& rCEvt, vcl::Window* pWin); // // Exchange (Clipboard derzeit noch ohne SdrPrivateData): // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT); // sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT); -// sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT); +// sal_Bool Paste(vcl::Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT); // // SfxItems: // ~~~~~~~~~ |