diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-07 08:38:12 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 07:03:31 +0000 |
| commit | b8ecfd83bac98ea58a435c59856da8fd94f5c6d9 (patch) | |
| tree | 8e5ebeceaec301a6aefcb017169794b6cff4a132 /sc | |
| parent | 7b69dd64be71d1420158a553fb5ec861039cb017 (diff) | |
Undef RGB where it was defined, not where it gets used
Change-Id: I274958964292f78c802748e17fca7f265ae5a4b8
Reviewed-on: https://gerrit.libreoffice.org/20429
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/helper/debughelper.hxx | 1 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc_formula.cxx | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sc/qa/unit/helper/debughelper.hxx b/sc/qa/unit/helper/debughelper.hxx index 509f4aff72fc..0143d6e6908c 100644 --- a/sc/qa/unit/helper/debughelper.hxx +++ b/sc/qa/unit/helper/debughelper.hxx @@ -21,6 +21,7 @@ #include <prewin.h> #include <postwin.h> #undef NOMINMAX +#undef RGB #endif #include <iostream> diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index b5eafc24cc80..69b46bb85b22 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/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> |