Skip to content
Permalink
Browse files

[composer] Always evaluate label expressions (fix #9342)

  • Loading branch information
nyalldawson committed Jan 22, 2014
1 parent 58403d3 commit 2e4fbc21a62129e62b0702f9e87f5dd86809c710
Showing with 1 addition and 11 deletions.
  1. +1 −11 src/core/composer/qgscomposerlabel.cpp
@@ -66,17 +66,7 @@ void QgsComposerLabel::paint( QPainter* painter, const QStyleOptionGraphicsItem*
double penWidth = pen().widthF();
QRectF painterRect( penWidth + mMargin, penWidth + mMargin, rect().width() - 2 * penWidth - 2 * mMargin, rect().height() - 2 * penWidth - 2 * mMargin );

QString textToDraw;
if ( mComposition->atlasMode() != QgsComposition::AtlasOff )
{
//render text with expressions evaluated
textToDraw = displayText();
}
else
{
//not outputing or using an atlas preview, so render text without expressions evaluated
textToDraw = mText;
}
QString textToDraw = displayText();

if ( mHtmlState )
{

0 comments on commit 2e4fbc2

Please sign in to comment.
You can’t perform that action at this time.