From 352f3f34cebf6f7c749db1e59879d27263d26340 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 21 Jun 2018 09:35:55 +1000 Subject: [PATCH] Explicitly list [xlsx] extension for 'MS Office Open XML spreadsheet' format ...because most humans don't associate "MS Office Open XML" with XLS --- src/core/qgsvectorfilewriter.cpp | 4 ++-- tests/src/python/test_qgsvectorfilewriter.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp index 74ff9654300..8e040b46f11 100644 --- a/src/core/qgsvectorfilewriter.cpp +++ b/src/core/qgsvectorfilewriter.cpp @@ -1853,7 +1853,7 @@ class QgsVectorFileWriterMetadataContainer driverMetadata.insert( QStringLiteral( "XLSX" ), QgsVectorFileWriter::MetaData( QStringLiteral( "MS Office Open XML spreadsheet" ), - QObject::tr( "MS Office Open XML spreadsheet" ), + QObject::tr( "MS Office Open XML spreadsheet [XLSX]" ), QStringLiteral( "*.xlsx" ), QStringLiteral( "xlsx" ), datasetOptions, @@ -1893,7 +1893,7 @@ class QgsVectorFileWriterMetadataContainer driverMetadata.insert( QStringLiteral( "ODS" ), QgsVectorFileWriter::MetaData( QStringLiteral( "Open Document Spreadsheet" ), - QObject::tr( "Open Document Spreadsheet" ), + QObject::tr( "Open Document Spreadsheet [ODS]" ), QStringLiteral( "*.ods" ), QStringLiteral( "ods" ), datasetOptions, diff --git a/tests/src/python/test_qgsvectorfilewriter.py b/tests/src/python/test_qgsvectorfilewriter.py index b17380e6c71..dfff93d8862 100644 --- a/tests/src/python/test_qgsvectorfilewriter.py +++ b/tests/src/python/test_qgsvectorfilewriter.py @@ -797,6 +797,8 @@ class TestQgsVectorFileWriter(unittest.TestCase): sqlite_index = next(i for i, v in enumerate(drivers) if v.driverName == 'SQLite') self.assertLess(ms_xlsx_index, sqlite_index) + self.assertIn('[XLSX]', drivers[ms_xlsx_index].longName) + # alphabetical sorting drivers2 = QgsVectorFileWriter.ogrDriverList(QgsVectorFileWriter.VectorFormatOptions()) self.assertTrue(drivers2[0].longName < drivers2[1].longName)