--- workdir/sal/osl/w32/module.cxx.orig	2011-03-19 22:01:51.167750000 +0900
+++ workdir/sal/osl/w32/module.cxx	2011-03-20 15:20:55.450125000 +0900
@@ -78,7 +78,7 @@
     //on Windows XP and ERROR_INSUFFICIENT_BUFFER on Windows 7 (64bit)
 	if (hInstance == NULL && Module->length > 260)
 	{
-        std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(Module->length + 1);
+        std::vector<WCHAR, rtl::Allocator<WCHAR> > vec(Module->length + 1);
 		DWORD len = GetShortPathNameW(reinterpret_cast<LPCWSTR>(Module->buffer), 
                                       &vec[0], Module->length + 1);
 		if (len )
--- workdir/sal/osl/w32/procimpl.cxx.orig	2011-03-19 22:01:51.167750000 +0900
+++ workdir/sal/osl/w32/procimpl.cxx	2011-03-20 15:32:50.168875000 +0900
@@ -314,7 +314,7 @@
             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[0], path.getLength() + 1);
+                reinterpret_cast<LPCWSTR>(path.getStr()), reinterpret_cast<LPWSTR>(&vec[0]), path.getLength() + 1);
 
             if (!len && GetLastError() == ERROR_FILE_NOT_FOUND
                 && extension.getLength())
@@ -323,7 +323,7 @@
                 std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec2(
                     extPath.getLength() + 1);
                 const DWORD len2 = GetShortPathNameW(
-                    extPath.getStr(), &vec2[0], extPath.getLength() + 1);
+                    reinterpret_cast<LPCWSTR>(extPath.getStr()), reinterpret_cast<LPWSTR>(&vec2[0]), extPath.getLength() + 1);
                 ret = rtl::OUString(&vec2[0], len2);
             }
             else
--- workdir/l10ntools/source/help/HelpCompiler.hxx.orig	2011-03-19 22:41:14.136500000 +0900
+++ workdir/l10ntools/source/help/HelpCompiler.hxx	2011-03-20 17:21:05.887625000 +0900
@@ -107,7 +107,7 @@
         {
             ::rtl::OUString ustrSystemPath;
             osl::File::getSystemPathFromFileURL(data, ustrSystemPath);
-            return ustrSystemPath.getStr();
+            return reinterpret_cast< wchar_t const * >(ustrSystemPath.getStr());
         }
 #endif
         std::string native_directory_string() const { return native_file_string(); }