sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly list [xlsx] extension for 'MS Office Open XML spreadsheet' format

Browse Source 
...because most humans don't associate "MS Office Open XML" with XLS
This commit is contained in:
Nyall Dawson 2018-06-21 09:35:55 +10:00
parent f332971084
commit 352f3f34ce
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/qgsvectorfilewriter.cpp
View File

@ -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,

2
tests/src/python/test_qgsvectorfilewriter.py
View File

@ -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)