Kaydet (Commit) 7b768dd9 authored tarafından Eike Rathke's avatar Eike Rathke

Resolves: tdf#100852 update miBroadcasterPos before copying it

Change-Id: I9ab9acfb0871355ceb2c3c83f51e7ba05a74d8f2
üst 40231526
...@@ -1511,7 +1511,27 @@ public: ...@@ -1511,7 +1511,27 @@ public:
~CopyByCloneHandler() ~CopyByCloneHandler()
{ {
if (mpDestPos) if (mpDestPos)
{
// If broadcasters were setup in the same column,
// maDestPos.miBroadcasterPos doesn't match
// mrDestCol.maBroadcasters because it is never passed anywhere.
// Assign a corresponding iterator before copying all over.
// Otherwise this may result in wrongly copying a singular
// iterator.
{
/* XXX Using a temporary ColumnBlockPosition just for
* initializing from ScColumn::maBroadcasters.begin() is ugly,
* on the other hand we don't want to expose
* ScColumn::maBroadcasters to the outer world and have a
* getter. */
sc::ColumnBlockPosition aTempBlock;
mrDestCol.InitBlockPosition(aTempBlock);
maDestPos.miBroadcasterPos = aTempBlock.miBroadcasterPos;
}
*mpDestPos = maDestPos; *mpDestPos = maDestPos;
}
} }
void setStartListening( bool b ) void setStartListening( bool b )
......
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