sw/inc/unobaseclass.hxx | 2 +-
sw/source/core/unocore/TextCursorHelper.cxx | 2 +-
sw/source/core/unocore/unochart.cxx | 2 +-
sw/source/core/unocore/unodraw.cxx | 2 +-
sw/source/core/unocore/unofield.cxx | 4 ++--
sw/source/core/unocore/unoframe.cxx | 2 +-
sw/source/core/unocore/unoport.cxx | 2 +-
sw/source/core/unocore/unoportenum.cxx | 2 +-
sw/source/core/unocore/unosett.cxx | 4 ++--
sw/source/core/unocore/unosrch.cxx | 2 +-
sw/source/core/unocore/unostyle.cxx | 2 +-
sw/source/core/unocore/unotbl.cxx | 6 +++---
sw/source/filter/xml/xmlexp.cxx | 2 +-
sw/source/filter/xml/xmlimp.cxx | 2 +-
sw/source/ui/dochdl/swdtflvr.cxx | 2 +-
sw/source/ui/uno/unoatxt.cxx | 4 ++--
sw/source/ui/uno/unodispatch.cxx | 2 +-
sw/source/ui/uno/unotxdoc.cxx | 4 ++--
sw/source/ui/uno/unotxvw.cxx | 2 +-
19 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit df9b0d2e930eb1f60e429301e5386f742a1676ff
Author: Arnaud Versini <arnaud.vers...@gmail.com>
Date: Sat Jul 28 17:56:59 2012 +0200
Use memcmp insteadof rtl_compareMemory in sw
Change-Id: Ie3a95f628387756d2fa941707bd5e224b41b5720
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 94cbf57..74caccc 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -146,7 +146,7 @@ namespace sw {
C *const pThis)
{
if ((rId.getLength() == 16) &&
- (0 == rtl_compareMemory(C::getUnoTunnelId().getConstArray(),
+ (0 == memcmp(C::getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16)))
{
return ::sal::static_int_cast< sal_Int64 >(
diff --git a/sw/source/core/unocore/TextCursorHelper.cxx
b/sw/source/core/unocore/TextCursorHelper.cxx
index 009773f..daed15e 100644
--- a/sw/source/core/unocore/TextCursorHelper.cxx
+++ b/sw/source/core/unocore/TextCursorHelper.cxx
@@ -49,7 +49,7 @@ sal_Int64 SAL_CALL OTextCursorHelper::getSomething(
throw(uno::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_IntPtr >(this) );
diff --git a/sw/source/core/unocore/unochart.cxx
b/sw/source/core/unocore/unochart.cxx
index 732d94a..3602a4b 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2042,7 +2042,7 @@ sal_Int64 SAL_CALL SwChartDataSequence::getSomething(
const uno::Sequence< sal_I
throw(uno::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_IntPtr
>(this) );
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 267f6f2..43546dd 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -895,7 +895,7 @@ sal_Int64 SAL_CALL SwXShape::getSomething( const
uno::Sequence< sal_Int8 >& rId
throw(uno::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_IntPtr
>(this) );
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index aa29873..d06f6a7 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -410,7 +410,7 @@ sal_Int64 SAL_CALL SwXFieldMaster::getSomething( const
uno::Sequence< sal_Int8 >
throw(uno::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_IntPtr
>(this) );
@@ -1088,7 +1088,7 @@ sal_Int64 SAL_CALL SwXTextField::getSomething( const
uno::Sequence< sal_Int8 >&
throw(uno::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_IntPtr
>(this) );
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index 6b9c92a..fe3ead6 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -723,7 +723,7 @@ sal_Int64 SAL_CALL SwXFrame::getSomething( const ::
uno::Sequence< sal_Int8 >& r
throw(uno::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_IntPtr
>(this) );
diff --git a/sw/source/core/unocore/unoport.cxx
b/sw/source/core/unocore/unoport.cxx
index 3388114..275a7df 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -901,7 +901,7 @@ sal_Int64 SwXTextPortion::getSomething( const
uno::Sequence< sal_Int8 >& rId )
throw(uno::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_IntPtr
>(this) );
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index 5bbe006..a0246fb 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -217,7 +217,7 @@ sal_Int64 SAL_CALL SwXTextPortionEnumeration::getSomething(
throw(uno::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_IntPtr
>( this ) );
diff --git a/sw/source/core/unocore/unosett.cxx
b/sw/source/core/unocore/unosett.cxx
index 27e9d7a..6cf173a 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1142,7 +1142,7 @@ const uno::Sequence< sal_Int8 > &
SwXNumberingRules::getUnoTunnelId()
sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > &
rId ) throw(uno::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_IntPtr
>(this) );
@@ -2669,7 +2669,7 @@ sal_Int64 SAL_CALL SwXTextColumns::getSomething( const
uno::Sequence< sal_Int8 >
throw(uno::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_IntPtr
>(this) );
diff --git a/sw/source/core/unocore/unosrch.cxx
b/sw/source/core/unocore/unosrch.cxx
index 5af5aa6..05b5239 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -510,7 +510,7 @@ sal_Int64 SAL_CALL SwXTextSearch::getSomething( const
uno::Sequence< sal_Int8 >&
throw(uno::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_IntPtr
>(this) );
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 26b9009..447159c 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1184,7 +1184,7 @@ sal_Int64 SAL_CALL SwXStyle::getSomething( const
uno::Sequence< sal_Int8 >& rId
throw(uno::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_IntPtr
>(this) );
diff --git a/sw/source/core/unocore/unotbl.cxx
b/sw/source/core/unocore/unotbl.cxx
index a49db0d..798fe4f 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -795,7 +795,7 @@ sal_Int64 SAL_CALL SwXCell::getSomething( const
uno::Sequence< sal_Int8 >& rId )
throw(uno::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_IntPtr
>(this) );
@@ -2123,7 +2123,7 @@ sal_Int64 SAL_CALL SwXTextTable::getSomething( const
uno::Sequence< sal_Int8 >&
throw(uno::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_IntPtr
>(this) );
@@ -3603,7 +3603,7 @@ sal_Int64 SAL_CALL SwXCellRange::getSomething( const
uno::Sequence< sal_Int8 >&
throw(uno::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_IntPtr
>(this) );
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index e816579..5fa7521 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -822,7 +822,7 @@ sal_Int64 SAL_CALL SwXMLExport::getSomething( const
Sequence< sal_Int8 >& rId )
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_IntPtr
>(this) );
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index d20f738..d5a101d 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -504,7 +504,7 @@ sal_Int64 SAL_CALL SwXMLImport::getSomething( const
Sequence< sal_Int8 >& rId )
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_IntPtr
>(this) );
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 70c27f2..3c3c499 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -3425,7 +3425,7 @@ sal_Int64 SwTransferable::getSomething( const Sequence<
sal_Int8 >& rId ) throw(
{
sal_Int64 nRet;
if( ( rId.getLength() == 16 ) &&
- ( 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) ) )
+ ( 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(),
16 ) ) )
{
nRet = sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr
>( this ) );
}
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index bf213bf..2089a79 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -260,7 +260,7 @@ sal_Int64 SAL_CALL SwXAutoTextGroup::getSomething( const
uno::Sequence< sal_Int8
throw(uno::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_IntPtr >( this ));
@@ -755,7 +755,7 @@ sal_Int64 SAL_CALL SwXAutoTextEntry::getSomething( const
uno::Sequence< sal_Int8
throw(uno::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_IntPtr >( this ));
diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx
index f6486b8..b45c3f5 100644
--- a/sw/source/ui/uno/unodispatch.cxx
+++ b/sw/source/ui/uno/unodispatch.cxx
@@ -173,7 +173,7 @@ sal_Int64 SwXDispatchProviderInterceptor::getSomething(
throw(uno::RuntimeException)
{
if( aIdentifier.getLength() == 16
- && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+ && 0 == memcmp( getUnoTunnelId().getConstArray(),
aIdentifier.getConstArray(), 16 ) )
{
return sal::static_int_cast< sal_Int64 >( reinterpret_cast<
sal_IntPtr >( this ));
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 09b5bec..67883c8 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -246,13 +246,13 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const
Sequence< sal_Int8 >& rI
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_IntPtr >( this ));
}
if( rId.getLength() == 16
- && 0 == rtl_compareMemory(
SfxObjectShell::getUnoTunnelId().getConstArray(),
+ && 0 == memcmp( SfxObjectShell::getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
{
return
sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell ));
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index da2da34..37e54af 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1905,7 +1905,7 @@ sal_Int64 SAL_CALL SwXTextViewCursor::getSomething(
throw(uno::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_IntPtr >( this ));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
