diff options
| author | Eike Rathke <erack@redhat.com> | 2011-11-28 00:19:12 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2011-11-28 15:25:30 +0100 |
| commit | 078796d28653118a5b225a6871e8392df1458e11 (patch) | |
| tree | b0d7eb66c4c0f439df769bf948e66fb7cef9a1d7 /sc | |
| parent | 885c328ba59b1bc70123997e22536f15f74536d0 (diff) | |
dr78: #i115474# use correct defaults for clipboard text import options
# HG changeset patch
# User Niklas Nebel <nn@openoffice.org>
# Date 1292252971 -3600
# Node ID bd03086b10d4f378b4495aba27f524e1798a7cff
# Parent 31b53a2ec7e32f9560464f8a3b9f6c3e07b29083
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/dbgui/scuiasciiopt.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index f13fffc09459..2d7fded3b6a9 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -200,7 +200,7 @@ static void save_Separators( // ---------------------------------------------------------------------------- ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, - SvStream* pInStream, sal_Unicode /*cSep*/ ) : + SvStream* pInStream, sal_Unicode cSep ) : ModalDialog ( pParent, ScResId( RID_SCDLG_ASCII ) ), mpDatStream ( pInStream ), mnStreamPos( pInStream ? pInStream->Tell() : 0 ), @@ -281,6 +281,12 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, // load separators only when importing csv files. load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters, bQuotedFieldAsText, bDetectSpecialNum, bFixedWidth, nFromRow, nCharSet, nLanguage); + else + { + // #i115474# otherwise use sensible defaults + sFieldSeparators = OUString( cSep ); + sTextSeparators = OUString( ScAsciiOptions::cDefaultTextSep ); + } maFieldSeparators = String(sFieldSeparators); if( bMergeDelimiters ) |