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 /sw/source/uibase/inc/wrtsh.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 'sw/source/uibase/inc/wrtsh.hxx')
| -rw-r--r-- | sw/source/uibase/inc/wrtsh.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 2ba573a4c0ca..4c03c9164cd9 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -28,7 +28,7 @@ #include "navmgr.hxx" #include <boost/optional.hpp> -class Window; +namespace vcl { class Window; } class SbxArray; class SwDoc; class SwViewOption; @@ -389,7 +389,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void MoveCrsr( bool bWithSelect = false ); // update input fields - bool StartInputFldDlg(SwField*, bool bNextButton, Window* pParentWin = 0, OString* pWindowState = 0); + bool StartInputFldDlg(SwField*, bool bNextButton, vcl::Window* pParentWin = 0, OString* pWindowState = 0); // update DropDown fields bool StartDropDownFldDlg(SwField*, bool bNextButton, OString* pWindowState = 0); @@ -446,8 +446,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); DECL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData* ); // ctor, the first one is a kind of a controlled copy ctor for more views of a document - SwWrtShell( SwWrtShell&, Window *pWin, SwView &rShell); - SwWrtShell( SwDoc& rDoc, Window *pWin, SwView &rShell, + SwWrtShell( SwWrtShell&, vcl::Window *pWin, SwView &rShell); + SwWrtShell( SwDoc& rDoc, vcl::Window *pWin, SwView &rShell, const SwViewOption *pViewOpt = 0); virtual ~SwWrtShell(); |