Skip to content

Commit 2e4fbc2

Browse files
committed
[composer] Always evaluate label expressions (fix #9342)
1 parent 58403d3 commit 2e4fbc2

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

src/core/composer/qgscomposerlabel.cpp

+1-11
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,7 @@ void QgsComposerLabel::paint( QPainter* painter, const QStyleOptionGraphicsItem*
6666
double penWidth = pen().widthF();
6767
QRectF painterRect( penWidth + mMargin, penWidth + mMargin, rect().width() - 2 * penWidth - 2 * mMargin, rect().height() - 2 * penWidth - 2 * mMargin );
6868

69-
QString textToDraw;
70-
if ( mComposition->atlasMode() != QgsComposition::AtlasOff )
71-
{
72-
//render text with expressions evaluated
73-
textToDraw = displayText();
74-
}
75-
else
76-
{
77-
//not outputing or using an atlas preview, so render text without expressions evaluated
78-
textToDraw = mText;
79-
}
69+
QString textToDraw = displayText();
8070

8171
if ( mHtmlState )
8272
{

0 commit comments

Comments
 (0)