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/fmtfield.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/fmtfield.hxx')
| -rw-r--r-- | include/svtools/fmtfield.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
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); |