"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/core/qgsvectorfilewriter.cpp" between
QGIS-final-3_10_11.tar.gz and QGIS-final-3_10_12.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Long-term release (3.10.x series).

qgsvectorfilewriter.cpp  (QGIS-final-3_10_11):qgsvectorfilewriter.cpp  (QGIS-final-3_10_12)
skipping to change at line 2681 skipping to change at line 2681
QgsVectorFileWriter::~QgsVectorFileWriter() QgsVectorFileWriter::~QgsVectorFileWriter()
{ {
if ( mUsingTransaction ) if ( mUsingTransaction )
{ {
if ( OGRERR_NONE != OGR_L_CommitTransaction( mLayer ) ) if ( OGRERR_NONE != OGR_L_CommitTransaction( mLayer ) )
{ {
QgsDebugMsg( QStringLiteral( "Error while committing transaction on OGRLay er." ) ); QgsDebugMsg( QStringLiteral( "Error while committing transaction on OGRLay er." ) );
} }
} }
#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3,1,0) && GDAL_VERSION_NUM <= GDAL_
COMPUTE_VERSION(3,1,3)
if ( mDS )
{
// Workaround bug in GDAL 3.1.0 to 3.1.3 that creates XLSX and ODS files inc
ompatible with LibreOffice due to use of ZIP64
QString drvName = GDALGetDriverShortName( GDALGetDatasetDriver( mDS.get() )
);
if ( drvName == QLatin1String( "XLSX" ) ||
drvName == QLatin1String( "ODS" ) )
{
CPLSetThreadLocalConfigOption( "CPL_CREATE_ZIP64", "NO" );
mDS.reset();
CPLSetThreadLocalConfigOption( "CPL_CREATE_ZIP64", nullptr );
}
}
#endif
mDS.reset(); mDS.reset();
if ( mOgrRef ) if ( mOgrRef )
{ {
OSRDestroySpatialReference( mOgrRef ); OSRDestroySpatialReference( mOgrRef );
} }
} }
QgsVectorFileWriter::WriterError QgsVectorFileWriter::WriterError
QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer *layer, QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer *layer,
 End of changes. 1 change blocks. 
0 lines changed or deleted 18 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)