Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
qgslayoutitemattributetable.cpp: remove useless nullptr check
  • Loading branch information
rouault committed Jun 1, 2020
1 parent ec3b7b7 commit 25f89c0
Showing 1 changed file with 10 additions and 13 deletions.
23 changes: 10 additions & 13 deletions src/core/layout/qgslayoutitemattributetable.cpp
Expand Up @@ -420,20 +420,17 @@ bool QgsLayoutItemAttributeTable::getTableContents( QgsLayoutTableContents &cont
{
visibleRegion = QgsGeometry::fromQPolygonF( mMap->visibleExtentPolygon() );
selectionRect = visibleRegion.boundingBox();
if ( layer )
//transform back to layer CRS
QgsCoordinateTransform coordTransform( layer->crs(), mMap->crs(), mLayout->project() );
try
{
//transform back to layer CRS
QgsCoordinateTransform coordTransform( layer->crs(), mMap->crs(), mLayout->project() );
try
{
selectionRect = coordTransform.transformBoundingBox( selectionRect, QgsCoordinateTransform::ReverseTransform );
visibleRegion.transform( coordTransform, QgsCoordinateTransform::ReverseTransform );
}
catch ( QgsCsException &cse )
{
Q_UNUSED( cse )
return false;
}
selectionRect = coordTransform.transformBoundingBox( selectionRect, QgsCoordinateTransform::ReverseTransform );
visibleRegion.transform( coordTransform, QgsCoordinateTransform::ReverseTransform );
}
catch ( QgsCsException &cse )
{
Q_UNUSED( cse )
return false;
}
visibleMapEngine.reset( QgsGeometry::createGeometryEngine( visibleRegion.constGet() ) );
visibleMapEngine->prepareGeometry();
Expand Down

0 comments on commit 25f89c0

Please sign in to comment.