summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2011-03-03 12:04:04 +0100
committerJoachim Lingner <jl@openoffice.org>2011-03-03 12:04:04 +0100
commit0775f9eacec0e0758512c425c4e65190a651c3ae (patch)
tree9d52704f7e4bf7d18ebae152f548b8ec1b7b4595
parentcfbddca53c5f0c795fa35612d739c3dabb8f0d48 (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
-rwxr-xr-xsal/osl/w32/module.cxx6
-rwxr-xr-xsal/osl/w32/procimpl.cxx8
2 files changed, 7 insertions, 7 deletions
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 00737ebbbaa4..65a17eb1352d 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 13e7141edbad..a2f86422df2a 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;