connectivity/source/commontools/ConnectionWrapper.cxx | 3 ++-
connectivity/source/commontools/FValue.cxx | 3 ++-
connectivity/source/commontools/TConnection.cxx | 3 ++-
connectivity/source/drivers/ado/AColumn.cxx | 2 +-
connectivity/source/drivers/ado/AConnection.cxx | 2 +-
connectivity/source/drivers/ado/AGroup.cxx | 2 +-
connectivity/source/drivers/ado/AIndex.cxx | 2 +-
connectivity/source/drivers/ado/AKey.cxx | 2 +-
connectivity/source/drivers/ado/ATable.cxx | 2 +-
connectivity/source/drivers/ado/AUser.cxx | 2 +-
connectivity/source/drivers/ado/AView.cxx | 2 +-
connectivity/source/drivers/calc/CTable.cxx | 2 +-
connectivity/source/drivers/dbase/DIndex.cxx | 2 +-
connectivity/source/drivers/dbase/DTable.cxx | 2 +-
connectivity/source/drivers/file/FConnection.cxx | 2 +-
connectivity/source/drivers/file/FResultSet.cxx | 2 +-
connectivity/source/drivers/file/FTable.cxx | 2 +-
connectivity/source/drivers/flat/ETable.cxx | 2 +-
connectivity/source/drivers/hsqldb/HTable.cxx | 3 ++-
connectivity/source/drivers/jdbc/InputStream.cxx | 2 +-
connectivity/source/drivers/jdbc/tools.cxx | 5 +++--
connectivity/source/drivers/mysql/YTable.cxx | 3 ++-
connectivity/source/sdbcx/VDescriptor.cxx | 3 ++-
svtools/inc/svtools/slidesorterbaropt.hxx | 13 ++++++++++++-
svtools/source/config/slidesorterbaropt.cxx | 13 ++++++++++++-
25 files changed, 55 insertions(+), 26 deletions(-)
New commits:
commit 50f6c281d2527a162ecde67f953031bf7c48f0d1
Author: Arnaud Versini <arnaud.vers...@gmail.com>
Date: Tue Aug 7 20:45:12 2012 +0200
Use the correct licence header
Change-Id: Ieef62aaf240a133d70222e8d0c0bc5032d97d945
diff --git a/svtools/inc/svtools/slidesorterbaropt.hxx
b/svtools/inc/svtools/slidesorterbaropt.hxx
index 29e2b80..c2ef705 100644
--- a/svtools/inc/svtools/slidesorterbaropt.hxx
+++ b/svtools/inc/svtools/slidesorterbaropt.hxx
@@ -1,11 +1,22 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
- * Copyright 2012 LibreOffice contributors.
+ * This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef INCLUDED_SVTOOLS_SLIDESORTERBAROPT_HXX
#define INCLUDED_SVTOOLS_SLIDESORTERBAROPT_HXX
diff --git a/svtools/source/config/slidesorterbaropt.cxx
b/svtools/source/config/slidesorterbaropt.cxx
index 0d84ef7..3938ff9 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -1,11 +1,22 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
- * Copyright 2012 LibreOffice contributors.
+ * This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include <svtools/slidesorterbaropt.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
commit 4d210ad17d305be17145a396963fa567617b3178
Author: Arnaud Versini <arnaud.vers...@gmail.com>
Date: Sun Aug 5 19:01:37 2012 +0200
Replace usage of rtl/memory.h in connectivity with equivalent from string.h
Change-Id: I0284aedfd831e8af001534c5ce8a39c3a11214fa
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx
b/connectivity/source/commontools/ConnectionWrapper.cxx
index 2e902e9..79df786 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/reflection/XProxyFactory.hpp>
#include <rtl/digest.h>
#include <algorithm>
+#include <string.h>
using namespace connectivity;
//------------------------------------------------------------------------------
@@ -153,7 +154,7 @@ Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( )
throw (::com::sun::st
// com::sun::star::lang::XUnoTunnel
sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8
>& rId ) throw(RuntimeException)
{
- if (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ if (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
return reinterpret_cast< sal_Int64 >( this );
if(m_xUnoTunnel.is())
diff --git a/connectivity/source/commontools/FValue.cxx
b/connectivity/source/commontools/FValue.cxx
index 6333af4..5100cc0 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -18,6 +18,7 @@
*/
+#include <string.h>
#include <stdio.h>
#include "connectivity/FValue.hxx"
#include "connectivity/CommonTools.hxx"
@@ -1648,7 +1649,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
{
const sal_uInt32 nOldLength = aSeq.getLength();
aSeq.realloc( nOldLength + nRead );
- rtl_copyMemory( aSeq.getArray() + nOldLength,
aReadSeq.getConstArray(), aReadSeq.getLength() );
+ memcpy( aSeq.getArray() + nOldLength,
aReadSeq.getConstArray(), aReadSeq.getLength() );
}
}
while( nBytesToRead == nRead );
diff --git a/connectivity/source/commontools/TConnection.cxx
b/connectivity/source/commontools/TConnection.cxx
index 5b8d5f8..d8b5747 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <string.h>
#include "TConnection.hxx"
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/types.hxx>
@@ -57,7 +58,7 @@ void OMetaConnection::disposing()
//XUnoTunnel
sal_Int64 SAL_CALL OMetaConnection::getSomething( const
::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw
(::com::sun::star::uno::RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: (sal_Int64)0;
}
diff --git a/connectivity/source/drivers/ado/AColumn.cxx
b/connectivity/source/drivers/ado/AColumn.cxx
index 2dda53f..c377b04 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -98,7 +98,7 @@ Sequence< sal_Int8 >
OAdoColumn::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OColumn_ADO::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AConnection.cxx
b/connectivity/source/drivers/ado/AConnection.cxx
index 145b08d..f893bca 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -503,7 +503,7 @@ void OConnection::disposing()
//
-----------------------------------------------------------------------------
sal_Int64 SAL_CALL OConnection::getSomething( const
::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw
(::com::sun::star::uno::RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
?
reinterpret_cast< sal_Int64 >( this )
:
diff --git a/connectivity/source/drivers/ado/AGroup.cxx
b/connectivity/source/drivers/ado/AGroup.cxx
index 98d1217..a7192db 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -102,7 +102,7 @@ Sequence< sal_Int8 >
OAdoGroup::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OGroup_ADO::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AIndex.cxx
b/connectivity/source/drivers/ado/AIndex.cxx
index b6d4090..1255085 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -92,7 +92,7 @@ Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OIndex_ADO::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AKey.cxx
b/connectivity/source/drivers/ado/AKey.cxx
index 0e82f71..00dfd00 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -86,7 +86,7 @@ Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OKey_ADO::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/ATable.cxx
b/connectivity/source/drivers/ado/ATable.cxx
index e57b8b9..f2ae573 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -144,7 +144,7 @@ Sequence< sal_Int8 >
OAdoTable::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OTable_TYPEDEF::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AUser.cxx
b/connectivity/source/drivers/ado/AUser.cxx
index 193e979..61d77af 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -85,7 +85,7 @@ Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OUser_TYPEDEF::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AView.cxx
b/connectivity/source/drivers/ado/AView.cxx
index ce39dc3..814fca8 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -60,7 +60,7 @@ Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OView_ADO::getSomething(rId);
}
diff --git a/connectivity/source/drivers/calc/CTable.cxx
b/connectivity/source/drivers/calc/CTable.cxx
index 5fa9a0c..3d0f2cb 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -725,7 +725,7 @@ Sequence< sal_Int8 >
OCalcTable::getUnoTunnelImplementationId()
sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "ocke.jans...@sun.com",
"OCalcTable::getSomething" );
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OCalcTable_BASE::getSomething(rId);
}
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx
b/connectivity/source/drivers/dbase/DIndex.cxx
index 7285bb0..ecf3cfa 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -120,7 +120,7 @@ Sequence< sal_Int8 >
ODbaseIndex::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: ODbaseIndex_BASE::getSomething(rId);
}
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index d051f3f..9bd6c0e 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -777,7 +777,7 @@ Sequence< sal_Int8 >
ODbaseTable::getUnoTunnelImplementationId()
sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "ocke.jans...@sun.com",
"ODbaseTable::getSomething" );
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: ODbaseTable_BASE::getSomething(rId);
}
diff --git a/connectivity/source/drivers/file/FConnection.cxx
b/connectivity/source/drivers/file/FConnection.cxx
index 39c58a2..4aa2cff 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -409,7 +409,7 @@ Reference< XDynamicResultSet > OConnection::getDir() const
//
-----------------------------------------------------------------------------
sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId
) throw (RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: (sal_Int64)0;
}
diff --git a/connectivity/source/drivers/file/FResultSet.cxx
b/connectivity/source/drivers/file/FResultSet.cxx
index e52fc18..7dfe8e4 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1620,7 +1620,7 @@ Sequence< sal_Int8 >
OResultSet::getUnoTunnelImplementationId()
sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "ocke.jans...@sun.com",
"OResultSet::getSomething" );
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: 0;
}
diff --git a/connectivity/source/drivers/file/FTable.cxx
b/connectivity/source/drivers/file/FTable.cxx
index 6f37d0c..d947c25 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -161,7 +161,7 @@ Sequence< sal_Int8 >
OFileTable::getUnoTunnelImplementationId()
sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "ocke.jans...@sun.com",
"OFileTable::getSomething" );
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OTable_TYPEDEF::getSomething(rId);
}
diff --git a/connectivity/source/drivers/flat/ETable.cxx
b/connectivity/source/drivers/flat/ETable.cxx
index d1ca1ce..4d9a603 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -584,7 +584,7 @@ Sequence< sal_Int8 >
OFlatTable::getUnoTunnelImplementationId()
sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "ocke.jans...@sun.com",
"OFlatTable::getSomething" );
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OFlatTable_BASE::getSomething(rId);
}
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx
b/connectivity/source/drivers/hsqldb/HTable.cxx
index 8083d3f..1c41acc 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <string.h>
#include "hsqldb/HTable.hxx"
#include "hsqldb/HTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
@@ -144,7 +145,7 @@ Sequence< sal_Int8 >
OHSQLTable::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OTable_TYPEDEF::getSomething(rId);
}
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx
b/connectivity/source/drivers/jdbc/InputStream.cxx
index 971b5ea..5332c06 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -91,7 +91,7 @@ sal_Int32 SAL_CALL java_io_InputStream::readBytes(
::com::sun::star::uno::Sequen
{
jboolean p = sal_False;
aData.realloc ( out );
-
rtl_copyMemory(aData.getArray(),t.pEnv->GetByteArrayElements(pByteArray,&p),out);
+
memcpy(aData.getArray(),t.pEnv->GetByteArrayElements(pByteArray,&p),out);
}
t.pEnv->DeleteLocalRef((jbyteArray)pByteArray);
} //t.pEnv
diff --git a/connectivity/source/drivers/jdbc/tools.cxx
b/connectivity/source/drivers/jdbc/tools.cxx
index 73ba9e0..ee4cac4 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -18,6 +18,7 @@
*/
+#include <string.h>
#include <cstdarg>
#include "java/tools.hxx"
#include "java/lang/String.hxx"
@@ -229,7 +230,7 @@ jobject connectivity::createByteInputStream(const
::com::sun::star::uno::Referen
Sequence< sal_Int8 > aData;
x->readBytes(aData,length);
jboolean p = sal_False;
-
rtl_copyMemory(t.pEnv->GetByteArrayElements(pByteArray,&p),aData.getArray(),aData.getLength());
+
memcpy(t.pEnv->GetByteArrayElements(pByteArray,&p),aData.getArray(),aData.getLength());
jobject out = t.pEnv->NewObject( clazz, mID,pByteArray);
t.pEnv->DeleteLocalRef((jbyteArray)pByteArray);
return out;
@@ -256,7 +257,7 @@ jobject connectivity::createCharArrayReader(const
::com::sun::star::uno::Referen
Sequence< sal_Int8 > aData;
x->readBytes(aData,length);
jboolean p = sal_False;
-
rtl_copyMemory(t.pEnv->GetCharArrayElements(pCharArray,&p),aData.getArray(),aData.getLength());
+
memcpy(t.pEnv->GetCharArrayElements(pCharArray,&p),aData.getArray(),aData.getLength());
jobject out = t.pEnv->NewObject( clazz, mID,pCharArray);
t.pEnv->DeleteLocalRef((jcharArray)pCharArray);
return out;
diff --git a/connectivity/source/drivers/mysql/YTable.cxx
b/connectivity/source/drivers/mysql/YTable.cxx
index 79e23ac..b0704c0 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <string.h>
#include "mysql/YTable.hxx"
#include "mysql/YTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
@@ -163,7 +164,7 @@ Sequence< sal_Int8 >
OMySQLTable::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw
(RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: OTable_TYPEDEF::getSomething(rId);
}
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx
b/connectivity/source/sdbcx/VDescriptor.cxx
index 686850b..9993dd6 100644
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
@@ -22,6 +22,7 @@
#include <functional>
#include <algorithm>
+#include <string.h>
namespace connectivity
{
@@ -46,7 +47,7 @@ namespace connectivity
// com::sun::star::lang::XUnoTunnel
sal_Int64 SAL_CALL ODescriptor::getSomething( const Sequence< sal_Int8
>& rId ) throw(RuntimeException)
{
- return (rId.getLength() == 16 && 0 ==
rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),
rId.getConstArray(), 16 ) )
+ return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
? reinterpret_cast< sal_Int64 >( this )
: 0;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
