diff options
| author | Eike Rathke <erack@redhat.com> | 2012-04-10 23:50:29 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-04-10 23:50:29 +0200 |
| commit | 684cf5cca6ea6c8fc2743f1622f624f668db9e84 (patch) | |
| tree | d190d957b21ecac67c68ced3c87b005b39c009b2 /sc/source/ui/dbgui/csvgrid.cxx | |
| parent | 5a5f77c3b57fb1c91a178190c1db12606295bf17 (diff) | |
resolved fdo#48516 use "max columns exceeded" message if appropriate
In CSV import, instead of SCWARN_IMPORT_RANGE_OVERFLOW use
SCWARN_IMPORT_ROW_OVERFLOW and SCWARN_IMPORT_COLUMN_OVERFLOW that already
existed, additionally introduced SCWARN_IMPORT_CELL_OVERFLOW if single field
data exceeds STRING_MAXLEN.
Row overflow takes precedence over column overflow that takes precedence over
cell overflow.
Diffstat (limited to 'sc/source/ui/dbgui/csvgrid.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/csvgrid.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 09d3651e6fde..68c6fd9dca38 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -750,7 +750,10 @@ void ScCsvGrid::ImplSetTextLineSep( { // scan for next cell text bool bIsQuoted = false; - pChar = ScImportExport::ScanNextFieldFromString( pChar, aCellText, cTextSep, pSepChars, bMergeSep, bIsQuoted ); + bool bOverflowCell = false; + pChar = ScImportExport::ScanNextFieldFromString( pChar, aCellText, + cTextSep, pSepChars, bMergeSep, bIsQuoted, bOverflowCell ); + /* TODO: signal overflow somewhere in UI */ // update column width sal_Int32 nWidth = Max( CSV_MINCOLWIDTH, aCellText.Len() + sal_Int32( 1 ) ); |