Fix outline color in simple marker dxf export

mhugent · mhugent · commit 2a80881e85dd · 2014-06-05T16:37:23.000+02:00
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -339,24 +339,12 @@ double QgsSimpleFillSymbolLayerV2::dxfWidth( const QgsDxfExport& e, const QgsSym
 
 QColor QgsSimpleFillSymbolLayerV2::dxfColor( const QgsSymbolV2RenderContext& context ) const
 {
-  if ( mBrushStyle == Qt::NoBrush )
-  {
-    QgsExpression* colorBorderExpression = expression( "color_border" );
-    if ( colorBorderExpression )
-    {
-      return QgsSymbolLayerV2Utils::decodeColor( colorBorderExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() );
-    }
-    return mBorderColor;
-  }
-  else
+  QgsExpression* colorBorderExpression = expression( "color_border" );
+  if ( colorBorderExpression )
   {
-    QgsExpression* colorExpression = expression( "color" );
-    if ( colorExpression )
-    {
-      return QgsSymbolLayerV2Utils::decodeColor( colorExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() );
-    }
-    return mColor;
+    return QgsSymbolLayerV2Utils::decodeColor( colorBorderExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() );
   }
+  return mBorderColor;
 }
 
 Qt::PenStyle QgsSimpleFillSymbolLayerV2::dxfPenStyle() const
