canvas/source/directx/dx_surfacebitmap.cxx | 14 +++++++------- sal/inc/osl/file.hxx | 4 ++-- sc/source/filter/qpro/qprostyle.cxx | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-)
New commits: commit 3396c06c55ad5d5345aabfcf7efc674aaaa7f9a6 Author: Christophe JAILLET <[email protected]> Date: Tue Jul 10 22:00:22 2012 +0200 Use rtl_zeroMemory in place of rtl_fillMemory(..., 0) Change-Id: Idd83f6340d13a1d7111d0d5a7268f1aa8bf5c09e diff --git a/canvas/source/directx/dx_surfacebitmap.cxx b/canvas/source/directx/dx_surfacebitmap.cxx index d0ca06d..413c17e 100644 --- a/canvas/source/directx/dx_surfacebitmap.cxx +++ b/canvas/source/directx/dx_surfacebitmap.cxx @@ -83,7 +83,7 @@ namespace dxcanvas sal_uInt8* DXColorBuffer::lock() const { #if DIRECTX_VERSION < 0x0900 - rtl_fillMemory((void *)&aSurfaceDesc,sizeof(DDSURFACEDESC),0); + rtl_zeroMemory((void *)&aSurfaceDesc,sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY; if(SUCCEEDED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL))) @@ -344,7 +344,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_fillMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC),0); + rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY; @@ -468,7 +468,7 @@ namespace dxcanvas { #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_fillMemory( &aSurfaceDesc,sizeof(DDSURFACEDESC),0 ); + rtl_zeroMemory( &aSurfaceDesc,sizeof(DDSURFACEDESC) ); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); if( FAILED(mpSurface->Lock( NULL, @@ -541,7 +541,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_fillMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC),0); + rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY; @@ -623,7 +623,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_fillMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC),0); + rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_WRITEONLY; @@ -703,7 +703,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_fillMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC),0); + rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_WRITEONLY; @@ -761,7 +761,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_fillMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC),0); + rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY; diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx index 16f7a06..e93682d 100644 --- a/sal/inc/osl/file.hxx +++ b/sal/inc/osl/file.hxx @@ -444,7 +444,7 @@ public: VolumeInfo( sal_uInt32 nMask ): _nMask( nMask ) { _aInfo.uStructSize = sizeof( oslVolumeInfo ); - rtl_fillMemory( &_aInfo.uValidFields, sizeof( oslVolumeInfo ) - sizeof( sal_uInt32 ), 0 ); + rtl_zeroMemory( &_aInfo.uValidFields, sizeof( oslVolumeInfo ) - sizeof( sal_uInt32 ) ); _aInfo.pDeviceHandle = &_aDevice._aHandle; } @@ -692,7 +692,7 @@ public: FileStatus( sal_uInt32 nMask ): _nMask( nMask ) { _aStatus.uStructSize = sizeof( oslFileStatus ); - rtl_fillMemory( &_aStatus.uValidFields, sizeof( oslFileStatus ) - sizeof( sal_uInt32 ), 0 ); + rtl_zeroMemory( &_aStatus.uValidFields, sizeof( oslFileStatus ) - sizeof( sal_uInt32 ) ); } /** Destructor. diff --git a/sc/source/filter/qpro/qprostyle.cxx b/sc/source/filter/qpro/qprostyle.cxx index f3556d6..9284bb2 100644 --- a/sc/source/filter/qpro/qprostyle.cxx +++ b/sc/source/filter/qpro/qprostyle.cxx @@ -55,10 +55,10 @@ ScQProStyle::ScQProStyle() { - rtl_fillMemory (maAlign, sizeof (maAlign), 0); - rtl_fillMemory (maFont, sizeof (maFont), 0); - rtl_fillMemory (maFontRecord, sizeof (maFontRecord), 0); - rtl_fillMemory (maFontHeight, sizeof (maFontHeight), 0); + rtl_zeroMemory (maAlign, sizeof (maAlign)); + rtl_zeroMemory (maFont, sizeof (maFont)); + rtl_zeroMemory (maFontRecord, sizeof (maFontRecord)); + rtl_zeroMemory (maFontHeight, sizeof (maFontHeight)); } void ScQProStyle::SetFormat( ScDocument *pDoc, sal_uInt8 nCol, sal_uInt16 nRow, SCTAB nTab, sal_uInt16 nStyle ) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
