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 | 148cd2e4bb5e960bb0d95be112284b0c9eea4eff (patch) | |
| tree | 9536ef419455d393f112c0377b6962cebe6fd617 /basic | |
| parent | 863bbb6b8c5b1cb83b98e623b9a1478f3a519b1a (diff) | |
| parent | 45fdc2501daaa968d133602ea325450d1af7a2a9 (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 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 |