reportdesign/source/core/api/FormattedField.cxx | 4 reportdesign/source/core/api/Functions.cxx | 2 reportdesign/source/core/api/Groups.cxx | 2 reportdesign/source/core/api/ReportDefinition.cxx | 10 +- reportdesign/source/core/sdr/PropertyForward.cxx | 10 +- reportdesign/source/core/sdr/RptPage.cxx | 4 reportdesign/source/core/sdr/UndoEnv.cxx | 2 reportdesign/source/filter/xml/xmlExport.cxx | 32 +++--- reportdesign/source/filter/xml/xmlTable.cxx | 16 +-- reportdesign/source/ui/dlg/GroupsSorting.cxx | 16 +-- reportdesign/source/ui/inspection/GeometryHandler.cxx | 6 - reportdesign/source/ui/misc/RptUndo.cxx | 4 reportdesign/source/ui/misc/toolboxcontroller.cxx | 2 reportdesign/source/ui/report/DesignView.cxx | 2 reportdesign/source/ui/report/ReportController.cxx | 14 +-- reportdesign/source/ui/report/ReportSection.cxx | 4 reportdesign/source/ui/report/ViewsWindow.cxx | 84 +++++++++--------- 17 files changed, 107 insertions(+), 107 deletions(-)
New commits: commit 02fb3fd0533222dfea5b6b9232425a5e28cd340f Author: Julien Nabet <serval2...@yahoo.fr> Date: Mon Mar 28 22:27:52 2016 +0200 Use const_iterator when possible (reportdesign) Change-Id: I2695fdf64670f4df844c1362a84af83f48fc29be Reviewed-on: https://gerrit.libreoffice.org/23575 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 04e078d..da050bd 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -220,8 +220,8 @@ uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone( ) thr if ( xSet.is() ) { - ::std::vector< uno::Reference< report::XFormatCondition> >::iterator aIter = m_aProps.m_aFormatConditions.begin(); - ::std::vector< uno::Reference< report::XFormatCondition> >::iterator aEnd = m_aProps.m_aFormatConditions.end(); + ::std::vector< uno::Reference< report::XFormatCondition> >::const_iterator aIter = m_aProps.m_aFormatConditions.begin(); + ::std::vector< uno::Reference< report::XFormatCondition> >::const_iterator aEnd = m_aProps.m_aFormatConditions.end(); for (sal_Int32 i = 0; aIter != aEnd; ++aIter,++i) { uno::Reference< report::XFormatCondition > xCond = xSet->createFormatCondition(); diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index e436e39..e46f5b5 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -142,7 +142,7 @@ uno::Any SAL_CALL OFunctions::getByIndex( ::sal_Int32 Index ) throw (lang::Index { ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); - TFunctions::iterator aPos = m_aFunctions.begin(); + TFunctions::const_iterator aPos = m_aFunctions.begin(); ::std::advance(aPos,Index); return uno::makeAny(*aPos); } diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index 65308e5..8cc220d 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -143,7 +143,7 @@ uno::Any SAL_CALL OGroups::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOut { ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); - TGroups::iterator aPos = m_aGroups.begin(); + TGroups::const_iterator aPos = m_aGroups.begin(); ::std::advance(aPos,Index); return uno::makeAny(*aPos); } diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 1cbc191..4babedf 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1098,7 +1098,7 @@ void SAL_CALL OReportDefinition::close( sal_Bool _bDeliverOwnership ) throw (uti ::std::vector< uno::Reference< frame::XController> > aCopy = m_pImpl->m_aControllers; ::std::vector< uno::Reference< frame::XController> >::iterator aIter = aCopy.begin(); - ::std::vector< uno::Reference< frame::XController> >::iterator aEnd = aCopy.end(); + ::std::vector< uno::Reference< frame::XController> >::const_iterator aEnd = aCopy.end(); for (;aIter != aEnd ; ++aIter) { if ( aIter->is() ) @@ -1915,8 +1915,8 @@ uno::Reference< container::XIndexAccess > SAL_CALL OReportDefinition::getViewDat { m_pImpl->m_xViewData.set( document::IndexedPropertyValues::create(m_aProps->m_xContext), uno::UNO_QUERY); uno::Reference< container::XIndexContainer > xContainer(m_pImpl->m_xViewData,uno::UNO_QUERY); - ::std::vector< uno::Reference< frame::XController> >::iterator aIter = m_pImpl->m_aControllers.begin(); - ::std::vector< uno::Reference< frame::XController> >::iterator aEnd = m_pImpl->m_aControllers.end(); + ::std::vector< uno::Reference< frame::XController> >::const_iterator aIter = m_pImpl->m_aControllers.begin(); + ::std::vector< uno::Reference< frame::XController> >::const_iterator aEnd = m_pImpl->m_aControllers.end(); for (;aIter != aEnd ; ++aIter) { if ( aIter->is() ) @@ -2384,7 +2384,7 @@ uno::Any SAL_CALL OStylesHelper::getByIndex( sal_Int32 Index ) throw(lang::Index uno::Any SAL_CALL OStylesHelper::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); - TStyleElements::iterator aFind = m_aElements.find(aName); + TStyleElements::const_iterator aFind = m_aElements.find(aName); if ( aFind == m_aElements.end() ) throw container::NoSuchElementException(); return aFind->second; @@ -2425,7 +2425,7 @@ void SAL_CALL OStylesHelper::insertByName( const OUString& aName, const uno::Any void SAL_CALL OStylesHelper::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); - TStyleElements::iterator aFind = m_aElements.find(aName); + TStyleElements::const_iterator aFind = m_aElements.find(aName); if ( aFind != m_aElements.end() ) throw container::NoSuchElementException(); m_aElementsPos.erase(::std::find(m_aElementsPos.begin(),m_aElementsPos.end(),aFind)); diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 0b6e558..05db20f 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -53,8 +53,8 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource if ( _bReverse ) { ::comphelper::copyProperties(m_xDest,m_xSource); - TPropertyNamePair::iterator aIter = m_aNameMap.begin(); - TPropertyNamePair::iterator aEnd = m_aNameMap.end(); + TPropertyNamePair::const_iterator aIter = m_aNameMap.begin(); + TPropertyNamePair::const_iterator aEnd = m_aNameMap.end(); for (; aIter != aEnd; ++aIter) { Property aProp = m_xSourceInfo->getPropertyByName(aIter->first); @@ -69,8 +69,8 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource else { ::comphelper::copyProperties(m_xSource,m_xDest); - TPropertyNamePair::iterator aIter = m_aNameMap.begin(); - TPropertyNamePair::iterator aEnd = m_aNameMap.end(); + TPropertyNamePair::const_iterator aIter = m_aNameMap.begin(); + TPropertyNamePair::const_iterator aEnd = m_aNameMap.end(); for (; aIter != aEnd; ++aIter) _xDest->setPropertyValue(aIter->second.first,aIter->second.second->operator()(aIter->second.first,_xSource->getPropertyValue(aIter->first))); } @@ -108,7 +108,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt xProp->setPropertyValue(evt.PropertyName,evt.NewValue); else { - TPropertyNamePair::iterator aFind = m_aNameMap.find(evt.PropertyName); + TPropertyNamePair::const_iterator aFind = m_aNameMap.find(evt.PropertyName); OUString sPropName; if ( aFind != m_aNameMap.end() ) sPropName = aFind->second.first; diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index fef2864..6a101ed 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -166,8 +166,8 @@ void OReportPage::removeTempObject(SdrObject *_pToRemoveObj) void OReportPage::resetSpecialMode() { const bool bChanged = rModel.IsChanged(); - ::std::vector<SdrObject*>::iterator aIter = m_aTemporaryObjectList.begin(); - ::std::vector<SdrObject*>::iterator aEnd = m_aTemporaryObjectList.end(); + ::std::vector<SdrObject*>::const_iterator aIter = m_aTemporaryObjectList.begin(); + ::std::vector<SdrObject*>::const_iterator aEnd = m_aTemporaryObjectList.end(); for (; aIter != aEnd; ++aIter) { diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index c2ad558..be672a7 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -245,7 +245,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv // now we have access to the cached info about the set // let's see what we know about the property ObjectInfo& rObjectInfo = objectPos->second; - PropertiesInfo::iterator aPropertyPos = rObjectInfo.aProperties.find( _rEvent.PropertyName ); + PropertiesInfo::const_iterator aPropertyPos = rObjectInfo.aProperties.find( _rEvent.PropertyName ); if ( aPropertyPos == rObjectInfo.aProperties.end() ) { // nothing 'til now ... have to change this .... // the attributes diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 29432d7..59bdd04 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -179,17 +179,17 @@ namespace rptxml void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid) { ORptExport::TSectionsGrid::iterator aSectionIter = _rGrid.begin(); - ORptExport::TSectionsGrid::iterator aSectionEnd = _rGrid.end(); + ORptExport::TSectionsGrid::const_iterator aSectionEnd = _rGrid.end(); for (;aSectionIter != aSectionEnd ; ++aSectionIter) { ORptExport::TGrid::iterator aRowIter = aSectionIter->second.begin(); - ORptExport::TGrid::iterator aRowEnd = aSectionIter->second.end(); + ORptExport::TGrid::const_iterator aRowEnd = aSectionIter->second.end(); for (; aRowIter != aRowEnd; ++aRowIter) { if ( aRowIter->first ) { - ::std::vector< ORptExport::TCell >::iterator aColIter = aRowIter->second.begin(); - ::std::vector< ORptExport::TCell >::iterator aColEnd = aRowIter->second.end(); + ::std::vector< ORptExport::TCell >::const_iterator aColIter = aRowIter->second.begin(); + ::std::vector< ORptExport::TCell >::const_iterator aColEnd = aRowIter->second.end(); for (; aColIter != aColEnd; ++aColIter) { if ( aColIter->nRowSpan > 1 ) @@ -737,13 +737,13 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader void ORptExport::exportTableColumns(const Reference< XSection>& _xSection) { SvXMLElementExport aColumns(*this,XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, true, true); - TGridStyleMap::iterator aColFind = m_aColumnStyleNames.find(_xSection.get()); + TGridStyleMap::const_iterator aColFind = m_aColumnStyleNames.find(_xSection.get()); OSL_ENSURE(aColFind != m_aColumnStyleNames.end(),"ORptExport::exportTableColumns: Section not found in m_aColumnStyleNames!"); if ( aColFind == m_aColumnStyleNames.end() ) return; - TStringVec::iterator aColIter = aColFind->second.begin(); - TStringVec::iterator aColEnd = aColFind->second.end(); + TStringVec::const_iterator aColIter = aColFind->second.begin(); + TStringVec::const_iterator aColEnd = aColFind->second.end(); for (; aColIter != aColEnd; ++aColIter) { AddAttribute( m_sTableStyle,*aColIter ); @@ -757,16 +757,16 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) exportTableColumns(_xSection); - TSectionsGrid::iterator aFind = m_aSectionsGrid.find(_xSection.get()); + TSectionsGrid::const_iterator aFind = m_aSectionsGrid.find(_xSection.get()); OSL_ENSURE(aFind != m_aSectionsGrid.end(),"ORptExport::exportContainer: Section not found in grid!"); if ( aFind == m_aSectionsGrid.end() ) return; - TGrid::iterator aRowIter = aFind->second.begin(); - TGrid::iterator aRowEnd = aFind->second.end(); + TGrid::const_iterator aRowIter = aFind->second.begin(); + TGrid::const_iterator aRowEnd = aFind->second.end(); sal_Int32 nEmptyCellColSpan = 0; - TGridStyleMap::iterator aRowFind = m_aRowStyleNames.find(_xSection.get()); - TStringVec::iterator aHeightIter = aRowFind->second.begin(); + TGridStyleMap::const_iterator aRowFind = m_aRowStyleNames.find(_xSection.get()); + TStringVec::const_iterator aHeightIter = aRowFind->second.begin(); OSL_ENSURE(aRowFind->second.size() == aFind->second.size(),"Different count for rows"); bool bShapeHandled = false; @@ -777,8 +777,8 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) SvXMLElementExport aRow(*this,XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true); if ( aRowIter->first ) { - ::std::vector< TCell >::iterator aColIter = aRowIter->second.begin(); - ::std::vector< TCell >::iterator aColEnd = aRowIter->second.end(); + ::std::vector< TCell >::const_iterator aColIter = aRowIter->second.begin(); + ::std::vector< TCell >::const_iterator aColEnd = aRowIter->second.end(); nEmptyCellColSpan = 0; for (; aColIter != aColEnd; ++aColIter) { @@ -1016,7 +1016,7 @@ bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OU void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const OUString& _sName) { Reference<XPropertySet> xFind(_xProp); - TPropertyStyleMap::iterator aFind = m_aAutoStyleNames.find(xFind); + TPropertyStyleMap::const_iterator aFind = m_aAutoStyleNames.find(xFind); if ( aFind != m_aAutoStyleNames.end() ) { _rAtt.AddAttribute( _sName, @@ -1068,7 +1068,7 @@ void ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDefinit } OUString sFormula("rpt:HASCHANGED(\""); - TGroupFunctionMap::iterator aGroupFind = m_aGroupFunctionMap.find(xGroup); + TGroupFunctionMap::const_iterator aGroupFind = m_aGroupFunctionMap.find(xGroup); if ( aGroupFind != m_aGroupFunctionMap.end() ) sExpression = aGroupFind->second->getName(); sFormula += sExpression; diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index f3ef9ad..f211e01 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -179,8 +179,8 @@ void OXMLTable::EndElement() } } // set height - ::std::vector<sal_Int32>::iterator aIter = m_aHeight.begin(); - ::std::vector<sal_Int32>::iterator aEnd = m_aHeight.end(); + ::std::vector<sal_Int32>::const_iterator aIter = m_aHeight.begin(); + ::std::vector<sal_Int32>::const_iterator aEnd = m_aHeight.end(); sal_Int32 nHeight = 0; for (; aIter != aEnd; ++aIter) nHeight += *aIter; @@ -189,19 +189,19 @@ void OXMLTable::EndElement() sal_Int32 nLeftMargin = rptui::getStyleProperty<sal_Int32>(m_xSection->getReportDefinition(),PROPERTY_LEFTMARGIN); sal_Int32 nPosY = 0; ::std::vector< ::std::vector<TCell> >::iterator aRowIter = m_aGrid.begin(); - ::std::vector< ::std::vector<TCell> >::iterator aRowEnd = m_aGrid.end(); + ::std::vector< ::std::vector<TCell> >::const_iterator aRowEnd = m_aGrid.end(); for (sal_Int32 i = 0; aRowIter != aRowEnd; ++aRowIter,++i) { sal_Int32 nPosX = nLeftMargin; ::std::vector<TCell>::iterator aColIter = (*aRowIter).begin(); - ::std::vector<TCell>::iterator aColEnd = (*aRowIter).end(); + ::std::vector<TCell>::const_iterator aColEnd = (*aRowIter).end(); for (sal_Int32 j = 0; aColIter != aColEnd; ++aColIter,++j) { TCell& rCell = *aColIter; if ( !rCell.xElements.empty()) { - ::std::vector< uno::Reference< report::XReportComponent> >::iterator aCellIter = rCell.xElements.begin(); - const ::std::vector< uno::Reference< report::XReportComponent> >::iterator aCellEnd = rCell.xElements.end(); + ::std::vector< uno::Reference< report::XReportComponent> >::const_iterator aCellIter = rCell.xElements.begin(); + const ::std::vector< uno::Reference< report::XReportComponent> >::const_iterator aCellEnd = rCell.xElements.end(); for (;aCellIter != aCellEnd ; ++aCellIter) { uno::Reference<report::XShape> xShape(*aCellIter,uno::UNO_QUERY); @@ -215,7 +215,7 @@ void OXMLTable::EndElement() sal_Int32 nColSpan = rCell.nColSpan; if ( nColSpan > 1 ) { - ::std::vector<TCell>::iterator aWidthIter = aColIter + 1; + ::std::vector<TCell>::const_iterator aWidthIter = aColIter + 1; while ( nColSpan > 1 ) { nWidth += (aWidthIter++)->nWidth; @@ -226,7 +226,7 @@ void OXMLTable::EndElement() sal_Int32 nRowSpan = rCell.nRowSpan; if ( nRowSpan > 1 ) { - ::std::vector< ::std::vector<TCell> >::iterator aHeightIter = aRowIter + 1; + ::std::vector< ::std::vector<TCell> >::const_iterator aHeightIter = aRowIter + 1; while( nRowSpan > 1) { nHeight += (*aHeightIter)[j].nHeight; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 990277a..37b608b 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -458,7 +458,7 @@ bool OFieldExpressionControl::SaveModified(bool _bAppendRow) // find position where to insert the new group sal_Int32 nGroupPos = 0; ::std::vector<sal_Int32>::iterator aIter = m_aGroupPositions.begin(); - ::std::vector<sal_Int32>::iterator aEnd = m_aGroupPositions.begin() + nRow; + ::std::vector<sal_Int32>::const_iterator aEnd = m_aGroupPositions.begin() + nRow; for(;aIter != aEnd;++aIter) if ( *aIter != NO_GROUP ) nGroupPos = *aIter + 1; @@ -651,7 +651,7 @@ void SAL_CALL OFieldExpressionControl::elementInserted(const container::Containe else *aFind = nGroupPos; - ::std::vector<sal_Int32>::iterator aEnd = m_aGroupPositions.end(); + ::std::vector<sal_Int32>::const_iterator aEnd = m_aGroupPositions.end(); for(++aFind;aFind != aEnd;++aFind) if ( *aFind != NO_GROUP ) ++*aFind; @@ -673,10 +673,10 @@ void SAL_CALL OFieldExpressionControl::elementRemoved(const container::Container if ( evt.Accessor >>= nGroupPos ) { ::std::vector<sal_Int32>::iterator aFind = ::std::find(m_aGroupPositions.begin(),m_aGroupPositions.end(),nGroupPos); - if ( aFind != m_aGroupPositions.end() ) + ::std::vector<sal_Int32>::const_iterator aEnd = m_aGroupPositions.end(); + if (aFind != aEnd) { *aFind = NO_GROUP; - ::std::vector<sal_Int32>::iterator aEnd = m_aGroupPositions.end(); for(++aFind;aFind != aEnd;++aFind) if ( *aFind != NO_GROUP ) --*aFind; @@ -797,10 +797,10 @@ void OFieldExpressionControl::DeleteRows() m_pParent->m_pController->executeChecked(SID_GROUP_REMOVE,aArgs); ::std::vector<sal_Int32>::iterator aFind = ::std::find(m_aGroupPositions.begin(),m_aGroupPositions.end(),nGroupPos); - if (aFind != m_aGroupPositions.end()) + ::std::vector<sal_Int32>::const_iterator aEnd = m_aGroupPositions.end(); + if (aFind != aEnd) { *aFind = NO_GROUP; - ::std::vector<sal_Int32>::iterator aEnd = m_aGroupPositions.end(); for(++aFind;aFind != aEnd;++aFind) if ( *aFind != NO_GROUP ) --*aFind; @@ -900,7 +900,7 @@ void OFieldExpressionControl::InsertRows( long nRow ) ::std::vector<sal_Int32>::size_type nRowPos = static_cast< ::std::vector<sal_Int32>::size_type >(nRow); if ( nRowPos < m_aGroupPositions.size() ) { - ::std::vector<sal_Int32>::iterator aEnd = m_aGroupPositions.begin() + nRowPos; + ::std::vector<sal_Int32>::const_iterator aEnd = m_aGroupPositions.begin() + nRowPos; for(;aIter != aEnd;++aIter) { if ( *aIter != NO_GROUP ) @@ -919,7 +919,7 @@ void OFieldExpressionControl::InsertRows( long nRow ) ::std::vector<sal_Int32>::iterator aInsertPos = m_aGroupPositions.insert(aIter,nGroupPos); ++aInsertPos; aIter = aInsertPos; - ::std::vector<sal_Int32>::iterator aEnd = m_aGroupPositions.end(); + ::std::vector<sal_Int32>::const_iterator aEnd = m_aGroupPositions.end(); for(;aInsertPos != aEnd;++aInsertPos) if ( *aInsertPos != NO_GROUP ) ++*aInsertPos; diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index ab49ccf..44d457a 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -1070,7 +1070,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope _rControlValue >>= sValue; ::std::vector< OUString > aList; tools::StringListResource aRes(ModuleRes(RID_STR_TYPE_CONST),aList); - ::std::vector< OUString >::iterator aFind = ::std::find(aList.begin(),aList.end(),sValue); + ::std::vector< OUString >::const_iterator aFind = ::std::find(aList.begin(),aList.end(),sValue); if ( aFind != aList.end() ) aPropertyValue <<= static_cast<sal_uInt32>(aFind - aList.begin()); } @@ -1084,7 +1084,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope _rControlValue >>= sValue; ::std::vector< OUString > aList; tools::StringListResource aRes(ModuleRes(RID_STR_VERTICAL_ALIGN_CONST),aList); - ::std::vector< OUString >::iterator aFind = ::std::find(aList.begin(),aList.end(),sValue); + ::std::vector< OUString >::const_iterator aFind = ::std::find(aList.begin(),aList.end(),sValue); if ( aFind != aList.end() ) aPropertyValue <<= static_cast<style::VerticalAlignment>(aFind - aList.begin()); } @@ -1095,7 +1095,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope _rControlValue >>= sValue; ::std::vector< OUString > aList; tools::StringListResource aRes(ModuleRes(RID_STR_PARAADJUST_CONST),aList); - ::std::vector< OUString >::iterator aFind = ::std::find(aList.begin(),aList.end(),sValue); + ::std::vector< OUString >::const_iterator aFind = ::std::find(aList.begin(),aList.end(),sValue); if ( aFind != aList.end() ) aPropertyValue <<= static_cast<sal_Int16>(aFind - aList.begin()); } diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 18b423a..8f61577 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -127,8 +127,8 @@ OSectionUndo::~OSectionUndo() if ( !m_bInserted ) { OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); - ::std::vector< uno::Reference< drawing::XShape> >::iterator aEnd = m_aControls.end(); - for (::std::vector< uno::Reference< drawing::XShape> >::iterator aIter = m_aControls.begin(); aIter != aEnd; ++aIter) + ::std::vector< uno::Reference< drawing::XShape> >::const_iterator aEnd = m_aControls.end(); + for (::std::vector< uno::Reference< drawing::XShape> >::const_iterator aIter = m_aControls.begin(); aIter != aEnd; ++aIter) { uno::Reference< drawing::XShape> xShape = *aIter; rEnv.RemoveElement(xShape); diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 95eacca..96c3ad0 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -155,7 +155,7 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments m_pToolbarController = new SvxColorToolBoxControl(m_nSlotId = SID_BACKGROUND_COLOR,m_nToolBoxId,*pToolBox); } - TCommandState::iterator aIter = m_aStates.begin(); + TCommandState::const_iterator aIter = m_aStates.begin(); for (; aIter != m_aStates.end(); ++aIter) addStatusListener(aIter->first); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index f2b1fd4..ed030a2 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -635,7 +635,7 @@ uno::Any ODesignView::getCurrentlyShownProperty() const pSectionWindow->getReportSection().fillControlModelSelection(aSelection); if ( !aSelection.empty() ) { - ::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aSelection.begin(); + ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aSelection.begin(); uno::Sequence< uno::Reference< report::XReportComponent > > aSeq(aSelection.size()); for(sal_Int32 i = 0; i < aSeq.getLength(); ++i,++aIter) { diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 579fbb9..661e012 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -904,7 +904,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const { ::std::vector< uno::Reference< uno::XInterface > > aSelection; getDesignView()->fillControlModelSelection(aSelection); - ::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aSelection.begin(); + ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aSelection.begin(); for(; aIter != aSelection.end() && !uno::Reference< report::XFixedLine >(*aIter,uno::UNO_QUERY).is() && !uno::Reference< report::XImageControl >(*aIter,uno::UNO_QUERY).is() @@ -1451,7 +1451,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > const OUString sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); - ::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aControlsFormats.begin(); + ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aControlsFormats.begin(); for(; aIter != aControlsFormats.end();++aIter) { uno::Reference< report::XReportControlFormat> xReportControlFormat(*aIter,uno::UNO_QUERY); @@ -1528,7 +1528,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGEFONT ) ); UndoContext aUndoContext( getUndoManager(), sUndoAction ); - ::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aControlsFormats.begin(); + ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aControlsFormats.begin(); for(; aIter != aControlsFormats.end();++aIter) { uno::Reference< report::XReportControlFormat > xFormat( *aIter, uno::UNO_QUERY ); @@ -2764,8 +2764,8 @@ uno::Any SAL_CALL OReportController::getViewData() throw( uno::RuntimeException, { uno::Sequence<beans::PropertyValue> aCollapsedSections(aCollapsedPositions.size()); beans::PropertyValue* pCollapsedIter = aCollapsedSections.getArray(); - ::std::vector<sal_uInt16>::iterator aIter = aCollapsedPositions.begin(); - ::std::vector<sal_uInt16>::iterator aEnd = aCollapsedPositions.end(); + ::std::vector<sal_uInt16>::const_iterator aIter = aCollapsedPositions.begin(); + ::std::vector<sal_uInt16>::const_iterator aEnd = aCollapsedPositions.end(); for (sal_Int32 i = 1; aIter != aEnd ; ++aIter,++pCollapsedIter,++i) { pCollapsedIter->Name = PROPERTY_SECTION + OUString::number(i); @@ -4106,7 +4106,7 @@ void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui: if ( _rState.bEnabled ) { uno::Any aTemp; - ::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aSelection.begin(); + ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aSelection.begin(); for(; aIter != aSelection.end() && _rState.bEnabled ;++aIter) { uno::Reference< beans::XPropertySet> xProp(*aIter,uno::UNO_QUERY); @@ -4176,7 +4176,7 @@ bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndo ::std::vector< uno::Reference< uno::XInterface > > aSelection; uno::Reference< awt::XWindow> xWindow; lcl_getReportControlFormat( _aArgs, getDesignView(), xWindow, aSelection ); - ::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aSelection.begin(); + ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aSelection.begin(); const OUString sUndoAction = ModuleRes( _nUndoResId ); UndoContext aUndoContext( getUndoManager(), sUndoAction ); diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 3e87c0f..4566566 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -629,8 +629,8 @@ void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { - std::vector< OUString >::iterator aIter = aObjList.begin(); - std::vector< OUString >::iterator aEnd = aObjList.end(); + std::vector< OUString >::const_iterator aIter = aObjList.begin(); + std::vector< OUString >::const_iterator aEnd = aObjList.end(); for (sal_uInt32 i=0 ; aIter != aEnd; ++aIter,++i) { if ( aIter->equalsIgnoreAsciiCase( _sType ) ) diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 1520e97..0baafc1 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -223,8 +223,8 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow) { bool bSet = false; Point aStartPoint; - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (;aIter != aEnd ; ++aIter) { OSectionWindow* pSectionWindow = (*aIter); @@ -252,8 +252,8 @@ void OViewsWindow::Resize() { const Point aOffset(m_pParent->getThumbPos()); Point aStartPoint(0,-aOffset.Y()); - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (;aIter != aEnd ; ++aIter) { OSectionWindow* pSectionWindow = (*aIter); @@ -312,7 +312,7 @@ void OViewsWindow::removeSection(sal_uInt16 _nPosition) if ( _nPosition < m_aSections.size() ) { TSectionsMap::iterator aPos = getIteratorAtPos(_nPosition); - TSectionsMap::iterator aNew = getIteratorAtPos(_nPosition == 0 ? _nPosition+1: _nPosition - 1); + TSectionsMap::const_iterator aNew = getIteratorAtPos(_nPosition == 0 ? _nPosition+1: _nPosition - 1); m_pParent->getReportView()->UpdatePropertyBrowserDelayed((*aNew)->getReportSection().getSectionView()); @@ -353,8 +353,8 @@ sal_uInt16 OViewsWindow::getSectionCount() const void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (;aIter != aEnd ; ++aIter) (*aIter)->getReportSection().getSectionView().SetCurrentObj( eObj, ReportInventor ); @@ -523,8 +523,8 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView) if ( !m_bInUnmark ) { m_bInUnmark = true; - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (; aIter != aEnd ; ++aIter) { if ( &(*aIter)->getReportSection().getSectionView() != _pSectionView ) @@ -570,8 +570,8 @@ void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() ) { - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (;aIter != aEnd ; ++aIter) { if ( (*aIter)->getReportSection().getSectionView().AreObjectsMarked() ) @@ -592,8 +592,8 @@ void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt ) bool OViewsWindow::handleKeyEvent(const KeyEvent& _rEvent) { bool bRet = false; - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (;aIter != aEnd ; ++aIter) { if ( (*aIter)->getStartMarker().isMarked() ) @@ -621,8 +621,8 @@ void OViewsWindow::setMarked(OSectionView* _pSectionView, bool _bMark) void OViewsWindow::setMarked(const uno::Reference< report::XSection>& _xSection, bool _bMark) { - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (; aIter != aEnd ; ++aIter) { if ( (*aIter)->getReportSection().getSection() != _xSection ) @@ -666,8 +666,8 @@ void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepor void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles) { - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (aIter = m_aSections.begin();aIter != aEnd ; ++aIter) { OSectionView& rView = (*aIter)->getReportSection().getSectionView(); @@ -790,8 +790,8 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli ::std::mem_fun_t<long&,Rectangle> aGetFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Bottom); ::std::mem_fun_t<long&,Rectangle> aRefFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Top); - TRectangleMap::iterator aRectIter = aSortRectangles.begin(); - TRectangleMap::iterator aRectEnd = aSortRectangles.end(); + TRectangleMap::const_iterator aRectIter = aSortRectangles.begin(); + TRectangleMap::const_iterator aRectEnd = aSortRectangles.end(); for (;aRectIter != aRectEnd ; ++aRectIter) { Rectangle aObjRect = aRectIter->first; @@ -841,7 +841,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli { Rectangle aTest = aObjRect; aGetFun(&aTest) = aGetFun(&aBound); - TRectangleMap::iterator aInterSectRectIter = aSortRectangles.begin(); + TRectangleMap::const_iterator aInterSectRectIter = aSortRectangles.begin(); for (; aInterSectRectIter != aRectIter; ++aInterSectRectIter) { if ( pView == aInterSectRectIter->second.second && (dynamic_cast<OUnoObject*>(aInterSectRectIter->second.first) || dynamic_cast<OOle2Obj*>(aInterSectRectIter->second.first))) @@ -915,8 +915,8 @@ void OViewsWindow::createDefault() void OViewsWindow::setGridSnap(bool bOn) { - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (; aIter != aEnd ; ++aIter) { (*aIter)->getReportSection().getSectionView().SetGridSnap(bOn); @@ -926,8 +926,8 @@ void OViewsWindow::setGridSnap(bool bOn) void OViewsWindow::setDragStripes(bool bOn) { - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (; aIter != aEnd ; ++aIter) (*aIter)->getReportSection().getSectionView().SetDragStripes(bOn); } @@ -1020,8 +1020,8 @@ void OViewsWindow::BrkAction() void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _aRect, const OSectionView& _rSection) { - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); Point aNewPos(0,0); for (; aIter != aEnd; ++aIter) @@ -1063,8 +1063,8 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi // Calculate the absolute clickpoint in the views Point aAbsolutePnt = _aPnt; - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (; aIter != aEnd; ++aIter) { OReportSection& rReportSection = (*aIter)->getReportSection(); @@ -1171,8 +1171,8 @@ void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection) bool bAdd = true; Point aNewPos = _aPnt; - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); long nLastSectionHeight = 0; for (; aIter != aEnd; ++aIter) { @@ -1200,8 +1200,8 @@ OSectionView* OViewsWindow::getSectionRelativeToPosition(const OSectionView* _pS { OSectionView* pSection = nullptr; sal_Int32 nCount = 0; - TSectionsMap::iterator aIter = m_aSections.begin(); - const TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + const TSectionsMap::const_iterator aEnd = m_aSections.end(); for (; aIter != aEnd ; ++aIter,++nCount) { OReportSection& rReportSection = (*aIter)->getReportSection(); @@ -1247,8 +1247,8 @@ OSectionView* OViewsWindow::getSectionRelativeToPosition(const OSectionView* _pS void OViewsWindow::EndDragObj_removeInvisibleObjects() { - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (; aIter != aEnd; ++aIter) { @@ -1274,8 +1274,8 @@ void OViewsWindow::EndDragObj(bool _bControlKeyPressed, const OSectionView* _pSe aNewPos -= m_aDragDelta; uno::Sequence< beans::NamedValue > aAllreadyCopiedObjects; - TSectionsMap::iterator aIter = m_aSections.begin(); - const TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + const TSectionsMap::const_iterator aEnd = m_aSections.end(); for (; aIter != aEnd; ++aIter) { OReportSection& rReportSection = (*aIter)->getReportSection(); @@ -1384,8 +1384,8 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo aHdlPos = pHdl->GetPos(); } - TSectionsMap::iterator aIter; - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter; + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter) { @@ -1729,8 +1729,8 @@ void OViewsWindow::zoom(const Fraction& _aZoom) setZoomFactor(_aZoom,*this); - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (;aIter != aEnd ; ++aIter) { (*aIter)->zoom(_aZoom); @@ -1761,8 +1761,8 @@ void OViewsWindow::scrollChildren(const Point& _aThumbPos) Scroll(0, -( aOld.Y() + aPosY.Y()),ScrollFlags::Children); } - TSectionsMap::iterator aIter = m_aSections.begin(); - TSectionsMap::iterator aEnd = m_aSections.end(); + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); for (;aIter != aEnd ; ++aIter) { (*aIter)->scrollChildren(aPos.X()); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits