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 3164a9a0b7603c0d3ef52bc1ed223ab481294fb3 Author: Henry Castro <[email protected]> AuthorDate: Wed May 6 14:08:07 2020 -0400 Commit: Henry Castro <[email protected]> CommitDate: Sun May 10 14:15:10 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 <[email protected]> Reviewed-by: Henry Castro <[email protected]> diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx index f3ac3956d9ee..70f1d433b906 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 4014e0ebd1e5..1ca963d2b017 100644 --- a/vcl/source/control/fmtfield.cxx +++ b/vcl/source/control/fmtfield.cxx @@ -299,7 +299,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 0a4a79a16d15..10638fa43957 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3304,6 +3304,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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
