include/vcl/spinfld.hxx | 2 +- vcl/source/control/field.cxx | 2 +- vcl/source/control/spinfld.cxx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit f2a9de42289c53e9e712c853eebcd16cfe05b174 Author: Henry Castro <[email protected]> AuthorDate: Thu Apr 23 11:14:16 2020 -0400 Commit: Henry Castro <[email protected]> CommitDate: Thu May 21 00:43:41 2020 +0200 lok: fix the window type of the metric field control Change-Id: I286be638a562e3042c1c91e40cb60a9c98938360 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92796 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Henry Castro <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94521 Tested-by: Henry Castro <[email protected]> diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 23a2b5e51c05..8fb21f8605fd 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -28,7 +28,7 @@ class VCL_DLLPUBLIC SpinField : public Edit { public: - explicit SpinField( vcl::Window* pParent, WinBits nWinStyle ); + explicit SpinField( vcl::Window* pParent, WinBits nWinStyle, WindowType nType = WindowType::SPINFIELD ); virtual ~SpinField() override; virtual void dispose() override; diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 13dac4cc8ac9..54d692e4c60a 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1635,7 +1635,7 @@ sal_Int64 MetricFormatter::GetCorrectedValue( FieldUnit eOutUnit ) const } MetricField::MetricField(vcl::Window* pParent, WinBits nWinStyle) - : SpinField(pParent, nWinStyle) + : SpinField(pParent, nWinStyle, WindowType::METRICFIELD) , MetricFormatter(this) { Reformat(); diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 263af6f90179..c3b18a4d82c0 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -337,8 +337,8 @@ void SpinField::ImplInit(vcl::Window* pParent, WinBits nWinStyle) } } -SpinField::SpinField(vcl::Window* pParent, WinBits nWinStyle) : - Edit(WindowType::SPINFIELD) +SpinField::SpinField(vcl::Window* pParent, WinBits nWinStyle, WindowType nType) : + Edit(nType) { ImplInitSpinFieldData(); ImplInit(pParent, nWinStyle); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
