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

qgis · Jan 22, 2014 · 2e4fbc2 · 2e4fbc2
1 parent 58403d3
commit 2e4fbc2
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/src/core/composer/qgscomposerlabel.cpp b/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 )
   {