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>
---
 basic/source/basmgr/basmgr.cxx  | 2 +-
 basic/source/runtime/iosys.cxx  | 5 +++--
 basic/source/uno/scriptcont.cxx | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'basic')

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 7f5c691da472..3bd3a52438b2 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -2009,7 +2009,7 @@ uno::Sequence< sal_Int8 > implGetDialogData( SbxObject* pDialog )
     uno::Sequence< sal_Int8 > aData( nLen );
     sal_Int8* pDestData = aData.getArray();
     const sal_Int8* pSrcData = (const sal_Int8*)aMemStream.GetData();
-    rtl_copyMemory( pDestData, pSrcData, nLen );
+    memcpy( pDestData, pSrcData, nLen );
     return aData;
 }
 
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 7f2753ad8b61..d03b8a67d58d 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <string.h>
 #include <vcl/dialog.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/button.hxx>
@@ -435,14 +436,14 @@ sal_uIntPtr UCBStream::GetData( void* pData, sal_uIntPtr nSize )
         {
             Sequence<sal_Int8> aData;
             nSize = xIS->readBytes( aData, nSize );
-            rtl_copyMemory( pData, aData.getConstArray(), nSize );
+            memcpy( pData, aData.getConstArray(), nSize );
             return nSize;
         }
         else if( xS.is() && (xISFromS = xS->getInputStream()).is() )
         {
             Sequence<sal_Int8> aData;
             nSize = xISFromS->readBytes( aData, nSize );
-            rtl_copyMemory( pData, aData.getConstArray(), nSize );
+            memcpy(pData, aData.getConstArray(), nSize );
             return nSize;
         }
         else
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index cdd4b9ef6b56..393dc7771238 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -639,7 +639,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                     sal_Int32 nSize = (sal_Int32)aMemStream.Tell();
                     Sequence< sal_Int8 > aBinSeq( nSize );
                     sal_Int8* pData = aBinSeq.getArray();
-                    ::rtl_copyMemory( pData, aMemStream.GetData(), nSize );
+                    memcpy( pData, aMemStream.GetData(), nSize );
 
                        Reference< XOutputStream > xOut = xCodeStream->getOutputStream();
                     if ( !xOut.is() )
@@ -775,7 +775,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                         sal_Int32 nSize = (sal_Int32)aMemStream.Tell();
                         Sequence< sal_Int8 > aBinSeq( nSize );
                         sal_Int8* pData = aBinSeq.getArray();
-                        ::rtl_copyMemory( pData, aMemStream.GetData(), nSize );
+                        memcpy( pData, aMemStream.GetData(), nSize );
 
                         Reference< XOutputStream > xOut = xCodeStream->getOutputStream();
                         if ( xOut.is() )
-- 
cgit