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

3 files changed, 7 insertions, 7 deletions

diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 9dbecd813b49..b832bb02e7e9 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -197,8 +197,8 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
         }
     }
 
-    if (newBreak || icuBI->aICUText.compare(UnicodeString(rText.getStr(), rText.getLength()))) {
-        icuBI->aICUText=UnicodeString(rText.getStr(), rText.getLength());
+    if (newBreak || icuBI->aICUText.compare(UnicodeString(reinterpret_cast<const UChar *>(rText.getStr()), rText.getLength()))) {   // UChar != sal_Unicode in MinGW
+        icuBI->aICUText=UnicodeString(reinterpret_cast<const UChar *>(rText.getStr()), rText.getLength());
         icuBI->aBreakIterator->setText(icuBI->aICUText);
     }
 }
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 5fef2e34a4c0..40826c3c3184 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -65,13 +65,13 @@ sal_Int32 SAL_CALL
 Collator_Unicode::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1,
     const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException)
 {
-    return collator->compare(str1.getStr() + off1, len1, str2.getStr() + off2, len2);
+    return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()) + off1, len1, reinterpret_cast<const UChar *>(str2.getStr()) + off2, len2); // UChar != sal_Unicode in MinGW
 }
 
 sal_Int32 SAL_CALL
 Collator_Unicode::compareString( const OUString& str1, const OUString& str2) throw(RuntimeException)
 {
-    return collator->compare(str1.getStr(), str2.getStr());
+    return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()), reinterpret_cast<const UChar *>(str2.getStr()));   // UChar != sal_Unicode in MinGW
 }
 
 extern "C" { static void SAL_CALL thisModule() {} }
@@ -84,7 +84,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
         UErrorCode status = U_ZERO_ERROR;
         OUString rule = LocaleData().getCollatorRuleByAlgorithm(rLocale, rAlgorithm);
         if (rule.getLength() > 0) {
-            collator = new RuleBasedCollator(rule.getStr(), status);
+            collator = new RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status);   // UChar != sal_Unicode in MinGW
             if (! U_SUCCESS(status)) throw RuntimeException();
         }
         if (!collator && OUString::createFromAscii(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) {
@@ -120,7 +120,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
                 }
                 if (func) {
                     const sal_uInt8* ruleImage=func();
-                    uca_base = new RuleBasedCollator((sal_Unicode*)NULL, status);
+                    uca_base = new RuleBasedCollator(static_cast<UChar*>(NULL), status);
                     if (! U_SUCCESS(status)) throw RuntimeException();
                     collator = new RuleBasedCollator(reinterpret_cast<const uint8_t*>(ruleImage), -1, uca_base, status);
                     if (! U_SUCCESS(status)) throw RuntimeException();
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
index 43f0a8310c30..c14b068efeca 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.cxx
@@ -118,7 +118,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     //UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF,
     //        UCOL_DEFAULT_STRENGTH, &parseError, &status);
 
-    RuleBasedCollator *coll = new RuleBasedCollator(Obuf.getStr(), status);
+    RuleBasedCollator *coll = new RuleBasedCollator(reinterpret_cast<const UChar *>(Obuf.getStr()), status);    // UChar != sal_Unicode in MinGW
 
     if (U_SUCCESS(status)) {