Kaydet (Commit) 6b580785 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Xisco Faulí

Resolves: tdf#123231 spin-button focus loss triggers changing active radio

Change-Id: I6562631df4225d5aa4fe650c40be7c0424eb5621
Reviewed-on: https://gerrit.libreoffice.org/67690
Tested-by: Jenkins
Reviewed-by: 's avatarXisco Faulí <xiscofauli@libreoffice.org>
üst 5468cf11
...@@ -164,6 +164,8 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs ) ...@@ -164,6 +164,8 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
m_xNF_Degree->set_value( 2 ); m_xNF_Degree->set_value( 2 );
} }
m_xNF_Degree->save_value();
if( rInAttrs.GetItemState( SCHATTR_REGRESSION_PERIOD, true, &pPoolItem ) == SfxItemState::SET ) if( rInAttrs.GetItemState( SCHATTR_REGRESSION_PERIOD, true, &pPoolItem ) == SfxItemState::SET )
{ {
sal_Int32 nPeriod = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); sal_Int32 nPeriod = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
...@@ -174,6 +176,8 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs ) ...@@ -174,6 +176,8 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
m_xNF_Period->set_value( 2 ); m_xNF_Period->set_value( 2 );
} }
m_xNF_Period->save_value();
double nValue = 0.0; double nValue = 0.0;
if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD, true, &pPoolItem ) == SfxItemState::SET ) if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD, true, &pPoolItem ) == SfxItemState::SET )
{ {
...@@ -342,7 +346,7 @@ IMPL_LINK(TrendlineResources, ChangeSpinValue, weld::SpinButton&, rNumericField, ...@@ -342,7 +346,7 @@ IMPL_LINK(TrendlineResources, ChangeSpinValue, weld::SpinButton&, rNumericField,
{ {
if (&rNumericField == m_xNF_Degree.get()) if (&rNumericField == m_xNF_Degree.get())
{ {
if (!m_xRB_Polynomial->get_active()) if (!m_xRB_Polynomial->get_active() && m_xNF_Degree->get_value_changed_from_saved())
{ {
m_xRB_Polynomial->set_active(true); m_xRB_Polynomial->set_active(true);
SelectTrendLine(*m_xRB_Polynomial); SelectTrendLine(*m_xRB_Polynomial);
...@@ -350,7 +354,7 @@ IMPL_LINK(TrendlineResources, ChangeSpinValue, weld::SpinButton&, rNumericField, ...@@ -350,7 +354,7 @@ IMPL_LINK(TrendlineResources, ChangeSpinValue, weld::SpinButton&, rNumericField,
} }
else if (&rNumericField == m_xNF_Period.get()) else if (&rNumericField == m_xNF_Period.get())
{ {
if (!m_xRB_MovingAverage->get_active()) if (!m_xRB_MovingAverage->get_active() && m_xNF_Period->get_value_changed_from_saved())
{ {
m_xRB_MovingAverage->set_active(true); m_xRB_MovingAverage->set_active(true);
SelectTrendLine(*m_xRB_MovingAverage); SelectTrendLine(*m_xRB_MovingAverage);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment