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

Change-Id: Ie4747a424bb688263dd578905b44c849e3cac08d

8 files changed, 18 insertions, 13 deletions

diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index cf60e26616eb..a086a141cbb5 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -27,10 +27,10 @@
  ************************************************************************/
 
 
+#include <string.h>
 #include <vector>
 #include <osl/mutex.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <rtl/memory.h>
 #include <comphelper/servicehelper.hxx>
 
 #include <xmloff/attrlist.hxx>
@@ -276,7 +276,7 @@ SvXMLAttributeList* SvXMLAttributeList::getImplementation( uno::Reference< uno::
 sal_Int64 SAL_CALL SvXMLAttributeList::getSomething( const uno::Sequence< sal_Int8 >& rId )
     throw( 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_uIntPtr>(this));
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index b29473b6ace6..da578111421c 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -26,9 +26,9 @@
  *
  ************************************************************************/
 
+#include <string.h>
 #include <com/sun/star/xml/AttributeData.hpp>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/memory.h>
 #include <comphelper/servicehelper.hxx>
 #include <limits.h>
 
@@ -119,7 +119,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::get
 
 sal_Int64 SAL_CALL SvUnoAttributeContainer::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_uIntPtr>(this));
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index cbf9ef374356..e3bdf9f83c03 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -26,6 +26,8 @@
  *
  ************************************************************************/
 
+#include <string.h>
+
 #include "sal/config.h"
 
 #include <officecfg/Office/Common.hxx>
@@ -2093,7 +2095,7 @@ SvXMLExport* SvXMLExport::getImplementation( uno::Reference< uno::XInterface > x
 sal_Int64 SAL_CALL SvXMLExport::getSomething( const uno::Sequence< sal_Int8 >& rId )
     throw( 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_uIntPtr>(this));
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index e4a55d115f5c..93c49f1463d4 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -26,11 +26,12 @@
  *
  ************************************************************************/
 
+#include <string.h>
+
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/mutex.hxx>
-#include <rtl/memory.h>
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
@@ -419,7 +420,7 @@ const uno::Sequence< sal_Int8 > & SvXMLImport::getUnoTunnelId() throw()
 sal_Int64 SAL_CALL SvXMLImport::getSomething( const uno::Sequence< sal_Int8 >& rId )
     throw( 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_uIntPtr>(this));
diff --git a/xmloff/source/style/StyleMap.cxx b/xmloff/source/style/StyleMap.cxx
index 7964da386c19..b4c50511a777 100644
--- a/xmloff/source/style/StyleMap.cxx
+++ b/xmloff/source/style/StyleMap.cxx
@@ -26,8 +26,9 @@
  *
  ************************************************************************/
 
+#include <string.h>
+
 #include <osl/mutex.hxx>
-#include <rtl/memory.h>
 #include <comphelper/servicehelper.hxx>
 
 #include "StyleMap.hxx"
@@ -74,7 +75,7 @@ sal_Int64 SAL_CALL StyleMap::getSomething(
     throw( RuntimeException )
 {
     if( rId.getLength() == 16 &&
-        0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+        0 == memcmp( getUnoTunnelId().getConstArray(),
                                              rId.getConstArray(), 16 ) )
     {
         return reinterpret_cast<sal_Int64>( this );
diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index 9b4919aa6864..424f241d6a6d 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -26,9 +26,10 @@
  *
  ************************************************************************/
 
+#include <string.h>
+
 #include <osl/mutex.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <rtl/memory.h>
 #include <xmloff/attrlist.hxx>
 #include <comphelper/servicehelper.hxx>
 #include "MutableAttrList.hxx"
@@ -89,7 +90,7 @@ sal_Int64 SAL_CALL XMLMutableAttributeList::getSomething(
     throw( RuntimeException )
 {
     if( rId.getLength() == 16 &&
-        0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+        0 == memcmp( getUnoTunnelId().getConstArray(),
                                 rId.getConstArray(), 16 ) )
     {
         return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this));
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 35824f820522..07e6185e9441 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -2033,7 +2033,7 @@ sal_Int64 SAL_CALL OOo2OasisTransformer::getSomething( const Sequence< sal_Int8
     throw(RuntimeException)
 {
     if( rId.getLength() == 16
-        && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+        && 0 == memcmp( getUnoTunnelId().getConstArray(),
                                         rId.getConstArray(), 16 ) )
     {
         return reinterpret_cast< sal_Int64 >( this );
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 0f12574653b7..ccafd0562f0b 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -2018,7 +2018,7 @@ sal_Int64 SAL_CALL Oasis2OOoTransformer::getSomething( const Sequence< sal_Int8
     throw(RuntimeException)
 {
     if( rId.getLength() == 16
-        && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+        && 0 == memcmp( getUnoTunnelId().getConstArray(),
                                         rId.getConstArray(), 16 ) )
     {
         return reinterpret_cast< sal_Int64 >( this );