diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-18 13:54:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-18 13:54:19 +0000 |
| commit | 86a3202d2425a826e593a469ef2294085cb2a4bf (patch) | |
| tree | ab19c67a28a1a7fdd4916fef96d915c305e104ad | |
| parent | eedd9689b6de3eb0d07a1ba7d652086b02514138 (diff) | |
INTEGRATION: CWS chart11 (1.3.2); FILE MERGED
2007/08/30 12:20:12 bm 1.3.2.2: #i79259# get the focus back to the edit field after range choosing
2007/08/30 11:11:44 bm 1.3.2.1: #i79259# handle F2 in range edit fields for opening the range chooser
| -rw-r--r-- | chart2/source/controller/dialogs/tp_DataSource.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 03209a6ca..66b4a9834 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.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2007-07-25 08:36:56 $ + * last change: $Author: vg $ $Date: 2007-09-18 14:54:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -341,6 +341,9 @@ DataSourceTabPage::DataSourceTabPage( m_aLB_ROLE.SetSelectionMode( SINGLE_SELECTION ); m_aLB_ROLE.SetSelectHdl( LINK( this, DataSourceTabPage, RoleSelectionChangedHdl )); + m_aEDT_RANGE.SetKeyInputHdl( LINK( this, DataSourceTabPage, MainRangeButtonClickedHdl )); + m_aEDT_CATEGORIES.SetKeyInputHdl( LINK( this, DataSourceTabPage, CategoriesRangeButtonClickedHdl )); + m_aIMB_RANGE_MAIN.SetClickHdl( LINK( this, DataSourceTabPage, MainRangeButtonClickedHdl )); m_aIMB_RANGE_CAT.SetClickHdl( LINK( this, DataSourceTabPage, CategoriesRangeButtonClickedHdl )); @@ -880,10 +883,13 @@ void DataSourceTabPage::listeningFinished( m_rDialogModel.getRangeSelectionHelper()->stopRangeListening(); // change edit field - if( m_pCurrentRangeChoosingField != 0 ) - m_pCurrentRangeChoosingField->SetText( String( aRange )); ToTop(); GrabFocus(); + if( m_pCurrentRangeChoosingField ) + { + m_pCurrentRangeChoosingField->SetText( String( aRange )); + m_pCurrentRangeChoosingField->GrabFocus(); + } if( m_pCurrentRangeChoosingField == & m_aEDT_RANGE ) { |