strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dr78: #i115474# use correct defaults for clipboard text import options

Browse source 
# HG changeset patch
# User Niklas Nebel <nn@openoffice.org>
# Date 1292252971 -3600
# Node ID bd03086b10d4f378b4495aba27f524e1798a7cff
# Parent  31b53a2ec7e32f9560464f8a3b9f6c3e07b29083
This commit is contained in:
Eike Rathke 2011-11-28 00:19:12 +01:00
parent 885c328ba5
commit 078796d286
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sc/source/ui/dbgui/scuiasciiopt.cxx
View file

@ -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 )