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/inc/hhcwrp.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/inc/hhcwrp.hxx')
| -rw-r--r-- | sw/inc/hhcwrp.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index d90d2fe7f7ed..138c72c25427 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -22,7 +22,7 @@ #include <editeng/hangulhanja.hxx> class SwView; -class Window; +namespace vcl { class Window; } class SwWrtShell; struct SwConversionArgs; class SwPaM; @@ -30,7 +30,7 @@ class SwPaM; class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion { SwView * m_pView; - Window* m_pWin; + vcl::Window* m_pWin; SwWrtShell &m_rWrtShell; SwConversionArgs *m_pConvArgs; /**< object for arguments (and results) needed |