Kaydet (Commit) c6f4bbfa authored tarafından Herbert Dürr's avatar Herbert Dürr

#i122208# const SC containers cannot provide non-const iterators

üst fd7b9ada
...@@ -232,7 +232,7 @@ void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange, ...@@ -232,7 +232,7 @@ void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange,
DBG_ASSERT(pListener, "EndListeningArea: pListener Null"); DBG_ASSERT(pListener, "EndListeningArea: pListener Null");
if ( !rpArea ) if ( !rpArea )
{ {
ScBroadcastAreas::iterator aIter( FindBroadcastArea( rRange)); ScBroadcastAreas::const_iterator aIter( FindBroadcastArea( rRange));
if (aIter == aBroadcastAreaTbl.end()) if (aIter == aBroadcastAreaTbl.end())
return; return;
rpArea = *aIter; rpArea = *aIter;
...@@ -251,7 +251,7 @@ void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange, ...@@ -251,7 +251,7 @@ void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange,
{ {
if ( !rpArea->GetBroadcaster().HasListeners() ) if ( !rpArea->GetBroadcaster().HasListeners() )
{ {
ScBroadcastAreas::iterator aIter( FindBroadcastArea( rRange)); ScBroadcastAreas::const_iterator aIter( FindBroadcastArea( rRange));
if (aIter == aBroadcastAreaTbl.end()) if (aIter == aBroadcastAreaTbl.end())
return; return;
DBG_ASSERT( *aIter == rpArea, "EndListeningArea: area pointer mismatch"); DBG_ASSERT( *aIter == rpArea, "EndListeningArea: area pointer mismatch");
...@@ -266,7 +266,7 @@ void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange, ...@@ -266,7 +266,7 @@ void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange,
} }
ScBroadcastAreas::iterator ScBroadcastAreaSlot::FindBroadcastArea( ScBroadcastAreas::const_iterator ScBroadcastAreaSlot::FindBroadcastArea(
const ScRange& rRange ) const const ScRange& rRange ) const
{ {
aTmpSeekBroadcastArea.UpdateRange( rRange); aTmpSeekBroadcastArea.UpdateRange( rRange);
......
...@@ -128,7 +128,7 @@ private: ...@@ -128,7 +128,7 @@ private:
ScDocument* pDoc; ScDocument* pDoc;
ScBroadcastAreaSlotMachine* pBASM; ScBroadcastAreaSlotMachine* pBASM;
ScBroadcastAreas::iterator FindBroadcastArea( const ScRange& rRange ) const; ScBroadcastAreas::const_iterator FindBroadcastArea( const ScRange& rRange ) const;
/** /**
More hypothetical (memory would probably be doomed anyway) check More hypothetical (memory would probably be doomed anyway) check
......
...@@ -1149,12 +1149,13 @@ void XclExpComments::SaveXml( XclExpXmlStream& rStrm ) ...@@ -1149,12 +1149,13 @@ void XclExpComments::SaveXml( XclExpXmlStream& rStrm )
rComments->endElement( XML_authors ); rComments->endElement( XML_authors );
rComments->startElement( XML_commentList, FSEND ); rComments->startElement( XML_commentList, FSEND );
Authors::const_iterator aAuthorsBegin = aAuthors.begin();
for( size_t i = 0; i < nNotes; ++i ) for( size_t i = 0; i < nNotes; ++i )
{ {
XclExpNoteList::RecordRefType xNote = mrNotes.GetRecord( i ); XclExpNoteList::RecordRefType xNote = mrNotes.GetRecord( i );
Authors::const_iterator aAuthor = aAuthors.find( Authors::const_iterator aAuthor = aAuthors.find(
XclXmlUtils::ToOUString( xNote->GetAuthor() ) ); XclXmlUtils::ToOUString( xNote->GetAuthor() ) );
sal_Int32 nAuthorId = distance( aAuthors.begin(), aAuthor ); sal_Int32 nAuthorId = distance( aAuthorsBegin, aAuthor );
xNote->WriteXml( nAuthorId, rStrm ); xNote->WriteXml( nAuthorId, rStrm );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment