diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2001-10-10 14:51:47 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2001-10-10 14:51:47 +0000 |
| commit | 6d174c48257657e215ac3880e19e408f40a61eca (patch) | |
| tree | d4dc248f998f8345dddca47d7b26372d0918507c /basic | |
| parent | 544a3dd1f87aaa14be145963eb70a5d022c68e8c (diff) | |
#92924#: std::min()/std::max()
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/app/dialogs.cxx | 7 | ||||
| -rw-r--r-- | basic/source/app/printer.cxx | 7 | ||||
| -rw-r--r-- | basic/source/runtime/step0.cxx | 10 |
3 files changed, 18 insertions, 6 deletions
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx index 80a800753838..b5e3fa39b702 100644 --- a/basic/source/app/dialogs.cxx +++ b/basic/source/app/dialogs.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dialogs.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: tbe $ $Date: 2001-07-31 15:12:49 $ + * last change: $Author: hr $ $Date: 2001-10-10 15:48:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,6 +64,9 @@ #endif #include <string> +#ifdef max +#undef max +#endif #include <algorithm> HACK( #define protected public ) diff --git a/basic/source/app/printer.cxx b/basic/source/app/printer.cxx index 77da1e07de96..0a08673e815c 100644 --- a/basic/source/app/printer.cxx +++ b/basic/source/app/printer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: printer.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hjs $ $Date: 2000-11-06 12:09:11 $ + * last change: $Author: hr $ $Date: 2001-10-10 15:50:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,6 +76,9 @@ #endif #include <string> +#ifdef min +#undef min +#endif #include <algorithm> #include "app.hxx" diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx index 75303c39ad51..ce38b052d3a6 100644 --- a/basic/source/runtime/step0.cxx +++ b/basic/source/runtime/step0.cxx @@ -2,9 +2,9 @@ * * $RCSfile: step0.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ab $ $Date: 2001-08-22 10:28:26 $ + * last change: $Author: hr $ $Date: 2001-10-10 15:51:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,6 +77,12 @@ #include <com/sun/star/uno/Any.hxx> #include <string> +#ifdef min +#undef min +#endif +#ifdef max +#undef max +#endif #include <algorithm> #include "segmentc.hxx" |