Showing with 4 additions and 4 deletions.
  1. +1 −1 src/core/composer/qgscomposerattributetable.cpp
  2. +3 −3 src/core/composer/qgscomposition.cpp
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposerattributetable.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ bool QgsComposerAttributeTable::getFeatureAttributes( QList<QgsAttributeMap> &at
QgsRectangle selectionRect;
if ( mComposerMap && mShowOnlyVisibleFeatures )
{
selectionRect = mComposerMap->extent();
selectionRect = *mComposerMap->currentMapExtent();
if ( mVectorLayer && mComposerMap->mapRenderer()
&& mComposerMap->mapRenderer()->hasCrsTransformEnabled() )
{
Expand Down
6 changes: 3 additions & 3 deletions src/core/composer/qgscomposition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2373,10 +2373,10 @@ void QgsComposition::computeWorldFileParameters( double& a, double& b, double& c
return;
}

QRectF brect = mWorldFileMap->boundingRect();
QgsRectangle extent = mWorldFileMap->extent();
QRectF brect = mWorldFileMap->mapRectToScene( mWorldFileMap->rect() );
QgsRectangle extent = *mWorldFileMap->currentMapExtent();

double alpha = mWorldFileMap->rotation() / 180 * M_PI;
double alpha = mWorldFileMap->mapRotation() / 180 * M_PI;

double xr = extent.width() / brect.width();
double yr = extent.height() / brect.height();
Expand Down