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/inc/scerrors.hxx | |
| 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/inc/scerrors.hxx')
| -rw-r--r-- | sc/inc/scerrors.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx index fc6b9cbfbe4d..ea7e590543fc 100644 --- a/sc/inc/scerrors.hxx +++ b/sc/inc/scerrors.hxx @@ -60,9 +60,10 @@ // ERRCODE_CLASS_IMPORT - does not display "Read-Error" in MsgBox #define SCWARN_IMPORT_RANGE_OVERFLOW ( 1 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) -#define SCWARN_IMPORT_ROW_OVERFLOW ( 2 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) -#define SCWARN_IMPORT_COLUMN_OVERFLOW ( 3 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) +#define SCWARN_IMPORT_ROW_OVERFLOW ( 2 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) +#define SCWARN_IMPORT_COLUMN_OVERFLOW ( 3 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) #define SCWARN_IMPORT_SHEET_OVERFLOW ( 4 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) +#define SCWARN_IMPORT_CELL_OVERFLOW ( 5 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) // ERRCODE_CLASS_EXPORT - does not display "Write-Error" in MsgBox #define SCWARN_EXPORT_NONCONVERTIBLE_CHARS ( 1 | ERRCODE_CLASS_EXPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) |