diff options
author | Joachim Lingner <jl@openoffice.org> | 2011-03-03 12:04:04 +0100 |
---|---|---|
committer | Joachim Lingner <jl@openoffice.org> | 2011-03-03 12:04:04 +0100 |
commit | fc2bbcd5c69e181d742f3ac8a321cd9f03e6278d (patch) | |
tree | af8d96df7e7a6ae63c47ec125a96a22a24b063bc /sal/osl | |
parent | 8521fa6ceb50adab27a3ca013501d0769b8b41af (diff) |
jl164 #i109096# fixing use of vectors as smart array in osl_loadModules and osl_createprocesswithredirectedio, I introduced them in one of the previous changesets in this cws
Diffstat (limited to 'sal/osl')
-rwxr-xr-x | sal/osl/w32/module.cxx | 6 | ||||
-rwxr-xr-x | sal/osl/w32/procimpl.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx index cac91f7c7..8fc1dbb8b 100755 --- a/sal/osl/w32/module.cxx +++ b/sal/osl/w32/module.cxx @@ -80,13 +80,13 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMod { std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(Module->length + 1); DWORD len = GetShortPathNameW(reinterpret_cast<LPCWSTR>(Module->buffer), - vec.begin(), Module->length + 1); + &vec[0], Module->length + 1); if (len ) { - hInstance = LoadLibraryW(vec.begin()); + hInstance = LoadLibraryW(&vec[0]); if (hInstance == NULL) - hInstance = LoadLibraryExW(vec.begin(), NULL, + hInstance = LoadLibraryExW(&vec[0], NULL, LOAD_WITH_ALTERED_SEARCH_PATH); } } diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 5a4188db9..4fad3f225 100755 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -314,7 +314,7 @@ namespace /* private */ std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(path.getLength() + 1); //GetShortPathNameW only works if the file can be found! const DWORD len = GetShortPathNameW( - path.getStr(), vec.begin(), path.getLength() + 1); + path.getStr(), &vec[0], path.getLength() + 1); if (!len && GetLastError() == ERROR_FILE_NOT_FOUND && extension.getLength()) @@ -323,12 +323,12 @@ namespace /* private */ std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec2( extPath.getLength() + 1); const DWORD len2 = GetShortPathNameW( - extPath.getStr(), vec2.begin(), extPath.getLength() + 1); - ret = rtl::OUString(vec2.begin(), len2); + extPath.getStr(), &vec2[0], extPath.getLength() + 1); + ret = rtl::OUString(&vec2[0], len2); } else { - ret = rtl::OUString(vec.begin(), len); + ret = rtl::OUString(&vec[0], len); } } return ret; |