diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-21 11:13:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-21 11:13:07 +0000 |
| commit | a880c34c54a637d00c1db5905327ab27731293e6 (patch) | |
| tree | 2dcb192581232c65d83d61bed3313a8df8d6abb6 /chart2/source/controller | |
| parent | a7b6cb01f9372390e5c59f42a7e2be6d4d483010 (diff) | |
INTEGRATION: CWS chart29 (1.5.40); FILE MERGED
2008/07/08 08:00:06 iha 1.5.40.1: #i88825# use update timer for range changes
Diffstat (limited to 'chart2/source/controller')
| -rw-r--r-- | chart2/source/controller/dialogs/tp_RangeChooser.cxx | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index a48fe1073..75e1c9e15 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tp_RangeChooser.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -166,7 +166,8 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent // #i75179# enable setting the background to a different color m_aED_Range.SetStyle( m_aED_Range.GetStyle() | WB_FORCECTRLBACKGROUND ); - m_aED_Range.SetModifyHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl )); + m_aED_Range.SetUpdateDataHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl )); + m_aED_Range.SetModifyHdl( LINK( this, RangeChooserTabPage, ControlEditedHdl )); m_aRB_Rows.SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); m_aCB_FirstRowAsLabel.SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); m_aCB_FirstColumnAsLabel.SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); @@ -179,7 +180,6 @@ RangeChooserTabPage::~RangeChooserTabPage() void RangeChooserTabPage::ActivatePage() { OWizardPage::ActivatePage(); - initControlsFromModel(); } @@ -216,11 +216,6 @@ void RangeChooserTabPage::initControlsFromModel() m_nChangingControlCalls--; } -void RangeChooserTabPage::changeModelAccordingToControls() -{ - changeDialogModelAccordingToControls(); -} - void RangeChooserTabPage::changeDialogModelAccordingToControls() { if(m_nChangingControlCalls>0) @@ -237,7 +232,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls() } } - if( isDirty() ) + if( m_bIsDirty ) { sal_Bool bFirstCellAsLabel = ( m_aCB_FirstColumnAsLabel.IsChecked() && !m_aRB_Columns.IsChecked() ) || ( m_aCB_FirstRowAsLabel.IsChecked() && !m_aRB_Rows.IsChecked() ); @@ -332,6 +327,12 @@ bool RangeChooserTabPage::isValid() return bIsValid; } +IMPL_LINK( RangeChooserTabPage, ControlEditedHdl, void*, EMPTYARG ) +{ + setDirty(); + isValid(); + return 0; +} IMPL_LINK( RangeChooserTabPage, ControlChangedHdl, void*, EMPTYARG ) { @@ -388,11 +389,6 @@ void RangeChooserTabPage::setDirty() m_bIsDirty = true; } -bool RangeChooserTabPage::isDirty() const -{ - return m_bIsDirty; -} - //............................................................................. } //namespace chart //............................................................................. |