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.

2 files changed, 13 insertions, 2 deletions

diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index a8a4ce1828b1..ab31d97a2cc3 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/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;
 }
diff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src
index 2a2e2ad47169..f77dcf006393 100644
--- a/sc/source/ui/src/scerrors.src
+++ b/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!" ;