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/viewopt.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/viewopt.hxx')
| -rw-r--r-- | sw/inc/viewopt.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 98e875e72eda..2833f1104266 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -31,7 +31,7 @@ #include "authratr.hxx" class SwRect; -class Window; +namespace vcl { class Window; } class OutputDevice; class SwViewShell; class SwDocShell; @@ -182,7 +182,7 @@ public: SwViewOption(const SwViewOption&); ~SwViewOption(); - void Init( Window *pWin ); // Initializing of static data. + void Init( vcl::Window *pWin ); // Initializing of static data. sal_uInt16 GetPixelTwips() const { return nPixelTwips; } |