From ab9b38a4064141705aa3a3de9a5d73b465ad3af3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 5 Jul 2017 13:27:30 +0200 Subject: use more begin()/end() for Sequence Change-Id: I399be6b6ef7a6ce01e883569a177c0969bc29c69 --- reportdesign/source/core/api/ReportDefinition.cxx | 3 +-- reportdesign/source/ui/inspection/GeometryHandler.cxx | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index ecdc92676273..1124d6881d83 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1954,8 +1954,7 @@ void SAL_CALL OReportDefinition::setMimeType( const OUString& _mimetype ) ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); uno::Sequence< OUString > aList = getAvailableMimeTypes(); - const OUString* pEnd = aList.getConstArray()+aList.getLength(); - if ( ::std::find(aList.getConstArray(),pEnd,_mimetype) == pEnd ) + if ( ::std::find(aList.begin(), aList.end(), _mimetype) == aList.end() ) throwIllegallArgumentException("getAvailableMimeTypes()" ,*this ,1); diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 6df01d2c2927..73a162b74f0e 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -189,13 +189,11 @@ template T lcl_round(T value) bool GeometryHandler::impl_isDataField(const OUString& _sName) const { - const OUString* pEnd = m_aFieldNames.getConstArray() + m_aFieldNames.getLength(); - bool bIsField = ( ::std::find( m_aFieldNames.getConstArray(), pEnd, _sName ) != pEnd ); + bool bIsField = ( ::std::find( m_aFieldNames.begin(), m_aFieldNames.end(), _sName ) != m_aFieldNames.end() ); if ( !bIsField ) { - pEnd = m_aParamNames.getConstArray() + m_aParamNames.getLength(); - bIsField = ( ::std::find( m_aParamNames.getConstArray(), pEnd, _sName ) != pEnd ); + bIsField = ( ::std::find( m_aParamNames.begin(), m_aParamNames.end(), _sName ) != m_aParamNames.end() ); } return bIsField; } -- cgit