From 827c46e7d75000cb03b0ce21759f9d0825f0c096 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 23 Sep 2014 11:20:40 +0200
Subject: fdo#82577: Handle Window

Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
---
 include/svtools/fmtfield.hxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/svtools/fmtfield.hxx')

diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index d7bd1f1f1eac..3c13f0fefb5d 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -94,7 +94,7 @@ protected:
     bool                m_bUseInputStringForFormatting;
 
 public:
-    FormattedField(Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0);
+    FormattedField(vcl::Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0);
     virtual ~FormattedField();
 
     // Min-/Max-Verwaltung
@@ -266,7 +266,7 @@ protected:
     validation::NumberValidator*    m_pNumberValidator;
 
 public:
-    DoubleNumericField(Window* pParent, WinBits nStyle = 0)
+    DoubleNumericField(vcl::Window* pParent, WinBits nStyle = 0)
         :FormattedField(pParent, nStyle)
         ,m_pNumberValidator( NULL )
     {
@@ -294,7 +294,7 @@ class DoubleCurrencyField : public FormattedField
     bool       m_bChangingFormat;
 
 public:
-    DoubleCurrencyField(Window* pParent, WinBits nStyle = 0);
+    DoubleCurrencyField(vcl::Window* pParent, WinBits nStyle = 0);
 
     OUString    getCurrencySymbol() const { return m_sCurrencySymbol; }
     void        setCurrencySymbol(const OUString& rSymbol);
-- 
cgit