Fill Color in VclProcessor2D is set out of decorated text if-block

Change-Id: Ice01290d7baa46f694b2bf5801b6af48f083d521
(cherry picked from commit fe0b0c06)

drawinglayer/source/processor2d/vclprocessor2d.cxx

@@ -146,6 +146,14 @@ namespace drawinglayer
                         fRotate,
                         rTextCandidate.getLocale()));
 
+                    // set FillColor Attribute
+                    const Color aFillColor( rTextCandidate.getTextFillColor() );
+                    if( aFillColor != COL_TRANSPARENT )
+                    {
+                        aFont.SetFillColor(aFillColor);
+                        aFont.SetTransparent(false);
+                    }
+
                     // Don't draw fonts without height
                     if( aFont.GetHeight() <= 0 )
                         return;
@@ -187,17 +195,6 @@ namespace drawinglayer
                         if( eFontStrikeout != STRIKEOUT_NONE )
                             aFont.SetStrikeout( eFontStrikeout );
 
-                        // set FillColor Attribute
-                        // FIXME(matteocam)
-
-                        // XXX: is "Color" the right type? i.e. can we use class Color in TextSimplePortionPrimitive2D
-                        const Color aFillColor(pTCPP->getTextFillColor() );
-                        if( aFillColor != COL_TRANSPARENT )
-                        {
-                            aFont.SetFillColor(aFillColor);
-                            aFont.SetTransparent(false);
-                        }
-
 
                         // set EmphasisMark attribute
                         FontEmphasisMark eFontEmphasisMark = EMPHASISMARK_NONE;