diff options
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/core/data/bcaslot.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/inc/bcaslot.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xeescher.cxx | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 0f5b657fcb55..e55c1836bf15 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -219,7 +219,7 @@ void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange, OSL_ENSURE(pListener, "EndListeningArea: pListener Null"); if ( !rpArea ) { - ScBroadcastAreas::iterator aIter( FindBroadcastArea( rRange)); + ScBroadcastAreas::const_iterator aIter( FindBroadcastArea( rRange)); if (aIter == aBroadcastAreaTbl.end() || isMarkedErased( aIter)) return; rpArea = (*aIter).mpArea; @@ -235,7 +235,7 @@ void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange, { if ( !rpArea->GetBroadcaster().HasListeners() ) { - ScBroadcastAreas::iterator aIter( FindBroadcastArea( rRange)); + ScBroadcastAreas::const_iterator aIter( FindBroadcastArea( rRange)); if (aIter == aBroadcastAreaTbl.end() || isMarkedErased( aIter)) return; OSL_ENSURE( (*aIter).mpArea == rpArea, "EndListeningArea: area pointer mismatch"); @@ -247,7 +247,7 @@ void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange, } -ScBroadcastAreas::iterator ScBroadcastAreaSlot::FindBroadcastArea( +ScBroadcastAreas::const_iterator ScBroadcastAreaSlot::FindBroadcastArea( const ScRange& rRange ) const { aTmpSeekBroadcastArea.UpdateRange( rRange); diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index 4fbbb850b15a..53e13d62735c 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -132,7 +132,7 @@ private: ScBroadcastAreaSlotMachine* pBASM; bool mbInBroadcastIteration; - ScBroadcastAreas::iterator FindBroadcastArea( const ScRange& rRange ) const; + ScBroadcastAreas::const_iterator FindBroadcastArea( const ScRange& rRange ) const; /** More hypothetical (memory would probably be doomed anyway) check diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 6acbf4ded5eb..5c23ba3dfe7e 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -1512,12 +1512,13 @@ void XclExpComments::SaveXml( XclExpXmlStream& rStrm ) rComments->endElement( XML_authors ); rComments->startElement( XML_commentList, FSEND ); + Authors::const_iterator aAuthorsBegin = aAuthors.begin(); for( size_t i = 0; i < nNotes; ++i ) { XclExpNoteList::RecordRefType xNote = mrNotes.GetRecord( i ); Authors::iterator aAuthor = aAuthors.find( XclXmlUtils::ToOUString( xNote->GetAuthor() ) ); - sal_Int32 nAuthorId = distance( aAuthors.begin(), aAuthor ); + sal_Int32 nAuthorId = distance( aAuthorsBegin, aAuthor ); xNote->WriteXml( nAuthorId, rStrm ); } |