diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 21:54:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 21:54:19 +0000 |
| commit | d9bca7102e73587c672e32364987c9e4abafc03e (patch) | |
| tree | 9592a3812e0a5ba3066083a4b794a7d47ab9c5fa /svx/source/dialog | |
| parent | 36d1b831f9d96403acb89a5595dfb763336685e8 (diff) | |
INTEGRATION: CWS aw033 (1.6.82); FILE MERGED
2008/05/14 14:07:37 aw 1.6.82.2: RESYNC: (1.6-1.7); FILE MERGED
2008/05/14 09:55:14 aw 1.6.82.1: #i39532# aw033 progresses from git
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/sendreportw32.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx index 5a360e76d703..594d7cdd177e 100644 --- a/svx/source/dialog/sendreportw32.cxx +++ b/svx/source/dialog/sendreportw32.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sendreportw32.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -41,6 +41,15 @@ #include <stdio.h> #include <systools/win32/uwinapi.h> +// need to undef min and max macros from MS headers here to make +// the std::min and std::max from stl visible again +#ifdef min +#undef min +#endif +#ifdef max +#undef max +#endif + #include "docrecovery.hxx" //*************************************************************************** |