[labeling] allows data defined to align multiline when wordwrap function is used as expression (fix #11805)

slarosa · slarosa · commit 368fc674bba1 · 2014-12-14T09:33:45.000+01:00
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 ) )

Original file line number	Diff line number	Diff line change
`@@ -3554,7 +3554,7 @@ void QgsPalLabeling::dataDefinedTextFormatting( QgsPalLayerSettings& tmpLyr,`
`3554`	`3554`	`tmpLyr.wrapChar = ddValues.value( QgsPalLayerSettings::MultiLineWrapChar ).toString();`
`3555`	`3555`	`}`
`3556`	`3556`
`3557`		`- if ( !tmpLyr.wrapChar.isEmpty() )`
	`3557`	`+ if ( !tmpLyr.wrapChar.isEmpty() \|\| tmpLyr.getLabelExpression()->expression().contains( "wordwrap" ) )`
`3558`	`3558`	`{`
`3559`	`3559`
`3560`	`3560`	`if ( ddValues.contains( QgsPalLayerSettings::MultiLineHeight ) )`