[Libreoffice-commits] .: basic/source

[Fridrich Strba]

 basic/source/app/process.cxx         |    4 ++++
 basic/source/runtime/dllmgr-none.cxx |    1 +
 basic/source/runtime/dllmgr-x64.cxx  |    1 +
 basic/source/runtime/dllmgr-x86.cxx  |    1 +
 basic/source/runtime/methods.cxx     |   13 ++++++++-----
 basic/source/sbx/sbxdec.hxx          |    3 +++
 6 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit b61e1589bc58e920c856029effdecf2062e5975b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Mar 28 12:54:35 2011 +0200

    Fix basic Windows build

diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 7d507ec..46b663e 100755
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -39,6 +39,10 @@
 #include <basic/ttstrhlp.hxx>
 #include <basic/process.hxx>
 
+#ifdef WNT
+#include <windows.h>
+#endif
+
 Process::Process()
 : m_nArgumentCount( 0 )
 , m_pArgumentList( NULL )
diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx
index e893cd3..bde3db0 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 dc774f1..f38e587 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 8650a46..5b47511 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 52ead18..88e5dd0 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( ' ' );
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index f94167b..362d62e 100755
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -35,6 +35,9 @@
 #undef WB_LEFT
 #undef WB_RIGHT
 
+#include <prewin.h>
+#include <postwin.h>
+
 #ifndef __MINGW32__
 #include <comutil.h>
 #endif