[INTL]: Simplify code (addendum to r74582). (#41)
authorSerge Gautherie <32623169+SergeGautherie@users.noreply.github.com>
Fri, 13 Oct 2017 20:24:37 +0000 (22:24 +0200)
committerHermès BÉLUSCA - MAÏTO <hermes.belusca@sfr.fr>
Fri, 13 Oct 2017 20:24:37 +0000 (22:24 +0200)
CORE-13242

dll/cpl/intl/advanced.c

index 3c9f511..0fddc82 100644 (file)
@@ -404,17 +404,14 @@ ListViewCustomDraw(
         case CDDS_ITEMPREPAINT:
             if (((PCPAGE)lplvcd->nmcd.lItemlParam)->Flags & CODEPAGE_NOT_REMOVEABLE)
             {
         case CDDS_ITEMPREPAINT:
             if (((PCPAGE)lplvcd->nmcd.lItemlParam)->Flags & CODEPAGE_NOT_REMOVEABLE)
             {
-                lplvcd->clrText   = GetSysColor(COLOR_GRAYTEXT);
-                lplvcd->clrTextBk = GetSysColor(COLOR_WINDOW);
-                return CDRF_NEWFONT;
+                lplvcd->clrText = GetSysColor(COLOR_GRAYTEXT);
             }
             else
             {
             }
             else
             {
-                lplvcd->clrText   = GetSysColor(COLOR_WINDOWTEXT);
-                lplvcd->clrTextBk = GetSysColor(COLOR_WINDOW);
-                return CDRF_NEWFONT;
+                lplvcd->clrText = GetSysColor(COLOR_WINDOWTEXT);
             }
             }
-            break;
+            lplvcd->clrTextBk = GetSysColor(COLOR_WINDOW);
+            return CDRF_NEWFONT;
     }
 
     return CDRF_DODEFAULT;
     }
 
     return CDRF_DODEFAULT;