summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorArnaud Versini <arnaud.versini@gmail.com>2012-09-29 14:47:11 +0200
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-10-01 18:48:05 +0000
commit36a2db3722b79ed3df075d7f3fa77fb761bcf5a4 (patch)
tree838cdec72aeea68c3ad78f8d18535afd5408d43a /forms
parent053b68a0c7b75eae7d86d4465f65abc6046515ee (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 'forms')
-rw-r--r--forms/source/component/Columns.cxx5
-rw-r--r--forms/source/component/imgprod.cxx2
-rw-r--r--forms/source/richtext/richtextmodel.cxx2
3 files changed, 5 insertions, 4 deletions
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 7f8b95877eae..77372ae6d20c 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+#include <string.h>
+
#include "Columns.hxx"
#include "property.hrc"
#include "property.hxx"
@@ -49,7 +51,6 @@
#include "services.hxx"
#include "frm_resource.hrc"
#include <tools/debug.hxx>
-#include <rtl/memory.h>
//.........................................................................
namespace frm
@@ -138,7 +139,7 @@ sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence<sal_Int8>& _rIdenti
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/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index be2843044899..49e539bc4012 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -90,7 +90,7 @@ ImgProdLockBytes::ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun
{
const sal_uInt32 nOldLength = maSeq.getLength();
maSeq.realloc( nOldLength + nRead );
- rtl_copyMemory( maSeq.getArray() + nOldLength, aReadSeq.getConstArray(), aReadSeq.getLength() );
+ memcpy( maSeq.getArray() + nOldLength, aReadSeq.getConstArray(), aReadSeq.getLength() );
}
}
while( nBytesToRead == nRead );
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 141b2f0df325..33aba9509c65 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -589,7 +589,7 @@ namespace frm
{
Sequence< sal_Int8 > aEditEngineAccessId( getEditEngineTunnelId() );
if ( ( _rId.getLength() == aEditEngineAccessId.getLength() )
- && ( 0 == rtl_compareMemory( aEditEngineAccessId.getConstArray(), _rId.getConstArray(), _rId.getLength() ) )
+ && ( 0 == memcmp( aEditEngineAccessId.getConstArray(), _rId.getConstArray(), _rId.getLength() ) )
)
return reinterpret_cast< sal_Int64 >( m_pEngine.get() );