add SCWARN_EXPORT_MAXTAB and SCWARN_EXPORT_MAXCOL

Create separate warnings when the maximum number of row, columns or
sheets is reach in the export filter to xls forma.

sc/inc/scerrors.hxx

@@ -68,7 +68,9 @@
 #define SCWARN_EXPORT_NONCONVERTIBLE_CHARS  (   1 | ERRCODE_CLASS_EXPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
 #define SCWARN_EXPORT_ASCII         (   2 | ERRCODE_CLASS_EXPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
 #define SCWARN_EXPORT_MAXROW        (   3 | ERRCODE_CLASS_EXPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
-#define SCWARN_EXPORT_DATALOST      (   4 | ERRCODE_CLASS_EXPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
+#define SCWARN_EXPORT_MAXCOL        (   4 | ERRCODE_CLASS_EXPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
+#define SCWARN_EXPORT_MAXTAB        (   5 | ERRCODE_CLASS_EXPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
+#define SCWARN_EXPORT_DATALOST      (   6 | ERRCODE_CLASS_EXPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
 
 // ERRCODE_CLASS_GENERAL
 #define SCWARN_CORE_HARD_RECALC     (   1 | ERRCODE_CLASS_GENERAL | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )

sc/source/filter/excel/expop2.cxx

@@ -124,10 +124,13 @@ FltError ExportBiff5::Write()
             sfx2::SaveOlePropertySet(xDocProps, xRootStrg );
     }
 
-    //! TODO: separate warnings for columns and sheets
     const XclExpAddressConverter& rAddrConv = GetAddressConverter();
-    if( rAddrConv.IsColTruncated() || rAddrConv.IsRowTruncated() || rAddrConv.IsTabTruncated() )
+    if( rAddrConv.IsRowTruncated() )
         return SCWARN_EXPORT_MAXROW;
+    if( rAddrConv.IsColTruncated() )
+        return SCWARN_EXPORT_MAXCOL;
+    if( rAddrConv.IsTabTruncated() )
+        return SCWARN_EXPORT_MAXTAB;
 
     return eERR_OK;
 }

sc/source/ui/src/scerrors.src

@@ -150,6 +150,14 @@ Resource RID_ERRHDLSC
     {
         Text [ en-US ] = "The document contains more rows than supported in the selected format.\nAdditional rows were not saved." ;
     };
+    String SCWARN_EXPORT_MAXCOL & ERRCODE_RES_MASK
+    {
+        Text [ en-US ] = "The document contains more columns than supported in the selected format.\nAdditional columns were not saved." ;
+    };
+    String SCWARN_EXPORT_MAXTAB & ERRCODE_RES_MASK
+    {
+        Text [ en-US ] = "The document contains more sheets than supported in the selected format.\nAdditional sheets were not saved." ;
+    };
     String SCWARN_IMPORT_INFOLOST & ERRCODE_RES_MASK
     {
         Text [ en-US ] = "The document contains information not recognized by this program version.\nResaving the document will delete this information!" ;