Merge pull request #1724 from slarosa/dd_wrapword

[labeling] allows data defined to align multiline when wordwrap function is used as expression (fix #11805)
qgis · Dec 15, 2014 · d28619d · d28619d
2 parents f79dbcd + 368fc67
commit d28619d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -3554,7 +3554,7 @@ void QgsPalLabeling::dataDefinedTextFormatting( QgsPalLayerSettings& tmpLyr,
     tmpLyr.wrapChar = ddValues.value( QgsPalLayerSettings::MultiLineWrapChar ).toString();
   }
 
-  if ( !tmpLyr.wrapChar.isEmpty() )
+  if ( !tmpLyr.wrapChar.isEmpty() || tmpLyr.getLabelExpression()->expression().contains( "wordwrap" ) )
   {
 
     if ( ddValues.contains( QgsPalLayerSettings::MultiLineHeight ) )