summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-06-06 15:46:14 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-06-06 15:46:14 +0000
commitd79fd5eb098f127757f53d8a3ca4a14974b7b623 (patch)
treeddff54c29694fd278f64f46016d33f7ebdf13d22
parent3b36ae1376038661554d2a61e7f1b4f2c6a13e98 (diff)
INTEGRATION: CWS mingwport13 (1.111.20); FILE MERGED
2008/06/02 10:40:20 vg 1.111.20.2: RESYNC: (1.111-1.112); FILE MERGED 2008/05/05 12:05:17 vg 1.111.20.1: #i88772# MinGW fixes for DEV300
-rwxr-xr-xvcl/win/source/gdi/winlayout.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 3ef072ab28e9..bd494cfa0a54 100755
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: winlayout.cxx,v $
- * $Revision: 1.112 $
+ * $Revision: 1.113 $
*
* This file is part of OpenOffice.org.
*
@@ -1221,13 +1221,13 @@ static bool InitUSP()
if( pModuleFileCStr )
{
DWORD nHandle;
- DWORD nBufSize = ::GetFileVersionInfoSizeW( pModuleFileCStr, &nHandle );
+ DWORD nBufSize = ::GetFileVersionInfoSizeW( const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(pModuleFileCStr)), &nHandle );
char* pBuffer = (char*)alloca( nBufSize );
- WIN_BOOL bRC = ::GetFileVersionInfoW( pModuleFileCStr, nHandle, nBufSize, pBuffer );
+ WIN_BOOL bRC = ::GetFileVersionInfoW( const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(pModuleFileCStr)), nHandle, nBufSize, pBuffer );
VS_FIXEDFILEINFO* pFixedFileInfo = NULL;
UINT nFixedFileSize = 0;
if( bRC )
- ::VerQueryValueW( pBuffer, L"\\", (void**)&pFixedFileInfo, &nFixedFileSize );
+ ::VerQueryValueW( pBuffer, const_cast<LPWSTR>(L"\\"), (void**)&pFixedFileInfo, &nFixedFileSize );
if( pFixedFileInfo && pFixedFileInfo->dwSignature == 0xFEEF04BD )
nUspVersion = HIWORD(pFixedFileInfo->dwProductVersionMS) * 10000
+ LOWORD(pFixedFileInfo->dwProductVersionMS);