[Libreoffice-commits] core.git: filter/source

[Julien Nabet]

 filter/source/graphicfilter/icgm/actimpr.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 3b51ba24bed97d9f40a0b0e3e3e1c3ae15db1629
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Aug 15 19:53:11 2013 +0200

    cppcheck: fix duplicateBranch
    
    Git history shows it was like this since first commit (2009-12-15)
    Moreover I noticed these lines:
        220     if ( mpCGM->pElement->nAspectSourceFlags & ASF_FILLCOLOR )
        221         nFillColor = mpCGM->pElement->pFillBundle->GetColor();
        222     else
        223         nFillColor = mpCGM->pElement->aFillBundle.GetColor();
    even if nFillColor can have another value in case below
        249         case FIS_GEOPATTERN :
        250         {
        251             if ( mpCGM->pElement->eTransparency == T_ON )
        252                 nFillColor = mpCGM->pElement->nAuxiliaryColor;
        253             eFS = drawing::FillStyle_NONE;
        254         }
    this change is still safe since it's just a simplification.
    
    Change-Id: Icf41dbeee6405780483649e0968dd30e8a533882

diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index 12d8f98..7c57223 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -321,10 +321,7 @@ void CGMImpressOutAct::ImplSetFillBundle()
     {
         drawing::Hatch aHatch;
 
-        if ( mpCGM->pElement->nAspectSourceFlags & ASF_LINECOLOR )
-            aHatch.Color = nFillColor;
-        else
-            aHatch.Color = nFillColor;
+        aHatch.Color = nFillColor;
         if ( mpCGM->pElement->maHatchMap.find( nHatchIndex ) !=  mpCGM->pElement->maHatchMap.end() )
         {
             HatchEntry& rHatchEntry = mpCGM->pElement->maHatchMap[ nHatchIndex ];