diff options
author | Dennis Francis <dennisfrancis.in@gmail.com> | 2015-09-18 07:33:27 +0530 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-10-15 17:14:06 +0000 |
commit | 1995ad7d080b1a9da29f0ebfb06641451d6f3653 (patch) | |
tree | 4d16f57a26623a8f89ac2bc04aba4e0e2b93f3cb /vcl | |
parent | 4bfde7402dee4f3639bd23c1dc987ceafea87cfc (diff) |
Resolves: tdf#94848 crash on focus with un-cleared but dead mpSubEdit
was... fixes memleak : clear self referring VclPtr in MetricBox
Clears self referring VclPtr called mpField in MetricBox (inherited from FormatterBase class)
via dispose() method of MetricBox.
Reviewed-on: https://gerrit.libreoffice.org/18674
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 36c11cb71c6ec107cc08b16109e468765abc9867)
Change-Id: I375e03e814de3c6e47c36b1fc6f625b04521a5e2
memleak:clear self referring VclPtr in *Field and *Box classes
Clears self referring VclPtr called mpField via FormatterBase in :
1. MetricField, PatternField, NumericField, CurrencyField, DateField,
TimeField
2. PatternBox, NumericBox, CurrencyBox, DateBox, TimeBox
via respective dispose() methods.
Change-Id: I7f92fefd49756cabe7db7d240781260a2d4cd298
Reviewed-on: https://gerrit.libreoffice.org/18701
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit a44e03b5d7822d026a3b2fbaf039522f085defed)
Reviewed-on: https://gerrit.libreoffice.org/19397
Reviewed-by: Dennis Francis <dennisfrancis.in@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/control/field.cxx | 36 | ||||
-rw-r--r-- | vcl/source/control/field2.cxx | 36 |
2 files changed, 72 insertions, 0 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index cb6b46b8cb7a..4e7bd35fc9c2 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -812,6 +812,12 @@ NumericField::NumericField( vcl::Window* pParent, const ResId& rResId ) : Show(); } +void NumericField::dispose() +{ + NumericFormatter::SetField( NULL ); + SpinField::dispose(); +} + bool NumericField::set_property(const OString &rKey, const OString &rValue) { if (rKey == "digits") @@ -961,6 +967,12 @@ NumericBox::NumericBox( vcl::Window* pParent, WinBits nWinStyle ) : Show(); } +void NumericBox::dispose() +{ + NumericFormatter::SetField( NULL ); + ComboBox::dispose(); +} + Size NumericBox::CalcMinimumSize() const { Size aRet(calcMinimumSize(*this, *this)); @@ -1636,6 +1648,12 @@ MetricField::MetricField( vcl::Window* pParent, const ResId& rResId ) : Show(); } +void MetricField::dispose() +{ + MetricFormatter::SetField( NULL ); + SpinField::dispose(); +} + Size MetricField::CalcMinimumSize() const { return calcMinimumSize(*this, *this); @@ -1800,6 +1818,12 @@ MetricBox::MetricBox( vcl::Window* pParent, WinBits nWinStyle ) : Reformat(); } +void MetricBox::dispose() +{ + MetricFormatter::SetField(NULL); + ComboBox::dispose(); +} + Size MetricBox::CalcMinimumSize() const { Size aRet(calcMinimumSize(*this, *this)); @@ -2040,6 +2064,12 @@ CurrencyField::CurrencyField( vcl::Window* pParent, WinBits nWinStyle ) : Reformat(); } +void CurrencyField::dispose() +{ + CurrencyFormatter::SetField( NULL ); + SpinField::dispose(); +} + bool CurrencyField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) @@ -2118,6 +2148,12 @@ CurrencyBox::CurrencyBox( vcl::Window* pParent, WinBits nWinStyle ) : Reformat(); } +void CurrencyBox::dispose() +{ + CurrencyFormatter::SetField( NULL ); + ComboBox::dispose(); +} + bool CurrencyBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index c9253f89ac9f..aaca5de048c0 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -819,6 +819,12 @@ PatternField::PatternField( vcl::Window* pParent, WinBits nWinStyle ) : Reformat(); } +void PatternField::dispose() +{ + PatternFormatter::SetField( NULL ); + SpinField::dispose(); +} + bool PatternField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) @@ -865,6 +871,12 @@ PatternBox::PatternBox( vcl::Window* pParent, WinBits nWinStyle ) : Reformat(); } +void PatternBox::dispose() +{ + PatternFormatter::SetField( NULL ); + ComboBox::dispose(); +} + bool PatternBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) @@ -1729,6 +1741,12 @@ DateField::DateField( vcl::Window* pParent, WinBits nWinStyle ) : ResetLastDate(); } +void DateField::dispose() +{ + DateFormatter::SetField( NULL ); + SpinField::dispose(); +} + bool DateField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && IsStrictFormat() && @@ -1828,6 +1846,12 @@ DateBox::DateBox( vcl::Window* pParent, WinBits nWinStyle ) : Reformat(); } +void DateBox::dispose() +{ + DateFormatter::SetField( NULL ); + ComboBox::dispose(); +} + bool DateBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && IsStrictFormat() && @@ -2515,6 +2539,12 @@ TimeField::TimeField( vcl::Window* pParent, WinBits nWinStyle ) : Reformat(); } +void TimeField::dispose() +{ + TimeFormatter::SetField( NULL ); + SpinField::dispose(); +} + bool TimeField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) @@ -2652,6 +2682,12 @@ TimeBox::TimeBox( vcl::Window* pParent, WinBits nWinStyle ) : Reformat(); } +void TimeBox::dispose() +{ + TimeFormatter::SetField( NULL ); + ComboBox::dispose(); +} + bool TimeBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) |