diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 11:08:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 11:08:42 +0000 |
| commit | 2695a285f25f3aedab3e202f98b949803c268299 (patch) | |
| tree | 70fc2d0e11726ba6e246e6503d8535364bf76d48 /sc/source/ui/dbgui/scuiasciiopt.cxx | |
| parent | 51da24613944f69237f17c2e799970fe408b1baa (diff) | |
INTEGRATION: CWS dr37 (1.6.202); FILE MERGED
2005/03/23 11:56:05 dr 1.6.202.1: #i41550# first update checkbox, then update preview
Diffstat (limited to 'sc/source/ui/dbgui/scuiasciiopt.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/scuiasciiopt.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 369273e236f9..27018594ed76 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -4,9 +4,9 @@ * * $RCSfile: scuiasciiopt.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 20:41:39 $ + * last change: $Author: hr $ $Date: 2005-09-28 12:08:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -423,6 +423,13 @@ IMPL_LINK( ScImportAsciiDlg, SeparatorHdl, Control*, pCtrl ) DBG_ASSERT( pCtrl, "ScImportAsciiDlg::SeparatorHdl - missing sender" ); DBG_ASSERT( !aRbFixed.IsChecked(), "ScImportAsciiDlg::SeparatorHdl - not allowed in fixed width" ); + /* #i41550# First update state of the controls. The GetSeparators() + function needs final state of the check boxes. */ + if( (pCtrl == &aCkbOther) && aCkbOther.IsChecked() ) + aEdOther.GrabFocus(); + else if( pCtrl == &aEdOther ) + aCkbOther.Check( aEdOther.GetText().Len() > 0 ); + String aOldFldSeps( maFieldSeparators); maFieldSeparators = GetSeparators(); sal_Unicode cOldSep = mcTextSep; @@ -432,10 +439,6 @@ IMPL_LINK( ScImportAsciiDlg, SeparatorHdl, Control*, pCtrl ) if (cOldSep != mcTextSep || aOldFldSeps != maFieldSeparators) UpdateVertical(); - if( (pCtrl == &aCkbOther) && aCkbOther.IsChecked() ) - aEdOther.GrabFocus(); - else if( pCtrl == &aEdOther ) - aCkbOther.Check( aEdOther.GetText().Len() > 0 ); maTableBox.Execute( CSVCMD_NEWCELLTEXTS ); return 0; } |