Optimise QgsVectorLayerExporter::exportLayer when exporting only selected features

nyalldawson · nyalldawson · commit 446db28a7968 · 2017-05-12T08:03:23.000+10:00
diff --git a/src/core/qgsvectorlayerexporter.cpp b/src/core/qgsvectorlayerexporter.cpp
@@ -326,11 +326,11 @@ QgsVectorLayerExporter::exportLayer( QgsVectorLayer *layer,
   QgsFeatureRequest req;
   if ( wkbType == QgsWkbTypes::NoGeometry )
     req.setFlags( QgsFeatureRequest::NoGeometry );
+  if ( onlySelected )
+    req.setFilterFids( layer->selectedFeatureIds() );
 
   QgsFeatureIterator fit = layer->getFeatures( req );
 
-  const QgsFeatureIds &ids = layer->selectedFeatureIds();
-
   // Create our transform
   if ( destCRS.isValid() )
     ct = QgsCoordinateTransform( layer->crs(), destCRS );
@@ -375,9 +375,6 @@ QgsVectorLayerExporter::exportLayer( QgsVectorLayer *layer,
       break;
     }
 
-    if ( onlySelected && !ids.contains( fet.id() ) )
-      continue;
-
     if ( shallTransform )
     {
       try
