summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-01-20 16:36:21 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-01-20 16:36:21 +0000
commit6b93c0a462a295cfc566dcc4ccb427ce68e470ed (patch)
tree459f3887a86f7c4b76097e9d7a8b8ca798d176f8 /vcl/source
parent1d730017c11b05ef15268daa979bdea6ea22387c (diff)
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
Diffstat (limited to 'vcl/source')
-rwxr-xr-xvcl/source/gdi/sallayout.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 11c0c94435bb..6b695b8a22f6 100755
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -556,7 +556,7 @@ ImplLayoutArgs::ImplLayoutArgs( const xub_Unicode* pStr, int nLen,
UBiDi* pParaBidi = ubidi_openSized( mnLength, 0, &rcI18n );
if( !pParaBidi )
return;
- ubidi_setPara( pParaBidi, mpStr, mnLength, nLevel, NULL, &rcI18n );
+ ubidi_setPara( pParaBidi, reinterpret_cast<const UChar *>(mpStr), mnLength, nLevel, NULL, &rcI18n ); // UChar != sal_Unicode in MinGW
UBiDi* pLineBidi = pParaBidi;
int nSubLength = mnEndCharPos - mnMinCharPos;