diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2012-09-29 14:47:11 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-01 18:48:05 +0000 |
| commit | 36a2db3722b79ed3df075d7f3fa77fb761bcf5a4 (patch) | |
| tree | 838cdec72aeea68c3ad78f8d18535afd5408d43a /tools | |
| parent | 053b68a0c7b75eae7d86d4465f65abc6046515ee (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 'tools')
| -rw-r--r-- | tools/source/generic/config.cxx | 2 | ||||
| -rw-r--r-- | tools/source/inet/inetstrm.cxx | 5 | ||||
| -rw-r--r-- | tools/source/string/tustring.cxx | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index d2852cf5f737..30709499733f 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -116,7 +116,7 @@ static sal_uInt8* ImplSysReadConfig( const rtl::OUString& rFileName, if (nRead > 2 && memcmp(pBuf, BOM, 3) == 0) { nRead -= 3; - rtl_moveMemory(pBuf, pBuf + 3, sal::static_int_cast<sal_Size>(nRead * sizeof(sal_uInt8)) ); + memmove(pBuf, pBuf + 3, sal::static_int_cast<sal_Size>(nRead * sizeof(sal_uInt8)) ); rbIsUTF8BOM = sal_True; } diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index 19db6ee5a76a..7392f50b6647 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -19,7 +19,6 @@ #include <comphelper/string.hxx> #include <sal/types.h> -#include <rtl/memory.h> #include <rtl/strbuf.hxx> #include <tools/cachestr.hxx> #include <tools/inetmsg.hxx> @@ -1284,7 +1283,7 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize) aDelim.append(pMsg->GetMultipartBoundary()); aDelim.append(RTL_CONSTASCII_STRINGPARAM("\r\n")); - rtl_copyMemory(pData, aDelim.getStr(), + memcpy(pData, aDelim.getStr(), aDelim.getLength()); return aDelim.getLength(); } @@ -1303,7 +1302,7 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize) aDelim.append(pMsg->GetMultipartBoundary()); aDelim.append(RTL_CONSTASCII_STRINGPARAM("--\r\n")); - rtl_copyMemory (pData, aDelim.getStr(), + memcpy (pData, aDelim.getStr(), aDelim.getLength()); return aDelim.getLength(); } diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index 58217be7c270..0893e4afb256 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -23,7 +23,6 @@ #include <osl/interlck.h> #include <rtl/alloc.h> -#include <rtl/memory.h> #include <rtl/tencinfo.h> #include <rtl/instance.hxx> #include <tools/string.hxx> |