mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cppcheck: fix duplicateBranch

Browse Source 
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
This commit is contained in:
Julien Nabet
2013-08-15 19:53:11 +02:00
parent 507169c13a
commit 3b51ba24be
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
filter/source/graphicfilter/icgm/actimpr.cxx
View File

@@ -321,10 +321,7 @@ void CGMImpressOutAct::ImplSetFillBundle()
{ {
drawing::Hatch aHatch; drawing::Hatch aHatch;
if ( mpCGM->pElement->nAspectSourceFlags & ASF_LINECOLOR ) aHatch.Color = nFillColor;
aHatch.Color = nFillColor;
else
aHatch.Color = nFillColor;
if ( mpCGM->pElement->maHatchMap.find( nHatchIndex ) != mpCGM->pElement->maHatchMap.end() ) if ( mpCGM->pElement->maHatchMap.find( nHatchIndex ) != mpCGM->pElement->maHatchMap.end() )
{ {
HatchEntry& rHatchEntry = mpCGM->pElement->maHatchMap[ nHatchIndex ]; HatchEntry& rHatchEntry = mpCGM->pElement->maHatchMap[ nHatchIndex ];