From 36a2db3722b79ed3df075d7f3fa77fb761bcf5a4 Mon Sep 17 00:00:00 2001
From: Arnaud Versini <arnaud.versini@gmail.com>
Date: Sat, 29 Sep 2012 14:47:11 +0200
Subject: 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>
---
 sdext/source/pdfimport/filterdet.cxx           | 2 +-
 sdext/source/pdfimport/pdfparse/pdfentries.cxx | 3 +--
 sdext/source/pdfimport/pdfparse/pdfparse.cxx   | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'sdext/source')

diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index 52a855d00620..39dccaad9c7a 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -590,7 +590,7 @@ bool checkDocChecksum( const rtl::OUString& rInPDFFileURL,
     rtl_digest_destroyMD5( aActualDigest );
 
     // compare the contents
-    bRet = (0 == rtl_compareMemory( nActualChecksum, nTestChecksum, sizeof( nActualChecksum ) ));
+    bRet = (0 == memcmp( nActualChecksum, nTestChecksum, sizeof( nActualChecksum ) ));
 #if OSL_DEBUG_LEVEL > 1
     OSL_TRACE( "test checksum: " );
     for( unsigned int i = 0; i < sizeof(nTestChecksum); i++ )
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 9a7855492685..10bb30d827dd 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -35,7 +35,6 @@
 #include <rtl/alloc.h>
 #include <rtl/digest.h>
 #include <rtl/cipher.h>
-#include <rtl/memory.h>
 #ifdef SYSTEM_ZLIB
 #include "zlib.h"
 #else
@@ -728,7 +727,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const
         // get the compressed length
         *pBytes = m_pStream->getDictLength( pObjectContainer );
         if( pStream != *ppStream )
-            rtl_moveMemory( *ppStream, pStream, *pBytes );
+            memmove( *ppStream, pStream, *pBytes );
         if( rContext.m_bDecrypt )
         {
             EmitImplData* pEData = getEmitData( rContext );
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 21c195de48ff..75ee3eeb305a 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -44,7 +44,6 @@
 #include <string.h>
 
 #include <rtl/strbuf.hxx>
-#include <rtl/memory.h>
 #include <rtl/alloc.h>
 
 // disable warnings again because someone along the line has enabled them
-- 
cgit