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>
---
 lotuswordpro/source/filter/xfilter/xfbase64.cxx     | 5 +++--
 lotuswordpro/source/filter/xfilter/xfcolor.cxx      | 5 +++--
 lotuswordpro/source/filter/xfilter/xfdate.cxx       | 3 ++-
 lotuswordpro/source/filter/xfilter/xflineheight.hxx | 4 +++-
 lotuswordpro/source/filter/xfilter/xfutil.hxx       | 1 -
 5 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'lotuswordpro/source')

diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.cxx b/lotuswordpro/source/filter/xfilter/xfbase64.cxx
index 0e0e433de1bf..5ce056d483e8 100644
--- a/lotuswordpro/source/filter/xfilter/xfbase64.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbase64.cxx
@@ -57,7 +57,8 @@
  * @file
  * Base64 tool.
  ************************************************************************/
-#include    "xfbase64.hxx"
+#include <string.h>
+#include "xfbase64.hxx"
 
 const  sal_Char aBase64EncodeTable[] =
 { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
@@ -105,7 +106,7 @@ rtl::OUString XFBase64::Encode(sal_uInt8 *buf, sal_Int32 len)
         nNeeded = (cycles+1)*4;
     buffer = new sal_Char[nNeeded+1];
 
-    rtl_zeroMemory(buffer,nNeeded+1);
+    memset(buffer, 0, nNeeded+1);
 
     for( sal_Int32 i=0; i<cycles; i++ )
         Encode_(buf+i*3,buffer+i*4);
diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.cxx b/lotuswordpro/source/filter/xfilter/xfcolor.cxx
index c2e66be99448..09d505865dd8 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolor.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolor.cxx
@@ -57,14 +57,15 @@
  * @file
  * Color object to serial to xml filter.
  ************************************************************************/
+#include <string.h>
 #include <stdio.h>
-#include    "xfcolor.hxx"
+#include "xfcolor.hxx"
 
 rtl::OUString XFColor::ToString() const
 {
     char    buf[8];
 
-    rtl_zeroMemory(buf,8);
+    memset(buf, 0, 8);
     sprintf(buf,"#%2x%2x%2x",m_nRed, m_nGreen, m_nBlue);
     for( int i=1; i<7;i++ )
     {
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.cxx b/lotuswordpro/source/filter/xfilter/xfdate.cxx
index 2935392cb2dc..c5025086e64b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdate.cxx
@@ -57,12 +57,13 @@
  * @file
  * Date field with date style.
  ************************************************************************/
+#include <string.h>
 #include    "xfdate.hxx"
 
 XFDate::XFDate()
 {
     m_bFixed = 0;
-    rtl_zeroMemory(&m_aDateTime,sizeof(m_aDateTime));
+    memset(&m_aDateTime, 0, sizeof(m_aDateTime));
     m_bValued = sal_False;
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xflineheight.hxx b/lotuswordpro/source/filter/xfilter/xflineheight.hxx
index 838dbd1a84d3..9573fe31443f 100644
--- a/lotuswordpro/source/filter/xfilter/xflineheight.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflineheight.hxx
@@ -60,6 +60,8 @@
 #ifndef     _XFLINEHEIGHT_HXX
 #define     _XFLINEHEIGHT_HXX
 
+#include <string.h>
+
 class XFLineHeight
 {
 public:
@@ -117,7 +119,7 @@ inline void XFLineHeight::SetSpace(double value)
 inline void XFLineHeight::Reset()
 {
     m_eType = enumLHNone;
-    rtl_zeroMemory(&m_Value,sizeof(m_Value));
+    memset(&m_Value, 0, sizeof(m_Value));
 }
 
 inline enumLHType XFLineHeight::GetType()
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/source/filter/xfilter/xfutil.hxx
index df49ff4c1797..1cf756193d2a 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.hxx
@@ -63,7 +63,6 @@
 
 #include    "xfdefs.hxx"
 #include    <rtl/ustring.hxx>
-#include    <rtl/memory.h>
 #include    <string>
 
 
-- 
cgit