diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-25 07:36:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-25 07:36:56 +0000 |
| commit | d8b63d5600800f06076211ab6e8a2a5412413195 (patch) | |
| tree | d58968c0538ac393499a034085d820fc535f3cd1 | |
| parent | 6b403a5cd6f9665f84656b66b4a6152d1f375733 (diff) | |
INTEGRATION: CWS chart07 (1.2.12); FILE MERGED
2007/06/21 15:50:09 bm 1.2.12.1: #i76760# don't update the model with empty ranges before the range choser is opened
| -rw-r--r-- | chart2/source/controller/dialogs/tp_DataSource.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 916fb6c99..03209a6ca 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tp_DataSource.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-05-22 17:44:53 $ + * last change: $Author: rt $ $Date: 2007-07-25 08:36:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -665,7 +665,8 @@ IMPL_LINK( DataSourceTabPage, MainRangeButtonClickedHdl, void *, EMPTYARG ) { OSL_ASSERT( m_pCurrentRangeChoosingField == 0 ); m_pCurrentRangeChoosingField = & m_aEDT_RANGE; - if( ! updateModelFromControl( m_pCurrentRangeChoosingField )) + if( m_aEDT_RANGE.GetText().Len() > 0 && + ! updateModelFromControl( m_pCurrentRangeChoosingField )) return 0; SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected()); @@ -708,7 +709,8 @@ IMPL_LINK( DataSourceTabPage, CategoriesRangeButtonClickedHdl, void *, EMPTYARG { OSL_ASSERT( m_pCurrentRangeChoosingField == 0 ); m_pCurrentRangeChoosingField = & m_aEDT_CATEGORIES; - if( ! updateModelFromControl( m_pCurrentRangeChoosingField )) + if( m_aEDT_CATEGORIES.GetText().Len() > 0 && + ! updateModelFromControl( m_pCurrentRangeChoosingField )) return 0; String aStr( SchResId( m_aFT_CATEGORIES.IsVisible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS )); |