[ooo-build-commit] Branch 'ooo/master' - canvas/source

[Jan Holesovsky]

 canvas/source/cairo/cairo_textlayout.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 9d32713887bb706f49ad04c2caef385ff4977b08
Author: Kurt Zenker <kz at openoffice.org>
Date:   Mon Sep 28 13:04:02 2009 +0000

    #i105388# patch applied

diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 003ba68..c33175c 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -44,6 +44,12 @@
 #include <tools/prewin.h>
 #include <windows.h>
 #include <tools/postwin.h>
+#ifdef max
+#undef max
+#endif
+#ifdef min
+#undef min
+#endif
 #endif
 #include <vcl/sysdata.hxx>