summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-09-25 12:16:58 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-09-25 12:16:58 +0000
commit7951f0795db0bc687e056107570d0d90908b3363 (patch)
tree02b0c0a990a2a3a82b3bdde2341bd038d392df5a /sal
parentc6191bc8683e0a4af7530819fcc002477f36a386 (diff)
INTEGRATION: CWS obo05 (1.4.2); FILE MERGED
2006/06/28 10:29:32 obo 1.4.2.1: #i53711# .net 2005 signed/unsigned warnings
Diffstat (limited to 'sal')
-rw-r--r--sal/systools/win32/uwinapi/PathCompactPathExW.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/sal/systools/win32/uwinapi/PathCompactPathExW.cpp b/sal/systools/win32/uwinapi/PathCompactPathExW.cpp
index 1b4355fd760a..f511686ca5b4 100644
--- a/sal/systools/win32/uwinapi/PathCompactPathExW.cpp
+++ b/sal/systools/win32/uwinapi/PathCompactPathExW.cpp
@@ -4,9 +4,9 @@
*
* $RCSfile: PathCompactPathExW.cpp,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: hr $ $Date: 2006-06-20 04:33:45 $
+ * last change: $Author: vg $ $Date: 2006-09-25 13:16:58 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -49,6 +49,6 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathCompactPathExW,
AUTO_WSTR2STR(lpPath);
char* pOutA = (LPSTR)_alloca( cchMax * sizeof(CHAR) );
BOOL bret = PathCompactPathExA(pOutA, lpPathA, cchMax, dwFlags);
- MultiByteToWideChar(CP_ACP, 0, pOutA, -1, pszOut, cchMax);
+ MultiByteToWideChar(CP_ACP, 0, pOutA, -1, pszOut, (int) cchMax);
return bret;
-}
+} \ No newline at end of file