diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 12:27:09 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 12:27:09 +0000 |
| commit | 2ca85ca28561ffeafb83bba540da6e7b809a8bd9 (patch) | |
| tree | 86786371064c02f206cdf7c44b9188776792f76f /sc/source/ui/dbgui/scuiasciiopt.cxx | |
| parent | 9b7c239d5132425041362b6b3607ef79278684c0 (diff) | |
INTEGRATION: CWS dr51 (1.10.6); FILE MERGED
2006/11/02 13:08:03 er 1.10.6.2: #i15509# reverted separator preselection change, as splitting columns on tabs was the previous behavior without this feature
2006/11/02 11:44:20 er 1.10.6.1: #i15509# if from clipboard don't preselect separators, and always Unicode
Diffstat (limited to 'sc/source/ui/dbgui/scuiasciiopt.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/scuiasciiopt.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 6ba8ea3972c1..773d92ae74b2 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.10 $ + * $Revision: 1.11 $ * - * last change: $Author: ihi $ $Date: 2006-10-18 11:46:30 $ + * last change: $Author: ihi $ $Date: 2006-12-19 13:27:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -163,7 +163,8 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, String aName = GetText(); // aDatName is empty if invoked during paste from clipboard. - if (aDatName.Len()) + BOOL bClipboard = (aDatName.Len() == 0); + if (!bClipboard) { aName.AppendAscii(RTL_CONSTASCII_STRINGPARAM(" - [")); aName += aDatName; @@ -183,9 +184,10 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, } maFieldSeparators = GetSeparators(); - BOOL bPreselectUnicode = FALSE; + // Clipboard is always Unicode, else detect. + BOOL bPreselectUnicode = bClipboard; // Sniff for Unicode / not - if( mpDatStream ) + if( !bPreselectUnicode && mpDatStream ) { Seek( 0 ); mpDatStream->StartReadingUnicodeText(); |