Replace usage of rtl/memory.h in comphelper with equivalent from string.h

Change-Id: I41d452aa4892606d127e9565cf83c21f78a67392

3 files changed, 10 insertions, 8 deletions

diff --git a/comphelper/inc/comphelper/servicehelper.hxx b/comphelper/inc/comphelper/servicehelper.hxx
index 3cdffa93165a..a861e88db2d7 100644
--- a/comphelper/inc/comphelper/servicehelper.hxx
+++ b/comphelper/inc/comphelper/servicehelper.hxx
@@ -78,7 +78,7 @@ classname* classname::getImplementation( const uno::Reference< uno::XInterface >
 UNO3_GETIMPLEMENTATION_BASE_IMPL(classname)\
 sal_Int64 SAL_CALL classname::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(), \
+    if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), \
                                                          rId.getConstArray(), 16 ) ) \
     { \
         return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); \
@@ -90,7 +90,7 @@ sal_Int64 SAL_CALL classname::getSomething( const ::com::sun::star::uno::Sequenc
 UNO3_GETIMPLEMENTATION_BASE_IMPL(classname)\
 sal_Int64 SAL_CALL classname::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(), \
+    if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), \
                                                          rId.getConstArray(), 16 ) ) \
     { \
         return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); \
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index dab11af702a7..f70fa5498cc9 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -23,6 +23,7 @@
 #include <cppuhelper/typeprovider.hxx>
 
 #include <set>
+#include <string.h>
 
 //.........................................................................
 namespace comphelper
@@ -113,7 +114,7 @@ namespace comphelper
         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/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 0c65d72d0781..3e349a7ef9d8 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -25,6 +25,7 @@
 #include <osl/time.h>
 #include <rtl/digest.h>
 #include <rtl/random.h>
+#include <string.h>
 
 using ::rtl::OUString;
 using ::com::sun::star::uno::Sequence;
@@ -269,10 +270,10 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
     if ( !aPassword.isEmpty() && aDocId.getLength() == 16 )
     {
         sal_uInt16 pPassData[16];
-        rtl_zeroMemory( pPassData, sizeof(pPassData) );
+        memset( pPassData, 0, sizeof(pPassData) );
 
         sal_Int32 nPassLen = ::std::min< sal_Int32 >( aPassword.getLength(), 15 );
-        rtl_copyMemory( pPassData, aPassword.getStr(), nPassLen * sizeof(pPassData[0]) );
+        memcpy( pPassData, aPassword.getStr(), nPassLen * sizeof(pPassData[0]) );
 
         aResultKey = GenerateStd97Key( pPassData, aDocId );
     }
@@ -287,7 +288,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
     if ( pPassData[0] && aDocId.getLength() == 16 )
     {
         sal_uInt8 pKeyData[64];
-        rtl_zeroMemory( pKeyData, sizeof(pKeyData) );
+        memset( pKeyData, 0, sizeof(pKeyData) );
 
         sal_Int32 nInd = 0;
 
@@ -317,7 +318,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
 
         // Update digest with padding.
         pKeyData[16] = 0x80;
-        rtl_zeroMemory( pKeyData + 17, sizeof(pKeyData) - 17 );
+        memset( pKeyData + 17, 0, sizeof(pKeyData) - 17 );
         pKeyData[56] = 0x80;
         pKeyData[57] = 0x0a;
 
@@ -328,7 +329,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
         rtl_digest_rawMD5 ( hDigest, (sal_uInt8*)aResultKey.getArray(), aResultKey.getLength() );
 
         // Erase KeyData array and leave.
-        rtl_zeroMemory( pKeyData, sizeof(pKeyData) );
+        memset( pKeyData, 0, sizeof(pKeyData) );
     }
 
     return aResultKey;