include/tools/wintypes.hxx | 1 +
vcl/source/control/fmtfield.cxx | 2 +-
vcl/source/window/window.cxx | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 82cab41a40148c1aad9a0d49b2e7d852821d4996
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Wed May 6 14:08:07 2020 -0400
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Thu May 21 00:46:15 2020 +0200
lok: fix the window type of the formatted field control
Change-Id: Iab87c94ca19314eacec18e71d7d09ba42f1756e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93778
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Henry Castro <hcas...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94526
Tested-by: Henry Castro <hcas...@collabora.com>
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 1f981e3e351c..5ac59bb0ee22 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -69,6 +69,7 @@ enum class WindowType : sal_uInt16
PATTERNFIELD ,
NUMERICFIELD , // 40 (344)
METRICFIELD ,
+ FORMATTEDFIELD ,
CURRENCYFIELD ,
DATEFIELD ,
TIMEFIELD ,
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index 65c25ba83c6f..df4f43f0ed78 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -291,7 +291,7 @@ FormattedField::StaticFormatter::~StaticFormatter()
}
FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle)
- :SpinField(pParent, nStyle)
+ :SpinField(pParent, nStyle, WindowType::FORMATTEDFIELD)
,m_aLastSelection(0,0)
,m_dMinValue(0)
,m_dMaxValue(0)
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 1670d728b51c..df73e936e8a8 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3314,6 +3314,7 @@ const char* windowTypeName(WindowType nWindowType)
case WindowType::PATTERNFIELD: return "patternfield";
case WindowType::NUMERICFIELD: return "numericfield";
case WindowType::METRICFIELD: return "metricfield";
+ case WindowType::FORMATTEDFIELD: return "formattedfield";
case WindowType::CURRENCYFIELD: return "currencyfield";
case WindowType::DATEFIELD: return "datefield";
case WindowType::TIMEFIELD: return "timefield";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
