diff options
author | Arnaud Versini <arnaud.versini@gmail.com> | 2012-09-29 14:47:11 +0200 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-01 18:48:05 +0000 |
commit | 36a2db3722b79ed3df075d7f3fa77fb761bcf5a4 (patch) | |
tree | 838cdec72aeea68c3ad78f8d18535afd5408d43a /svx/source | |
parent | 053b68a0c7b75eae7d86d4465f65abc6046515ee (diff) |
Replace usage of rtl_*Memory with equivalent from string.h
Change-Id: I50ffc10f007f03c3252ef0196b59b881429cc159
Reviewed-on: https://gerrit.libreoffice.org/734
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 2 | ||||
-rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unopage.cxx | 1 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 1 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap3.cxx | 1 | ||||
-rw-r--r-- | svx/source/unodraw/unoshape.cxx | 3 |
8 files changed, 6 insertions, 10 deletions
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 7ef5c90e1a43..05b37d488aac 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -944,7 +944,7 @@ sal_Int64 SAL_CALL { sal_Int64 nReturn( 0 ); - if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) + if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( getUnoTunnelImplementationId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) nReturn = reinterpret_cast< sal_Int64 >( this ); return( nReturn ); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 2c14e44a0fcd..c37687a9fe8d 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -735,7 +735,7 @@ SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumb nSquares = nLines * nLines; pPixel = new sal_uInt16[ nSquares ]; - rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16)); + memset(pPixel, 0, nSquares * sizeof(sal_uInt16)); } // Destructor dealocating the dynamic array @@ -852,7 +852,7 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp ) void SvxPixelCtl::Reset() { // clear pixel area - rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16)); + memset(pPixel, 0, nSquares * sizeof(sal_uInt16)); Invalidate(); } diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index c5a1abca40b2..ad73e3bf060f 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1210,7 +1210,7 @@ sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIden sal_Int64 nReturn(0); if ( (_rIdentifier.getLength() == 16) - && (0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 )) + && (0 == memcmp( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 )) ) { nReturn = reinterpret_cast<sal_Int64>(this); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index a015f6cce669..d24fd2653e9e 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -4681,7 +4681,7 @@ sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rId sal_Int64 nReturn(0); if ( (_rIdentifier.getLength() == 16) - && (0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), _rIdentifier.getConstArray(), 16 )) + && (0 == memcmp( getUnoTunnelId().getConstArray(), _rIdentifier.getConstArray(), 16 )) ) { nReturn = reinterpret_cast<sal_Int64>(this); diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index fb7a95b10789..22a284129947 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -33,7 +33,6 @@ #include <sot/clsids.hxx> #include <comphelper/serviceinfohelper.hxx> -#include <rtl/memory.h> #include <sfx2/objsh.hxx> #include <svx/svdpool.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 93f8e18f32a4..04da106169a1 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -45,7 +45,6 @@ #include <boost/scoped_ptr.hpp> #include <svx/svdpool.hxx> -#include <rtl/memory.h> #include <editeng/unoprnms.hxx> #include <svx/unoshape.hxx> diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index bab97e794a84..895674de2f69 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -36,7 +36,6 @@ #include <comphelper/servicehelper.hxx> #include <comphelper/serviceinfohelper.hxx> -#include <rtl/memory.h> #include <svx/svdpool.hxx> #include <svx/unoshape.hxx> #include <svx/unopage.hxx> diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 13398726d1c7..2875ad6f6fd0 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -44,7 +44,6 @@ #include <comphelper/servicehelper.hxx> #include <comphelper/serviceinfohelper.hxx> #include <toolkit/unohlp.hxx> -#include <rtl/memory.h> #include <vcl/gfxlink.hxx> #include <vcl/virdev.hxx> #include <sfx2/objsh.hxx> @@ -341,7 +340,7 @@ SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& //---------------------------------------------------------------------- sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException) \ { - if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) + if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this)); } |