diff options
author | Kurt Zenker <kz@openoffice.org> | 2010-07-13 14:04:59 +0200 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2010-07-13 14:04:59 +0200 |
commit | 3e495e2e5b8ed4573a95c65f5c35fd48764f3ab4 (patch) | |
tree | 2e5a3eacbc1b83ad75aa6d5f34a07d6a815b1d66 | |
parent | 6b8ae0ea1a10c20383117603a4a7153071681d04 (diff) | |
parent | 360a6cc2dd034670da94e65b55a16cb01aadb7c0 (diff) |
CWS-TOOLING: integrate CWS mingwport31_OOO330
-rw-r--r-- | basic/source/runtime/dllmgr.cxx | 2 | ||||
-rw-r--r-- | basic/source/runtime/wnt-mingw.s | 4 | ||||
-rw-r--r-- | sfx2/source/doc/syspathw32.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/basic/source/runtime/dllmgr.cxx b/basic/source/runtime/dllmgr.cxx index bc08a8cb64..04f1ee0a8a 100644 --- a/basic/source/runtime/dllmgr.cxx +++ b/basic/source/runtime/dllmgr.cxx @@ -684,7 +684,7 @@ Dll * SbiDllMgr::Impl::getDll(rtl::OUString const & name) { Dlls::iterator i(dlls.find(name)); if (i == dlls.end()) { i = dlls.insert(Dlls::value_type(name, new Dll)).first; - HMODULE h = LoadLibraryW(name); + HMODULE h = LoadLibraryW(reinterpret_cast<LPCWSTR>(name.getStr())); if (h == 0) { dlls.erase(i); return 0; diff --git a/basic/source/runtime/wnt-mingw.s b/basic/source/runtime/wnt-mingw.s index 7868ddd386..8c332c1a8c 100644 --- a/basic/source/runtime/wnt-mingw.s +++ b/basic/source/runtime/wnt-mingw.s @@ -44,8 +44,8 @@ _DllMgr_callFp: shr ecx, 2 rep movsd $1: call DWORD PTR [ebp+8] - ; for extra safety, do not trust esp after call (in case the Basic Declare - ; signature is wrong): + # for extra safety, do not trust esp after call (in case the Basic Declare + # signature is wrong): mov edi, [ebp-8] mov esi, [ebp-4] mov esp, ebp diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx index 51dc9d8d66..42786a89ec 100644 --- a/sfx2/source/doc/syspathw32.cxx +++ b/sfx2/source/doc/syspathw32.cxx @@ -74,7 +74,7 @@ typedef unsigned short sal_uInt16; extern "C" bool GetUserTemplateLocation(sal_Unicode* pFolder, int nSize) { #ifdef WNT - return _SHGetSpecialFolderW32( CSIDL_TEMPLATES, pFolder, nSize ); + return _SHGetSpecialFolderW32( CSIDL_TEMPLATES, reinterpret_cast<LPWSTR>(pFolder), nSize ); #else (void)pFolder; (void)nSize; |