diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-07 09:34:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-07 12:35:02 +0000 |
| commit | 0abfcb735e60757ee64aa6d0fbb1b601c29813f3 (patch) | |
| tree | f5d9dc01bc5fee162a5bef6d2df41b46a3418193 /fpicker | |
| parent | 764ec21307009a84b2611fed5cb20069caa6d566 (diff) | |
Undef RGB where it was defined, not where it gets used
Change-Id: I1e122bb7c32850dfdd74de029c8d92a328207a95
Reviewed-on: https://gerrit.libreoffice.org/20430
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePicker.cxx | 3 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/platform_vista.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 3cc0e5ddcf90..47f649c548e8 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -43,9 +43,6 @@ #include <osl/mutex.hxx> #include <osl/file.hxx> #include <tchar.h> -#ifdef RGB -#undef RGB -#endif #include <officecfg/Office/Common.hxx> #ifdef _MSC_VER diff --git a/fpicker/source/win32/filepicker/platform_vista.h b/fpicker/source/win32/filepicker/platform_vista.h index 1d8dea84b038..359e5ae0a6d8 100644 --- a/fpicker/source/win32/filepicker/platform_vista.h +++ b/fpicker/source/win32/filepicker/platform_vista.h @@ -36,6 +36,7 @@ #if defined _MSC_VER #pragma warning(push, 1) #include <comip.h> +#undef RGB #pragma warning(pop) #endif |