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/svtools/ruler.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/svtools/ruler.hxx')
| -rw-r--r-- | include/svtools/ruler.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 67eb55d84035..49d4e424da4b 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -607,7 +607,7 @@ struct RulerUnitData class ImplRulerData; -class SVT_DLLPUBLIC Ruler : public Window +class SVT_DLLPUBLIC Ruler : public vcl::Window { private: VirtualDevice maVirDev; @@ -712,7 +712,7 @@ protected: RulerUnitData GetCurrentRulerUnit() const; public: - Ruler( Window* pParent, WinBits nWinStyle = WB_STDRULER ); + Ruler( vcl::Window* pParent, WinBits nWinStyle = WB_STDRULER ); virtual ~Ruler(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; |