connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx | 4 + connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx | 4 + connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx | 1 connectivity/source/drivers/mysqlc/mysqlc_statement.cxx | 5 + connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx | 28 ---------- 5 files changed, 10 insertions(+), 32 deletions(-)
New commits: commit 23508cdec13c856b09bad0ed45ddbab454d05799 Author: Mike Kaganski <[email protected]> AuthorDate: Sun Dec 7 18:49:33 2025 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sun Dec 7 16:59:10 2025 +0100 Drop connectivity::mysqlc::concatSequences; use the one from comphelper Change-Id: I01382b8c418e88339066bd343c964f6c828baf22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195186 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx index 6fd5d67823d5..a3a10fad8f7c 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx @@ -27,6 +27,8 @@ #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/FetchDirection.hpp> #include <com/sun/star/sdbcx/CompareBookmark.hpp> + +#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <sal/log.hxx> @@ -218,7 +220,7 @@ uno::Sequence<Type> SAL_CALL OPreparedResultSet::getTypes() cppu::UnoType<XFastPropertySet>::get(), cppu::UnoType<XPropertySet>::get()); - return concatSequences(aTypes.getTypes(), OPreparedResultSet_BASE::getTypes()); + return comphelper::concatSequences(aTypes.getTypes(), OPreparedResultSet_BASE::getTypes()); } sal_Int32 SAL_CALL OPreparedResultSet::findColumn(const OUString& columnName) diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx index 6af532a92d91..baa230b2d325 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx @@ -23,6 +23,7 @@ #include "mysqlc_propertyids.hxx" #include "mysqlc_resultsetmetadata.hxx" +#include <comphelper/sequence.hxx> #include <o3tl/safeint.hxx> #include <sal/log.hxx> @@ -87,7 +88,8 @@ Any SAL_CALL OPreparedStatement::queryInterface(const Type& rType) Sequence<Type> SAL_CALL OPreparedStatement::getTypes() { - return concatSequences(OPreparedStatement_BASE::getTypes(), OCommonStatement::getTypes()); + return comphelper::concatSequences(OPreparedStatement_BASE::getTypes(), + OCommonStatement::getTypes()); } Reference<XResultSetMetaData> SAL_CALL OPreparedStatement::getMetaData() diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx index ac07b862dc9f..525bcd90e207 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx @@ -30,6 +30,7 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/seqstream.hxx> +#include <comphelper/sequence.hxx> #include <o3tl/safeint.hxx> #include <o3tl/string_view.hxx> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx index 1b1a496071fc..b51e1cb949df 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx @@ -26,6 +26,7 @@ #include "mysqlc_statement.hxx" #include "mysqlc_general.hxx" +#include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/supportsservice.hxx> @@ -80,12 +81,12 @@ Sequence<Type> SAL_CALL OCommonStatement::getTypes() cppu::UnoType<XFastPropertySet>::get(), cppu::UnoType<XPropertySet>::get()); - return concatSequences(aTypes.getTypes(), OCommonStatement_IBase::getTypes()); + return comphelper::concatSequences(aTypes.getTypes(), OCommonStatement_IBase::getTypes()); } Sequence<Type> SAL_CALL OStatement::getTypes() { - return concatSequences(OStatement_BASE::getTypes(), OCommonStatement::getTypes()); + return comphelper::concatSequences(OStatement_BASE::getTypes(), OCommonStatement::getTypes()); } void SAL_CALL OCommonStatement::cancel() diff --git a/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx b/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx index 87978b03bd2f..1240c1fb49b6 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx @@ -96,34 +96,6 @@ template <class TYPE>::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper<TYP } return s_pProps; } - -namespace internal -{ -template <class T> void implCopySequence(const T* _pSource, T*& _pDest, sal_Int32 _nSourceLen) -{ - for (sal_Int32 i = 0; i < _nSourceLen; ++i, ++_pSource, ++_pDest) - *_pDest = *_pSource; -} -} - -/// concat two sequences -template <class T> -css::uno::Sequence<T> concatSequences(const css::uno::Sequence<T>& _rLeft, - const css::uno::Sequence<T>& _rRight) -{ - sal_Int32 nLeft(_rLeft.getLength()), nRight(_rRight.getLength()); - const T* pLeft = _rLeft.getConstArray(); - const T* pRight = _rRight.getConstArray(); - - sal_Int32 nReturnLen(nLeft + nRight); - css::uno::Sequence<T> aReturn(nReturnLen); - T* pReturn = aReturn.getArray(); - - internal::implCopySequence(pLeft, pReturn, nLeft); - internal::implCopySequence(pRight, pReturn, nRight); - - return aReturn; -} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
