CWS-TOOLING: integrate CWS mingwport16

2009-01-15 13:11:20 +0100 releng  r266363 : tidy-up tabs
2008-11-28 15:33:23 +0100 tono  r264557 : i95203: mingw build without stlport
2008-11-22 07:19:50 +0100 tono  r264180 : i96436: make mingw bridge conform with reg-struct-return
2008-11-22 05:14:58 +0100 tono  r264179 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 17:09:04 +0100 tono  r264153 : i95203: mingw build without stlport
2008-11-21 16:59:55 +0100 tono  r264152 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:59:18 +0100 tono  r264151 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:57:01 +0100 tono  r264150 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:53:19 +0100 tono  r264149 : i96100: mingw port for icu 4.0
2008-11-13 13:41:13 +0100 tono  r263643 : i95203: mingw: Build without stlport
2008-11-13 13:29:38 +0100 tono  r263640 : i96100: MinGW port for icu 4.0
2008-11-13 13:17:10 +0100 tono  r263634 : i96098: MinGW port fix for new Windows API
2008-11-09 15:22:59 +0100 tono  r263497 : i95198: mingwport do not interfere with Cygwin
2008-11-09 14:44:54 +0100 tono  r263496 : i95190: mingwport avoid use of MS assembler
2008-11-09 14:32:26 +0100 tono  r263495 : i95190: mingwport trivial build fixes

13 files changed, 465 insertions, 317 deletions

diff --git a/basic/source/runtime/makefile.mk b/basic/source/runtime/makefile.mk
index 3583769255..9c9886e05f 100644
--- a/basic/source/runtime/makefile.mk
+++ b/basic/source/runtime/makefile.mk
@@ -61,10 +61,14 @@ SLOFILES=	\
 SLOFILES+=	$(SLO)$/win.obj
 .ENDIF
 
-.IF "$(GUI)$(CPU)" == "WNTI"
+.IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI"
 SLOFILES+=	$(SLO)$/wnt.obj
 .ENDIF
 
+.IF "$(GUI)$(COM)$(CPU)" == "WNTGCCI"
+SLOFILES+=	$(SLO)$/wnt-mingw.obj
+.ENDIF
+
 .IF "$(GUI)$(CPU)" == "OS2I"
 #FIXME SLOFILES+= $(SLO)$/os2.obj
 .ENDIF
@@ -80,3 +84,10 @@ EXCEPTIONSFILES=$(SLO)$/step0.obj	\
 
 .INCLUDE :  target.mk
 
+$(SLO)$/%.obj: %.s
+#kendy: Cut'n'paste from bridges/source/cpp_uno/mingw_intel/makefile.mk
+#cmc: Ideally --noexecstack would be in operations, but with #i51385# pyuno
+#remote bridgeing breaks
+#    $(CC) -Wa,--noexecstack -c -o $(SLO)$/$(@:b).o $<
+    $(CC) -c -o $(SLO)$/$(@:b).obj $<
+    touch $@
diff --git a/basic/source/runtime/wnt-mingw.s b/basic/source/runtime/wnt-mingw.s
new file mode 100644
index 0000000000..b42c5278c7
--- /dev/null
+++ b/basic/source/runtime/wnt-mingw.s
@@ -0,0 +1,97 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: wnt.asm,v $
+#
+# $Revision: 1.4 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY# without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+#    Anmerkungen
+#        Direktaufruf von C- und PASCAL-Routinen, Windows und OS/2
+#
+# Inhalt:
+# type = CallXXX (far *pProc, char *pStack, short nStack)
+#
+# Kopie des Basic-Stacks (nStack Bytes) auf den C-Stack
+# und Aufruf der Prozedur.
+
+		.intel_syntax
+		#.386
+
+#_TEXT		SEGMENT	DWORD PUBLIC 'CODE' USE32
+
+		#ASSUME 	CS:_TEXT
+
+.globl		_CallINT
+.globl		_CallLNG
+.globl		_CallDBL
+.globl		_CallSTR
+.globl		_CallFIX
+
+_CallINT:
+_CallLNG:
+_CallDBL:
+_CallSTR:
+
+_CallFIX:	PUSH	EBP
+		MOV	EBP,ESP
+		PUSH	ESI
+		PUSH	EDI
+
+		PUSH	ECX
+		PUSH	EDX
+
+		MOV	DX,DS
+		MOVZX	EAX,WORD PTR [EBP+16] # EAX == nStack
+		SUB	ESP,EAX       # Stack um nStack Bytes vergroessern
+		MOV	EDI,ESP
+		MOV	AX,SS
+		MOV	ES,AX	      # ES:EDI = Startadresse des fuer
+				      # Parameter reservierten Stackbereichs
+		MOV	ESI,[EBP+12]  # DS:ESI == pStack
+
+		MOVZX	ECX,WORD PTR [EBP+16] # ECX == nStack
+		SHR	ECX,1
+		CLD
+		JCXZ	$1
+	REP	MOVSW		      # Stack uebernehmen
+$1:		MOV	DS,DX
+		CALL	DWORD PTR [EBP+8]	# Aufruf der Prozedur
+		# CLI # unter NT nicht erlaubt (privileged instruction)
+		MOV	ESP,EBP
+		SUB	ESP,16	      # wegen gepushter Register
+				      # (ESI, EDI)
+		# STI
+		POP	EDX
+		POP	ECX
+		POP	EDI
+		POP	ESI
+		POP	EBP
+		RET	12
+
+#_TEXT		ENDS
+
+		#END
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 473f57e681..4889a256f2 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -41,6 +41,9 @@
 #include <comphelper/property.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
+#ifdef __MINGW32__
+#include <algorithm>
+#endif
 #include "resource/ado_res.hrc"
 
 using namespace connectivity::ado;
diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/internal/thumbviewer.hxx
index f5d546ef23..32334ee40a 100644
--- a/shell/inc/internal/thumbviewer.hxx
+++ b/shell/inc/internal/thumbviewer.hxx
@@ -37,6 +37,11 @@
 #endif
 #include <objidl.h>
 #include <shlobj.h>
+#ifdef __MINGW32__
+#include <algorithm>
+using std::min;
+using std::max;
+#endif
 #include <gdiplus.h>
 #if defined _MSC_VER
 #pragma warning(pop)
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx
index caa33ccada..a7b729d03a 100644
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -35,6 +35,11 @@
 #include "internal/infotips.hxx"
 #include "internal/propsheets.hxx"
 #include "internal/columninfo.hxx"
+#ifdef __MINGW32__
+#include <algorithm>
+using ::std::max;
+using ::std::min;
+#endif
 #include "internal/thumbviewer.hxx"
 #include "internal/shlxthdl.hxx"
 
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index f418a5a66f..9d9ac04ee8 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -79,6 +79,10 @@
 #include "assert.h"
 #include "ooofilt.hxx"
 #include "propspec.hxx"
+#ifdef __MINGW32__
+#include <algorithm>
+using ::std::min;
+#endif
 
 
 //C-------------------------------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
index 7971d7ee7e..e9fa5d3cf9 100644
--- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
@@ -149,17 +149,35 @@ std::wstring iso8601_duration_to_local_duration(const std::wstring& iso8601durat
         hours = buff;
     }
        
-    std::wostringstream oss;
-
 #if defined(_MSC_VER) && defined(_M_X64)        
+    std::wostringstream oss;
     oss << std::setw(2) << std::setfill(wchar_t('0')) << hours   << L":" <<
            std::setw(2) << std::setfill(wchar_t('0')) << minutes << L":" << 
            std::setw(2) << std::setfill(wchar_t('0')) << seconds;
+    return oss.str();
+#elif defined( __MINGW32__ )
+#define ADD_AS_PREFILLED( st, out ) \
+    if ( st.length() == 0 ) \
+        out += L"00"; \
+    else if ( st.length() == 1 ) \
+        out += L"0"; \
+    out += st;
+
+    std::wstring result;
+    ADD_AS_PREFILLED( hours, result )
+    result += L":";
+    ADD_AS_PREFILLED( minutes, result )
+    result += L":";
+    ADD_AS_PREFILLED( seconds, result )
+
+    return result;
+#undef ADD_AS_PREFILLED
 #else
+    std::wostringstream oss;
     oss << std::setw(2) << std::setfill('0') << hours   << L":" <<
            std::setw(2) << std::setfill('0') << minutes << L":" << 
            std::setw(2) << std::setfill('0') << seconds;
-#endif    
     return oss.str();
+#endif    
 }
 
diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx
index e0001ffc9a..303cb1fb5f 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -50,6 +50,7 @@
 #include <iostream>
 #include <vector>
 #include <sstream>
+#include <stdexcept>
 
 #if OSL_DEBUG_LEVEL > 2
     void dumpParameter();
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 3df6722606..9e9acad2e0 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -747,10 +747,10 @@
 #include "sot/exchange.hxx"
 #include "sot/factory.hxx"
 #include "sot/formats.hxx"
-#include "stl/map"
-#include "stl/set"
-#include "stl/slist"
-#include "stl/vector"
+#include <map>
+#include <set>
+#include <slist>
+#include <vector>
 #include "svtools/FilterConfigItem.hxx"
 #include "svtools/accessibilityoptions.hxx"
 #include "svtools/adrparse.hxx"
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index ef7578a0cf..e88eebb8d9 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/makefile.mk
@@ -150,223 +150,223 @@ SLOFILES=\
 .ENDIF
 
 SLOFILES+=\
-    $(SLO)$/SpellDialogChildWindow.obj \
-    $(SLO)$/thesdlg.obj     \
-    $(SLO)$/rubydialog.obj  \
-    $(SLO)$/hyphen.obj      \
-    $(SLO)$/opengrf.obj     \
-    $(SLO)$/internationaloptions.obj	\
-    $(SLO)$/optHeaderTabListbox.obj		\
-    $(SLO)$/charmap.obj     \
-    $(SLO)$/connpooloptions.obj         \
-    $(SLO)$/dbregistersettings.obj      \
-    $(SLO)$/fontsubs.obj                \
-    $(SLO)$/_bmpmask.obj    \
-    $(SLO)$/optmemory.obj				\
-    $(SLO)$/opthtml.obj					\
-    $(SLO)$/optfltr.obj					\
-    $(SLO)$/autocdlg.obj     \
-    $(SLO)$/cuiexp.obj     \
-    $(SLO)$/dlgfact.obj     \
-    $(SLO)$/svxdlg.obj     \
-    $(SLO)$/_contdlg.obj\
-    $(SLO)$/iconcdlg.obj\
-    $(SLO)$/connect.obj \
-    $(SLO)$/connctrl.obj \
-    $(SLO)$/contwnd.obj     \
-    $(SLO)$/fontlb.obj   \
-    $(SLO)$/graphctl.obj \
-    $(SLO)$/hyperdlg.obj \
-    $(SLO)$/hyprlink.obj \
-    $(SLO)$/hlinettp.obj \
-    $(SLO)$/hlmailtp.obj \
-    $(SLO)$/hldoctp.obj \
-    $(SLO)$/imapdlg.obj \
-    $(SLO)$/imapwnd.obj \
-    $(SLO)$/measure.obj \
-    $(SLO)$/dstribut.obj \
-    $(SLO)$/measctrl.obj \
-    $(SLO)$/passwd.obj \
-    $(SLO)$/strarray.obj \
-    $(SLO)$/align.obj    \
-    $(SLO)$/backgrnd.obj \
-    $(SLO)$/bbdlg.obj    \
-    $(SLO)$/border.obj   \
-    $(SLO)$/borderconn.obj   \
-    $(SLO)$/chardlg.obj  \
-    $(SLO)$/checklbx.obj \
-    $(SLO)$/dialcontrol.obj    \
-    $(SLO)$/ctredlin.obj \
-    $(SLO)$/dlgctrl.obj \
-    $(SLO)$/dlgctl3d.obj \
-    $(SLO)$/dlgname.obj \
-    $(SLO)$/dlgutil.obj  \
-    $(SLO)$/fntctrl.obj  \
-    $(SLO)$/fontwork.obj \
-    $(SLO)$/grfpage.obj \
-    $(SLO)$/hdft.obj     \
-    $(SLO)$/impgrf.obj   \
-    $(SLO)$/labdlg.obj \
-    $(SLO)$/langbox.obj \
-    $(SLO)$/wrapfield.obj \
-    $(SLO)$/numfmt.obj   \
-    $(SLO)$/page.obj     \
-    $(SLO)$/pagectrl.obj \
-    $(SLO)$/paragrph.obj \
-    $(SLO)$/paraprev.obj \
-    $(SLO)$/pfiledlg.obj \
-    $(SLO)$/postdlg.obj  \
-    $(SLO)$/prtqry.obj \
-    $(SLO)$/relfld.obj   \
-    $(SLO)$/rlrcitem.obj \
-    $(SLO)$/rulritem.obj \
-    $(SLO)$/simptabl.obj \
-    $(SLO)$/srchxtra.obj \
-    $(SLO)$/srchctrl.obj \
-    $(SLO)$/srchdlg.obj  \
-    $(SLO)$/stddlg.obj   \
-    $(SLO)$/svxbox.obj   \
-    $(SLO)$/svxruler.obj \
-    $(SLO)$/swpossizetabpage.obj \
-    $(SLO)$/tabarea.obj \
-    $(SLO)$/tabline.obj \
-    $(SLO)$/tabstpge.obj \
-    $(SLO)$/textattr.obj \
-    $(SLO)$/textanim.obj \
-    $(SLO)$/tparea.obj   \
-    $(SLO)$/tpbitmap.obj \
-    $(SLO)$/tpcolor.obj  \
-    $(SLO)$/tpgradnt.obj \
-    $(SLO)$/tphatch.obj  \
-    $(SLO)$/tpline.obj \
-    $(SLO)$/tplneend.obj \
-    $(SLO)$/tplnedef.obj \
-    $(SLO)$/tpshadow.obj   \
-    $(SLO)$/transfrm.obj \
-    $(SLO)$/orienthelper.obj    \
-    $(SLO)$/txenctab.obj \
-    $(SLO)$/txencbox.obj \
-    $(SLO)$/zoom.obj         \
-    $(SLO)$/grfflt.obj      \
-    $(SLO)$/frmdirlbox.obj \
-    $(SLO)$/commonlingui.obj \
-    $(SLO)$/dialmgr.obj \
-    $(SLO)$/cuiimapwnd.obj \
-    $(SLO)$/cuisrchdlg.obj \
-    $(SLO)$/cuitbxform.obj \
-    $(SLO)$/cuicharmap.obj  \
-    $(SLO)$/cuihyperdlg.obj	\
-    $(SLO)$/cuifmsearch.obj \
-    $(SLO)$/cuigrfflt.obj \
-    $(SLO)$/multipat.obj \
-    $(SLO)$/optcolor.obj    \
-    $(SLO)$/optjsearch.obj  \
-    $(SLO)$/optgenrl.obj    \
-    $(SLO)$/optctl.obj  \
-    $(SLO)$/svxgrahicitem.obj \
-    $(SLO)$/SpellAttrib.obj  \
-    $(SLO)$/SpellDialog.obj  \
-    $(SLO)$/swframeposstrings.obj\
-    $(SLO)$/swframeexample.obj \
-    $(SLO)$/svxbmpnumvalueset.obj	\
-    $(SLO)$/svxgrahicitem.obj \
-    $(SLO)$/frmsel.obj	\
-    $(SLO)$/framelink.obj	\
-    $(SLO)$/framelinkarray.obj \
-    $(SLO)$/databaseregistrationui.obj \
-    $(SLO)$/radiobtnbox.obj \
-    $(SLO)$/cfgchart.obj \
-    $(SLO)$/optupdt.obj \
-    $(SLO)$/optchart.obj \
-    $(SLO)$/optinet2.obj    \
-    $(SLO)$/securityoptions.obj \
-    $(SLO)$/webconninfo.obj \
-    $(SLO)$/optgdlg.obj \
-    $(SLO)$/optdict.obj \
-    $(SLO)$/optaccessibility.obj    \
-    $(SLO)$/optsave.obj \
-    $(SLO)$/optasian.obj \
-    $(SLO)$/optpath.obj    \
-    $(SLO)$/optjava.obj \
-    $(SLO)$/optimprove.obj \
-    $(SLO)$/optimprove2.obj
+        $(SLO)$/SpellDialogChildWindow.obj \
+        $(SLO)$/thesdlg.obj \
+        $(SLO)$/rubydialog.obj \
+        $(SLO)$/hyphen.obj \
+        $(SLO)$/opengrf.obj \
+        $(SLO)$/internationaloptions.obj \
+        $(SLO)$/optHeaderTabListbox.obj \
+        $(SLO)$/charmap.obj \
+        $(SLO)$/connpooloptions.obj \
+        $(SLO)$/dbregistersettings.obj \
+        $(SLO)$/fontsubs.obj \
+        $(SLO)$/_bmpmask.obj \
+        $(SLO)$/optmemory.obj \
+        $(SLO)$/opthtml.obj \
+        $(SLO)$/optfltr.obj \
+        $(SLO)$/autocdlg.obj \
+        $(SLO)$/cuiexp.obj \
+        $(SLO)$/dlgfact.obj \
+        $(SLO)$/svxdlg.obj \
+        $(SLO)$/_contdlg.obj \
+        $(SLO)$/iconcdlg.obj \
+        $(SLO)$/connect.obj \
+        $(SLO)$/connctrl.obj \
+        $(SLO)$/contwnd.obj \
+        $(SLO)$/fontlb.obj \
+        $(SLO)$/graphctl.obj \
+        $(SLO)$/hyperdlg.obj \
+        $(SLO)$/hyprlink.obj \
+        $(SLO)$/hlinettp.obj \
+        $(SLO)$/hlmailtp.obj \
+        $(SLO)$/hldoctp.obj \
+        $(SLO)$/imapdlg.obj \
+        $(SLO)$/imapwnd.obj \
+        $(SLO)$/measure.obj \
+        $(SLO)$/dstribut.obj \
+        $(SLO)$/measctrl.obj \
+        $(SLO)$/passwd.obj \
+        $(SLO)$/strarray.obj \
+        $(SLO)$/align.obj \
+        $(SLO)$/backgrnd.obj \
+        $(SLO)$/bbdlg.obj \
+        $(SLO)$/border.obj \
+        $(SLO)$/borderconn.obj \
+        $(SLO)$/chardlg.obj \
+        $(SLO)$/checklbx.obj \
+        $(SLO)$/dialcontrol.obj \
+        $(SLO)$/ctredlin.obj \
+        $(SLO)$/dlgctrl.obj \
+        $(SLO)$/dlgctl3d.obj \
+        $(SLO)$/dlgname.obj \
+        $(SLO)$/dlgutil.obj \
+        $(SLO)$/fntctrl.obj \
+        $(SLO)$/fontwork.obj \
+        $(SLO)$/grfpage.obj \
+        $(SLO)$/hdft.obj \
+        $(SLO)$/impgrf.obj \
+        $(SLO)$/labdlg.obj \
+        $(SLO)$/langbox.obj \
+        $(SLO)$/wrapfield.obj \
+        $(SLO)$/numfmt.obj \
+        $(SLO)$/page.obj \
+        $(SLO)$/pagectrl.obj \
+        $(SLO)$/paragrph.obj \
+        $(SLO)$/paraprev.obj \
+        $(SLO)$/pfiledlg.obj \
+        $(SLO)$/postdlg.obj \
+        $(SLO)$/prtqry.obj \
+        $(SLO)$/relfld.obj \
+        $(SLO)$/rlrcitem.obj \
+        $(SLO)$/rulritem.obj \
+        $(SLO)$/simptabl.obj \
+        $(SLO)$/srchxtra.obj \
+        $(SLO)$/srchctrl.obj \
+        $(SLO)$/srchdlg.obj \
+        $(SLO)$/stddlg.obj \
+        $(SLO)$/svxbox.obj \
+        $(SLO)$/svxruler.obj \
+        $(SLO)$/swpossizetabpage.obj \
+        $(SLO)$/tabarea.obj \
+        $(SLO)$/tabline.obj \
+        $(SLO)$/tabstpge.obj \
+        $(SLO)$/textattr.obj \
+        $(SLO)$/textanim.obj \
+        $(SLO)$/tparea.obj \
+        $(SLO)$/tpbitmap.obj \
+        $(SLO)$/tpcolor.obj \
+        $(SLO)$/tpgradnt.obj \
+        $(SLO)$/tphatch.obj \
+        $(SLO)$/tpline.obj \
+        $(SLO)$/tplneend.obj \
+        $(SLO)$/tplnedef.obj \
+        $(SLO)$/tpshadow.obj \
+        $(SLO)$/transfrm.obj \
+        $(SLO)$/orienthelper.obj \
+        $(SLO)$/txenctab.obj \
+        $(SLO)$/txencbox.obj \
+        $(SLO)$/zoom.obj \
+        $(SLO)$/grfflt.obj \
+        $(SLO)$/frmdirlbox.obj \
+        $(SLO)$/commonlingui.obj \
+        $(SLO)$/dialmgr.obj \
+        $(SLO)$/cuiimapwnd.obj \
+        $(SLO)$/cuisrchdlg.obj \
+        $(SLO)$/cuitbxform.obj \
+        $(SLO)$/cuicharmap.obj \
+        $(SLO)$/cuihyperdlg.obj \
+        $(SLO)$/cuifmsearch.obj \
+        $(SLO)$/cuigrfflt.obj \
+        $(SLO)$/multipat.obj \
+        $(SLO)$/optcolor.obj \
+        $(SLO)$/optjsearch.obj \
+        $(SLO)$/optgenrl.obj \
+        $(SLO)$/optctl.obj \
+        $(SLO)$/svxgrahicitem.obj \
+        $(SLO)$/SpellAttrib.obj \
+        $(SLO)$/SpellDialog.obj \
+        $(SLO)$/swframeposstrings.obj \
+        $(SLO)$/swframeexample.obj \
+        $(SLO)$/svxbmpnumvalueset.obj \
+        $(SLO)$/svxgrahicitem.obj \
+        $(SLO)$/frmsel.obj \
+        $(SLO)$/framelink.obj \
+        $(SLO)$/framelinkarray.obj \
+        $(SLO)$/databaseregistrationui.obj \
+        $(SLO)$/radiobtnbox.obj \
+        $(SLO)$/cfgchart.obj \
+        $(SLO)$/optupdt.obj \
+        $(SLO)$/optchart.obj \
+        $(SLO)$/optinet2.obj \
+        $(SLO)$/securityoptions.obj \
+        $(SLO)$/webconninfo.obj \
+        $(SLO)$/optgdlg.obj \
+        $(SLO)$/optdict.obj \
+        $(SLO)$/optaccessibility.obj \
+        $(SLO)$/optsave.obj \
+        $(SLO)$/optasian.obj \
+        $(SLO)$/optpath.obj \
+        $(SLO)$/optjava.obj \
+        $(SLO)$/optimprove.obj \
+        $(SLO)$/optimprove2.obj
 
 LIB1TARGET= $(SLB)$/$(TARGET).lib
 
 LIB1OBJFILES= \
-    $(SLO)$/fontsubs.obj \
-    $(SLO)$/svxdlg.obj \
-    $(SLO)$/charmap.obj     \
-    $(SLO)$/_bmpmask.obj    \
-    $(SLO)$/frmsel.obj \
-    $(SLO)$/opengrf.obj     \
-    $(SLO)$/hyphen.obj      \
-    $(SLO)$/rubydialog.obj  \
-    $(SLO)$/thesdlg.obj     \
-    $(SLO)$/splwrap.obj     \
-    $(SLO)$/hangulhanja.obj \
-    $(SLO)$/_contdlg.obj \
-    $(SLO)$/connctrl.obj \
-    $(SLO)$/contwnd.obj \
-    $(SLO)$/fontlb.obj   \
-    $(SLO)$/graphctl.obj \
-    $(SLO)$/hyperdlg.obj \
-    $(SLO)$/hyprlink.obj \
-    $(SLO)$/imapdlg.obj \
-    $(SLO)$/imapwnd.obj \
-    $(SLO)$/measctrl.obj \
-    $(SLO)$/passwd.obj \
-    $(SLO)$/strarray.obj \
-    $(SLO)$/borderconn.obj    \
-    $(SLO)$/checklbx.obj \
-    $(SLO)$/dialcontrol.obj    \
-    $(SLO)$/ctredlin.obj \
-    $(SLO)$/dlgctrl.obj \
-    $(SLO)$/dlgctl3d.obj \
-    $(SLO)$/dlgutil.obj  \
-    $(SLO)$/docrecovery.obj  \
-    $(SLO)$/fntctrl.obj  \
-    $(SLO)$/fontwork.obj \
-    $(SLO)$/hdft.obj     \
-    $(SLO)$/impgrf.obj   \
-    $(SLO)$/langbox.obj \
-    $(SLO)$/wrapfield.obj    \
-    $(SLO)$/pagectrl.obj \
-    $(SLO)$/paraprev.obj \
-    $(SLO)$/pfiledlg.obj \
-    $(SLO)$/prtqry.obj \
-    $(SLO)$/relfld.obj   \
-    $(SLO)$/rlrcitem.obj \
-    $(SLO)$/rulritem.obj \
-    $(SLO)$/scriptdlg.obj \
-    $(SLO)$/selector.obj \
-    $(SLO)$/simptabl.obj \
-    $(SLO)$/srchctrl.obj \
-    $(SLO)$/srchdlg.obj  \
-    $(SLO)$/stddlg.obj   \
-    $(SLO)$/svxbox.obj   \
-    $(SLO)$/svxruler.obj \
-    $(SLO)$/tparea.obj   \
-    $(SLO)$/orienthelper.obj    \
-    $(SLO)$/txenctab.obj \
-    $(SLO)$/txencbox.obj \
-    $(SLO)$/grfflt.obj \
-    $(SLO)$/frmdirlbox.obj \
-    $(SLO)$/commonlingui.obj \
-    $(SLO)$/SpellDialogChildWindow.obj \
-    $(SLO)$/svxbmpnumvalueset.obj	\
-    $(SLO)$/dialmgr.obj	\
-    $(SLO)$/svxgrahicitem.obj \
-    $(SLO)$/swframeexample.obj \
-    $(SLO)$/swframeposstrings.obj \
-    $(SLO)$/eventdlg.obj \
-    $(SLO)$/macropg.obj \
-    $(SLO)$/cfg.obj	\
-    $(SLO)$/framelink.obj	\
-    $(SLO)$/framelinkarray.obj \
-    $(SLO)$/databaseregistrationui.obj \
-    $(SLO)$/optimprove.obj \
-    $(SLO)$/radiobtnbox.obj
+        $(SLO)$/fontsubs.obj \
+        $(SLO)$/svxdlg.obj \
+        $(SLO)$/charmap.obj \
+        $(SLO)$/_bmpmask.obj \
+        $(SLO)$/frmsel.obj \
+        $(SLO)$/opengrf.obj \
+        $(SLO)$/hyphen.obj \
+        $(SLO)$/rubydialog.obj \
+        $(SLO)$/thesdlg.obj \
+        $(SLO)$/splwrap.obj \
+        $(SLO)$/hangulhanja.obj \
+        $(SLO)$/_contdlg.obj \
+        $(SLO)$/connctrl.obj \
+        $(SLO)$/contwnd.obj \
+        $(SLO)$/fontlb.obj \
+        $(SLO)$/graphctl.obj \
+        $(SLO)$/hyperdlg.obj \
+        $(SLO)$/hyprlink.obj \
+        $(SLO)$/imapdlg.obj \
+        $(SLO)$/imapwnd.obj \
+        $(SLO)$/measctrl.obj \
+        $(SLO)$/passwd.obj \
+        $(SLO)$/strarray.obj \
+        $(SLO)$/borderconn.obj \
+        $(SLO)$/checklbx.obj \
+        $(SLO)$/dialcontrol.obj \
+        $(SLO)$/ctredlin.obj \
+        $(SLO)$/dlgctrl.obj \
+        $(SLO)$/dlgctl3d.obj \
+        $(SLO)$/dlgutil.obj \
+        $(SLO)$/docrecovery.obj \
+        $(SLO)$/fntctrl.obj \
+        $(SLO)$/fontwork.obj \
+        $(SLO)$/hdft.obj \
+        $(SLO)$/impgrf.obj \
+        $(SLO)$/langbox.obj \
+        $(SLO)$/wrapfield.obj \
+        $(SLO)$/pagectrl.obj \
+        $(SLO)$/paraprev.obj \
+        $(SLO)$/pfiledlg.obj \
+        $(SLO)$/prtqry.obj \
+        $(SLO)$/relfld.obj \
+        $(SLO)$/rlrcitem.obj \
+        $(SLO)$/rulritem.obj \
+        $(SLO)$/scriptdlg.obj \
+        $(SLO)$/selector.obj \
+        $(SLO)$/simptabl.obj \
+        $(SLO)$/srchctrl.obj \
+        $(SLO)$/srchdlg.obj \
+        $(SLO)$/stddlg.obj \
+        $(SLO)$/svxbox.obj \
+        $(SLO)$/svxruler.obj \
+        $(SLO)$/tparea.obj \
+        $(SLO)$/orienthelper.obj \
+        $(SLO)$/txenctab.obj \
+        $(SLO)$/txencbox.obj \
+        $(SLO)$/grfflt.obj \
+        $(SLO)$/frmdirlbox.obj \
+        $(SLO)$/commonlingui.obj \
+        $(SLO)$/SpellDialogChildWindow.obj \
+        $(SLO)$/svxbmpnumvalueset.obj\
+        $(SLO)$/dialmgr.obj\
+        $(SLO)$/svxgrahicitem.obj \
+        $(SLO)$/swframeexample.obj \
+        $(SLO)$/swframeposstrings.obj \
+        $(SLO)$/eventdlg.obj \
+        $(SLO)$/macropg.obj \
+        $(SLO)$/cfg.obj\
+        $(SLO)$/framelink.obj\
+        $(SLO)$/framelinkarray.obj \
+        $(SLO)$/databaseregistrationui.obj \
+        $(SLO)$/optimprove.obj \
+        $(SLO)$/radiobtnbox.obj
 
 .IF "$(GUI)"=="UNX"
 LIB1OBJFILES +=	$(SLO)$/sendreportunx.obj
@@ -385,98 +385,98 @@ LIB2OBJFILES= \
         $(SLO)$/pastedlg.obj \
         $(SLO)$/plfilter.obj \
         $(SLO)$/insdlg.obj \
-    $(SLO)$/optHeaderTabListbox.obj		\
-    $(SLO)$/sdbcdriverenum.obj	\
-    $(SLO)$/connpoolsettings.obj \
-    $(SLO)$/dbregisterednamesconfig.obj \
-    $(SLO)$/dbregistersettings.obj \
-    $(SLO)$/dbregister.obj				\
-    $(SLO)$/doclinkdialog.obj				\
-    $(SLO)$/connpoolconfig.obj \
-    $(SLO)$/internationaloptions.obj	\
-    $(SLO)$/connpooloptions.obj			\
-    $(SLO)$/optgdlg.obj					\
-    $(SLO)$/optmemory.obj				\
-    $(SLO)$/opthtml.obj					\
-    $(SLO)$/optfltr.obj					\
-    $(SLO)$/treeopt.obj \
-    $(SLO)$/autocdlg.obj     \
-    $(SLO)$/dialmgr.obj \
-    $(SLO)$/textanim.obj \
-    $(SLO)$/labdlg.obj	\
-    $(SLO)$/dstribut.obj  \
-    $(SLO)$/hangulhanjadlg.obj	\
-    $(SLO)$/showcols.obj	\
-    $(SLO)$/zoom.obj	\
-    $(SLO)$/cuigaldlg.obj \
-    $(SLO)$/cuiimapwnd.obj \
-    $(SLO)$/hlmarkwn.obj	\
-    $(SLO)$/cuicharmap.obj  \
-    $(SLO)$/srchxtra.obj	\
-    $(SLO)$/bbdlg.obj	\
-    $(SLO)$/swpossizetabpage.obj \
-    $(SLO)$/transfrm.obj \
-    $(SLO)$/cuisrchdlg.obj \
-    $(SLO)$/cuitbxform.obj \
-    $(SLO)$/optdict.obj \
-    $(SLO)$/dlgname.obj \
-    $(SLO)$/multipat.obj \
-    $(SLO)$/multifil.obj	\
-    $(SLO)$/iconcdlg.obj	\
-    $(SLO)$/hltpbase.obj    \
-    $(SLO)$/hldocntp.obj    \
-    $(SLO)$/hldoctp.obj \
-    $(SLO)$/hlinettp.obj \
-    $(SLO)$/hlmailtp.obj 	\
-    $(SLO)$/cuihyperdlg.obj	\
-    $(SLO)$/cuifmsearch.obj \
-    $(SLO)$/cuigrfflt.obj \
-    $(SLO)$/readonlyimage.obj \
-    $(SLO)$/optaccessibility.obj    \
-    $(SLO)$/optsave.obj		\
-    $(SLO)$/optasian.obj	\
-    $(SLO)$/optpath.obj		\
-    $(SLO)$/optcolor.obj	\
-    $(SLO)$/optjsearch.obj	\
-    $(SLO)$/optinet2.obj    \
-    $(SLO)$/securityoptions.obj \
-    $(SLO)$/webconninfo.obj \
-    $(SLO)$/optctl.obj	\
-    $(SLO)$/optjava.obj	\
-    $(SLO)$/optupdt.obj \
-    $(SLO)$/optimprove2.obj \
-    $(SLO)$/optgenrl.obj	\
-    $(SLO)$/connect.obj \
-    $(SLO)$/tabarea.obj \
-    $(SLO)$/tabline.obj \
-    $(SLO)$/measure.obj \
-    $(SLO)$/tpshadow.obj \
-    $(SLO)$/tpline.obj \
-    $(SLO)$/tpgradnt.obj \
-    $(SLO)$/tpcolor.obj \
-    $(SLO)$/tpbitmap.obj \
-    $(SLO)$/tphatch.obj \
-    $(SLO)$/tplneend.obj \
-    $(SLO)$/tplnedef.obj \
-    $(SLO)$/SpellAttrib.obj  \
-    $(SLO)$/SpellDialog.obj  \
-    $(SLO)$/numpages.obj \
-    $(SLO)$/paragrph.obj \
-    $(SLO)$/tabstpge.obj \
-    $(SLO)$/textattr.obj  	\
-    $(SLO)$/align.obj \
-    $(SLO)$/backgrnd.obj \
-    $(SLO)$/border.obj \
-    $(SLO)$/chardlg.obj \
-    $(SLO)$/numfmt.obj \
-    $(SLO)$/page.obj \
-    $(SLO)$/postdlg.obj \
-    $(SLO)$/sdrcelldlg.obj \
-    $(SLO)$/splitcelldlg.obj \
-    $(SLO)$/newtabledlg.obj\
-    $(SLO)$/grfpage.obj \
-    $(SLO)$/cfgchart.obj \
-    $(SLO)$/optchart.obj
+        $(SLO)$/optHeaderTabListbox.obj \
+        $(SLO)$/sdbcdriverenum.obj \
+        $(SLO)$/connpoolsettings.obj \
+        $(SLO)$/dbregisterednamesconfig.obj \
+        $(SLO)$/dbregistersettings.obj \
+        $(SLO)$/dbregister.obj \
+        $(SLO)$/doclinkdialog.obj \
+        $(SLO)$/connpoolconfig.obj \
+        $(SLO)$/internationaloptions.obj \
+        $(SLO)$/connpooloptions.obj \
+        $(SLO)$/optgdlg.obj \
+        $(SLO)$/optmemory.obj \
+        $(SLO)$/opthtml.obj \
+        $(SLO)$/optfltr.obj \
+        $(SLO)$/treeopt.obj \
+        $(SLO)$/autocdlg.obj \
+        $(SLO)$/dialmgr.obj \
+        $(SLO)$/textanim.obj \
+        $(SLO)$/labdlg.obj \
+        $(SLO)$/dstribut.obj \
+        $(SLO)$/hangulhanjadlg.obj \
+        $(SLO)$/showcols.obj \
+        $(SLO)$/zoom.obj \
+        $(SLO)$/cuigaldlg.obj \
+        $(SLO)$/cuiimapwnd.obj \
+        $(SLO)$/hlmarkwn.obj \
+        $(SLO)$/cuicharmap.obj \
+        $(SLO)$/srchxtra.obj \
+        $(SLO)$/bbdlg.obj \
+        $(SLO)$/swpossizetabpage.obj \
+        $(SLO)$/transfrm.obj \
+        $(SLO)$/cuisrchdlg.obj \
+        $(SLO)$/cuitbxform.obj \
+        $(SLO)$/optdict.obj \
+        $(SLO)$/dlgname.obj \
+        $(SLO)$/multipat.obj \
+        $(SLO)$/multifil.obj \
+        $(SLO)$/iconcdlg.obj \
+        $(SLO)$/hltpbase.obj \
+        $(SLO)$/hldocntp.obj \
+        $(SLO)$/hldoctp.obj \
+        $(SLO)$/hlinettp.obj \
+        $(SLO)$/hlmailtp.obj \
+        $(SLO)$/cuihyperdlg.obj \
+        $(SLO)$/cuifmsearch.obj \
+        $(SLO)$/cuigrfflt.obj \
+        $(SLO)$/readonlyimage.obj \
+        $(SLO)$/optaccessibility.obj \
+        $(SLO)$/optsave.obj \
+        $(SLO)$/optasian.obj \
+        $(SLO)$/optpath.obj \
+        $(SLO)$/optcolor.obj \
+        $(SLO)$/optjsearch.obj \
+        $(SLO)$/optinet2.obj \
+        $(SLO)$/securityoptions.obj \
+        $(SLO)$/webconninfo.obj \
+        $(SLO)$/optctl.obj \
+        $(SLO)$/optjava.obj \
+        $(SLO)$/optupdt.obj \
+        $(SLO)$/optimprove2.obj \
+        $(SLO)$/optgenrl.obj \
+        $(SLO)$/connect.obj \
+        $(SLO)$/tabarea.obj \
+        $(SLO)$/tabline.obj \
+        $(SLO)$/measure.obj \
+        $(SLO)$/tpshadow.obj \
+        $(SLO)$/tpline.obj \
+        $(SLO)$/tpgradnt.obj \
+        $(SLO)$/tpcolor.obj \
+        $(SLO)$/tpbitmap.obj \
+        $(SLO)$/tphatch.obj \
+        $(SLO)$/tplneend.obj \
+        $(SLO)$/tplnedef.obj \
+        $(SLO)$/SpellAttrib.obj \
+        $(SLO)$/SpellDialog.obj \
+        $(SLO)$/numpages.obj \
+        $(SLO)$/paragrph.obj \
+        $(SLO)$/tabstpge.obj \
+        $(SLO)$/textattr.obj \
+        $(SLO)$/align.obj \
+        $(SLO)$/backgrnd.obj \
+        $(SLO)$/border.obj \
+        $(SLO)$/chardlg.obj \
+        $(SLO)$/numfmt.obj \
+        $(SLO)$/page.obj \
+        $(SLO)$/postdlg.obj \
+        $(SLO)$/sdrcelldlg.obj \
+        $(SLO)$/splitcelldlg.obj \
+        $(SLO)$/newtabledlg.obj \
+        $(SLO)$/grfpage.obj \
+        $(SLO)$/cfgchart.obj \
+        $(SLO)$/optchart.obj
 
 .IF "$(GUI)"=="WNT"
 SLOFILES+=$(SLO)$/winpluginlib.obj
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx
index b092861f7c..20f6909fac 100644
--- a/svx/source/editeng/impedit2.cxx
+++ b/svx/source/editeng/impedit2.cxx
@@ -1024,7 +1024,7 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM&
         UBiDi* pBidi = ubidi_openSized( aLine.Len(), 0, &nError );
 
         const UBiDiLevel  nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 /*LTR*/;
-        ubidi_setPara( pBidi, pLineString, aLine.Len(), nBidiLevel, NULL, &nError );
+        ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.Len(), nBidiLevel, NULL, &nError );	// UChar != sal_Unicode in MinGW
 
         USHORT nVisPos = bStart ? 0 : aLine.Len()-1;
         USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
@@ -1146,7 +1146,7 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
         UBiDi* pBidi = ubidi_openSized( aLine.Len(), 0, &nError );
 
         const UBiDiLevel  nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 /*LTR*/;
-        ubidi_setPara( pBidi, pLineString, aLine.Len(), nBidiLevel, NULL, &nError );
+        ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.Len(), nBidiLevel, NULL, &nError );	// UChar != sal_Unicode in MinGW
 
         if ( !pEditView->IsInsertMode() )
         {
@@ -1975,7 +1975,7 @@ void ImpEditEngine::InitWritingDirections( USHORT nPara )
         UBiDi* pBidi = ubidi_openSized( aText.Len(), 0, &nError );
         nError = U_ZERO_ERROR;
 
-        ubidi_setPara( pBidi, aText.GetBuffer(), aText.Len(), nBidiLevel, NULL, &nError );
+        ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.GetBuffer()), aText.Len(), nBidiLevel, NULL, &nError );	// UChar != sal_Unicode in MinGW
         nError = U_ZERO_ERROR;
 
         long nCount = ubidi_countRuns( pBidi, &nError );
diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx
index d5adb9294a..3e4a0ed868 100644
--- a/svx/source/outliner/outliner.cxx
+++ b/svx/source/outliner/outliner.cxx
@@ -2112,7 +2112,7 @@ sal_Bool DrawPortionInfo::IsRTL() const
         // I do not have this info here. Is it necessary? I'll have to ask MT.
         const BYTE nDefaultDir = UBIDI_LTR; //IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR;
 
-        ubidi_setPara(pBidi, mrText.GetBuffer(), mrText.Len(), nDefaultDir, NULL, &nError);
+        ubidi_setPara(pBidi, reinterpret_cast<const UChar *>(mrText.GetBuffer()), mrText.Len(), nDefaultDir, NULL, &nError);	// UChar != sal_Unicode in MinGW
         nError = U_ZERO_ERROR;
 
 //        sal_Int32 nCount(ubidi_countRuns(pBidi, &nError));
diff --git a/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx b/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
index b6c3247bc8..74a01771ca 100644
--- a/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
+++ b/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
@@ -37,6 +37,10 @@
 #include <libxslt/xsltInternals.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
+#ifdef __MINGW32__
+#include <tools/prewin.h>
+#include <tools/postwin.h>
+#endif
 
 HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path &in_inputFile, 
     const fs::path &in_src, const fs::path &in_resEmbStylesheet,