Undef RGB where it was defined, not where it gets used

Change-Id: I274958964292f78c802748e17fca7f265ae5a4b8
Reviewed-on: https://gerrit.libreoffice.org/20429Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

bin/update_pch

@@ -762,6 +762,7 @@ def generate(includes, libname, filename, module):
 // Cleanup windows header macro pollution.
 #ifdef WNT
 #   include <postwin.h>
+#   undef RGB
 #endif
 """
             f.write(ado_define)

connectivity/inc/pch/precompiled_ado.hxx

@@ -72,6 +72,7 @@
 // Cleanup windows header macro pollution.
 #ifdef WNT
 #   include <postwin.h>
+#   undef RGB
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/qa/unit/helper/debughelper.hxx

@@ -21,6 +21,7 @@
 #include <prewin.h>
 #include <postwin.h>
 #undef NOMINMAX
+#undef RGB
 #endif
 
 #include <iostream>

sc/qa/unit/ucalc_formula.cxx

@@ -29,9 +29,6 @@
 #include <docpool.hxx>
 
 #include <formula/vectortoken.hxx>
-
-// RGB is leaked macro from wingdi.h which conflicts in Office/Common.hxx.
-#undef RGB
 #include <officecfg/Office/Common.hxx>
 #include <svl/broadcast.hxx>
 

xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx

@@ -121,6 +121,7 @@
 // Cleanup windows header macro pollution.
 #ifdef WNT
 #   include <postwin.h>
+#   undef RGB
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

xmlsecurity/source/xmlsec/nss/nssinitializer.cxx

@@ -28,11 +28,7 @@
 #include <com/sun/star/xml/crypto/DigestID.hpp>
 #include <com/sun/star/xml/crypto/CipherID.hpp>
 #include <cppuhelper/supportsservice.hxx>
-
-// RGB is leaked macro from wingdi.h which conflicts in Office/Common.hxx.
-#undef RGB
 #include <officecfg/Office/Common.hxx>
-
 #include <sal/types.h>
 #include <rtl/instance.hxx>
 #include <rtl/bootstrap.hxx>