diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-07-27 18:05:46 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-07-27 18:05:46 +0200 |
| commit | fb7fb796e2a9fc294bfc13cd2b986d347b5ba719 (patch) | |
| tree | a92b7e27aae5b93ac1103a7076150503bed13e7a /basic | |
| parent | 0ae44da7752001293131a96e30d5466b3b7919f2 (diff) | |
| parent | 85a4e97dc97a88c59ab0cf8a4d89d9f9413adf9f (diff) | |
mib17: rebase to OOO330_m2
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/dllmgr.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/wnt-mingw.s | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/basic/source/runtime/dllmgr.cxx b/basic/source/runtime/dllmgr.cxx index bc08a8cb64bc..04f1ee0a8acc 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 7868ddd386f0..8c332c1a8ce8 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 |