dxf export: fix data defined outline color of simple markers

jef-n · jef-n · commit f0caf1708e71 · 2015-03-24T14:14:51.000+01:00
(cherry picked from commit 7469d2b)
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -884,7 +884,7 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
     bc = QgsSymbolLayerV2Utils::decodeColor( colorExpression->evaluate( *f ).toString() );
   }
 
-  QgsExpression* outlinecolorExpression = expression( "outline_color" );
+  QgsExpression* outlinecolorExpression = expression( "color_border" );
   if ( outlinecolorExpression )
   {
     pc = QgsSymbolLayerV2Utils::decodeColor( outlinecolorExpression->evaluate( *f ).toString() );

Original file line number	Diff line number	Diff line change
`@@ -884,7 +884,7 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc`
`884`	`884`	`bc = QgsSymbolLayerV2Utils::decodeColor( colorExpression->evaluate( *f ).toString() );`
`885`	`885`	`}`
`886`	`886`
`887`		`- QgsExpression* outlinecolorExpression = expression( "outline_color" );`
	`887`	`+ QgsExpression* outlinecolorExpression = expression( "color_border" );`
`888`	`888`	`if ( outlinecolorExpression )`
`889`	`889`	`{`
`890`	`890`	`pc = QgsSymbolLayerV2Utils::decodeColor( outlinecolorExpression->evaluate( *f ).toString() );`