4 files changed, 11 insertions, 5 deletions
diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx
index e893cd3fb8b5..bde3db062116 100755
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
@@ -31,6 +31,7 @@
 
 #if defined(WNT)
 #include <windows.h>
+#undef GetObject
 #endif
 
 #include <algorithm>
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index dc774f17bfb0..f38e587a3fa0 100755
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -31,6 +31,7 @@
 
 #if defined(WNT)
 #include <windows.h>
+#undef GetObject
 #endif
 
 #include <algorithm>
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 8650a4699dba..5b47511db11e 100755
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -31,6 +31,7 @@
 
 #if defined(WNT)
 #include <windows.h>
+#undef GetObject
 #endif
 
 #include <algorithm>
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index eebb2e133449..1e79e3e22da5 100755
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -110,15 +110,18 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
 #include <unistd.h>
 #endif
 
-#ifdef WNT
-#include <io.h>
-#endif
-
-
 #include <basic/sbobjmod.hxx>
 
 #include <basic/sbobjmod.hxx>
 
+#ifdef WNT
+#define GradientStyle_RECT BLA_GradientStyle_RECT
+#include <windows.h>
+#include <io.h>
+#undef GetObject
+#undef GradientSyle_RECT
+#endif
+
 static void FilterWhiteSpace( String& rStr )
 {
     rStr.EraseAllChars( ' ' );