[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source

Andras Timar (via logerrit) logerrit at kemper.freedesktop.org
Fri Aug 21 10:14:07 UTC 2020


 sc/source/filter/oox/worksheetbuffer.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 29d1e35efe9fde52d2d1911597b490d81d6ffb8d
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Aug 21 11:36:39 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Aug 21 12:13:34 2020 +0200

    Use localized default sheet name, if sheet name is missing in xlsx file
    
    Change-Id: I8a4708437c41374f67e60d22f56d374c39b4ad3f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101137
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx
index 12c2c618b9bb..71baa97ec646 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -32,6 +32,8 @@
 #include <document.hxx>
 #include <documentimport.hxx>
 #include <biffhelper.hxx>
+#include <globstr.hrc>
+#include <scresid.hxx>
 
 namespace oox {
 namespace xls {
@@ -187,7 +189,7 @@ WorksheetBuffer::IndexNamePair WorksheetBuffer::createSheet( const OUString& rPr
         Reference< XSpreadsheets > xSheets( getDocument()->getSheets(), UNO_SET_THROW );
         Reference< XIndexAccess > xSheetsIA( xSheets, UNO_QUERY_THROW );
         sal_Int16 nCalcSheet = -1;
-        OUString aSheetName = rPreferredName.isEmpty() ? "Sheet" : rPreferredName;
+        OUString aSheetName = rPreferredName.isEmpty() ? ScResId(STR_TABLE_DEF) : rPreferredName;
         if( nSheetPos < xSheetsIA->getCount() )
         {
             nCalcSheet = static_cast< sal_Int16 >( nSheetPos );


More information about the Libreoffice-commits mailing list