diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2012-08-13 11:21:13 +0200 |
|---|---|---|
| committer | Arnaud Versini <arnaud.versini@gmail.com> | 2012-08-14 16:18:05 +0200 |
| commit | 9a3d8ed28dc44743b6715cd8bac39b55762cba11 (patch) | |
| tree | 2755682e3e28998f7df4c2fa4fde1d7235e8c872 /vcl/win | |
| parent | d26599c3e1dea940439985b46b727cfc22b37c38 (diff) | |
Replace usage of rtl/memory.h in vcl with equivalent from string.h
Change-Id: If8d460189c57f9c02923019e95bf47db1d96c716
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salprn.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index b63d65874fa3..7b2b1ccf698b 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -492,7 +492,7 @@ SalInstance* CreateSalInstance() // determine the windows version aSalShlData.mbWXP = 0; - rtl_zeroMemory( &aSalShlData.maVersionInfo, sizeof(aSalShlData.maVersionInfo) ); + memset( &aSalShlData.maVersionInfo, 0, sizeof(aSalShlData.maVersionInfo) ); aSalShlData.maVersionInfo.dwOSVersionInfoSize = sizeof( aSalShlData.maVersionInfo ); if ( GetVersionEx( &aSalShlData.maVersionInfo ) ) { diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index 70be7f405a9c..5f7e191e720d 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -1071,9 +1071,9 @@ static HDC ImplCreateSalPrnIC( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetup return 0; sal_Unicode pDriverName[ 4096 ]; sal_Unicode pDeviceName[ 4096 ]; - rtl_copyMemory( pDriverName, pPrinter->maDriverName.getStr(), pPrinter->maDriverName.getLength()*sizeof(sal_Unicode)); + memcpy( pDriverName, pPrinter->maDriverName.getStr(), pPrinter->maDriverName.getLength()*sizeof(sal_Unicode)); memset( pDriverName+pPrinter->maDriverName.getLength(), 0, 32 ); - rtl_copyMemory( pDeviceName, pPrinter->maDeviceName.getStr(), pPrinter->maDeviceName.getLength()*sizeof(sal_Unicode)); + memcpy( pDeviceName, pPrinter->maDeviceName.getStr(), pPrinter->maDeviceName.getLength()*sizeof(sal_Unicode)); memset( pDeviceName+pPrinter->maDeviceName.getLength(), 0, 32 ); hDC = ImplCreateICW_WithCatch( reinterpret_cast< LPWSTR >(pDriverName), reinterpret_cast< LPCWSTR >(pDeviceName), @@ -1557,8 +1557,8 @@ sal_Bool WinSalPrinter::StartJob( const rtl::OUString* pFileName, // #95347 some buggy drivers (eg, OKI) write to those buffers in CreateDC, although declared const - so provide some space sal_Unicode aDrvBuf[4096]; sal_Unicode aDevBuf[4096]; - rtl_copyMemory( aDrvBuf, mpInfoPrinter->maDriverName.getStr(), (mpInfoPrinter->maDriverName.getLength()+1)*sizeof(sal_Unicode)); - rtl_copyMemory( aDevBuf, mpInfoPrinter->maDeviceName.getStr(), (mpInfoPrinter->maDeviceName.getLength()+1)*sizeof(sal_Unicode)); + memcpy( aDrvBuf, mpInfoPrinter->maDriverName.getStr(), (mpInfoPrinter->maDriverName.getLength()+1)*sizeof(sal_Unicode)); + memcpy( aDevBuf, mpInfoPrinter->maDeviceName.getStr(), (mpInfoPrinter->maDeviceName.getLength()+1)*sizeof(sal_Unicode)); hDC = CreateDCW( reinterpret_cast<LPCWSTR>(aDrvBuf), reinterpret_cast<LPCWSTR>(aDevBuf), NULL, |