diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-07-02 16:57:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-05 21:35:55 +0200 |
| commit | 9202793ed81c5568f6789504335446b97e8087da (patch) | |
| tree | 6a80917116dccbc81c286bc619bd4e9a71892fa5 /svx | |
| parent | 0c4336e83fe86addd86814eebc33e7f5b8ddc1ce (diff) | |
loosen requirement that createField return something derived from SpinField
Change-Id: I2f15717d2e96f21c3fcbbcfd9eda6544daf2a0a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97984
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 10 | ||||
| -rw-r--r-- | svx/source/inc/gridcell.hxx | 10 |
2 files changed, 9 insertions, 11 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 2a4213ffcede..098ae2e3356b 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1944,7 +1944,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe rPaintFormatter.SetFormat( sFormatString, aAppLanguage ); } -VclPtr<SpinField> DbNumericField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ ) +VclPtr<Control> DbNumericField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ ) { WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0; return VclPtr<DoubleNumericField>::Create( _pParent, _nFieldStyle ); @@ -2072,14 +2072,12 @@ void DbCurrencyField::implAdjustGenericFieldSetting( const Reference< XPropertyS static_cast< LongCurrencyField* >( m_pPainter.get() )->SetStrictFormat( bStrict ); } - -VclPtr<SpinField> DbCurrencyField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ ) +VclPtr<Control> DbCurrencyField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ ) { WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0; return VclPtr<LongCurrencyField>::Create( _pParent, _nFieldStyle ); } - double DbCurrencyField::GetCurrency(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) const { double fValue = GetValue(_rxField, xFormatter); @@ -2179,7 +2177,7 @@ DbDateField::DbDateField( DbGridColumn& _rColumn ) doPropertyListening( FM_PROP_DATE_SHOW_CENTURY ); } -VclPtr<SpinField> DbDateField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& _rxModel ) +VclPtr<Control> DbDateField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& _rxModel ) { WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0; // check if there is a DropDown property set to TRUE @@ -2306,7 +2304,7 @@ DbTimeField::DbTimeField( DbGridColumn& _rColumn ) doPropertyListening( FM_PROP_STRICTFORMAT ); } -VclPtr<SpinField> DbTimeField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ ) +VclPtr<Control> DbTimeField::createField( vcl::Window* _pParent, bool bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ ) { WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0; return VclPtr<TimeField>::Create( _pParent, _nFieldStyle ); diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 2491152cbf0d..f63f2466b720 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -545,7 +545,7 @@ public: virtual ::svt::CellControllerRef CreateController() const override; protected: - virtual VclPtr<SpinField> createField( + virtual VclPtr<Control> createField( vcl::Window* _pParent, bool bSpinButton, const css::uno::Reference< css::beans::XPropertySet >& _rxModel @@ -566,7 +566,7 @@ protected: virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; // DbSpinField - virtual VclPtr<SpinField> createField( + virtual VclPtr<Control> createField( vcl::Window* _pParent, bool bSpinButton, const css::uno::Reference< css::beans::XPropertySet >& _rxModel @@ -590,7 +590,7 @@ protected: virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; // DbSpinField - virtual VclPtr<SpinField> createField( + virtual VclPtr<Control> createField( vcl::Window* _pParent, bool bSpinButton, const css::uno::Reference< css::beans::XPropertySet >& _rxModel @@ -618,7 +618,7 @@ protected: virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; // DbSpinField - virtual VclPtr<SpinField> createField( + virtual VclPtr<Control> createField( vcl::Window* _pParent, bool bSpinButton, const css::uno::Reference< css::beans::XPropertySet >& _rxModel @@ -642,7 +642,7 @@ protected: virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; // DbSpinField - virtual VclPtr<SpinField> createField( + virtual VclPtr<Control> createField( vcl::Window* _pParent, bool bSpinButton, const css::uno::Reference< css::beans::XPropertySet >& _rxModel |