You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
88 lines
3.6 KiB
88 lines
3.6 KiB
From 36e158ce7a0effb130936ba4598a193102faa6a1 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
Date: Mon, 19 Jan 2015 12:09:17 +0000
|
|
Subject: [PATCH 1/2] if we change the keys we have to resort based on the new
|
|
keys
|
|
|
|
Change-Id: Ied95c2d1490554d9ba5402c936a9720c8a325771
|
|
---
|
|
sw/source/core/doc/docredln.cxx | 26 ++++++++++++++++++++++----
|
|
1 file changed, 22 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
|
|
index 960a15d..b2f1eea 100644
|
|
--- a/sw/source/core/doc/docredln.cxx
|
|
+++ b/sw/source/core/doc/docredln.cxx
|
|
@@ -1336,6 +1336,8 @@ void SwRangeRedline::MoveFromSection()
|
|
SwDoc* pDoc = GetDoc();
|
|
const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
|
|
std::vector<SwPosition*> aBeforeArr, aBehindArr;
|
|
+ typedef std::map<sal_uInt16, SwRangeRedline*> IndexAndRange;
|
|
+ IndexAndRange aIndexAndRangeMap;
|
|
sal_uInt16 nMyPos = rTbl.GetPos( this );
|
|
OSL_ENSURE( this, "this is not in the array?" );
|
|
bool bBreak = false;
|
|
@@ -1346,12 +1348,16 @@ void SwRangeRedline::MoveFromSection()
|
|
bBreak = true;
|
|
if( rTbl[ n ]->GetBound(true) == *GetPoint() )
|
|
{
|
|
- aBehindArr.push_back( &rTbl[ n ]->GetBound(true) );
|
|
+ SwRangeRedline* pRedl = rTbl[n];
|
|
+ aBehindArr.push_back(&pRedl->GetBound(true));
|
|
+ aIndexAndRangeMap.insert(std::make_pair(n, pRedl));
|
|
bBreak = false;
|
|
}
|
|
if( rTbl[ n ]->GetBound(false) == *GetPoint() )
|
|
{
|
|
- aBehindArr.push_back( &rTbl[ n ]->GetBound(false) );
|
|
+ SwRangeRedline* pRedl = rTbl[n];
|
|
+ aBehindArr.push_back(&pRedl->GetBound(false));
|
|
+ aIndexAndRangeMap.insert(std::make_pair(n, pRedl));
|
|
bBreak = false;
|
|
}
|
|
}
|
|
@@ -1361,12 +1367,16 @@ void SwRangeRedline::MoveFromSection()
|
|
bBreak = true;
|
|
if( rTbl[ n ]->GetBound(true) == *GetPoint() )
|
|
{
|
|
- aBeforeArr.push_back( &rTbl[ n ]->GetBound(true) );
|
|
+ SwRangeRedline* pRedl = rTbl[n];
|
|
+ aBeforeArr.push_back(&pRedl->GetBound(true));
|
|
+ aIndexAndRangeMap.insert(std::make_pair(n, pRedl));
|
|
bBreak = false;
|
|
}
|
|
if( rTbl[ n ]->GetBound(false) == *GetPoint() )
|
|
{
|
|
- aBeforeArr.push_back( &rTbl[ n ]->GetBound(false) );
|
|
+ SwRangeRedline* pRedl = rTbl[n];
|
|
+ aBeforeArr.push_back(&pRedl->GetBound(false));
|
|
+ aIndexAndRangeMap.insert(std::make_pair(n, pRedl));
|
|
bBreak = false;
|
|
}
|
|
}
|
|
@@ -1420,6 +1430,7 @@ void SwRangeRedline::MoveFromSection()
|
|
if( pColl && pCNd )
|
|
pCNd->ChgFmtColl( pColl );
|
|
}
|
|
+
|
|
// #i95771#
|
|
// Under certain conditions the previous <SwDoc::Move(..)> has already
|
|
// removed the change tracking section of this <SwRangeRedline> instance from
|
|
@@ -1440,6 +1451,13 @@ void SwRangeRedline::MoveFromSection()
|
|
*aBeforeArr[ n ] = *Start();
|
|
for( n = 0; n < aBehindArr.size(); ++n )
|
|
*aBehindArr[ n ] = *End();
|
|
+ SwRedlineTbl& rResortTbl = const_cast<SwRedlineTbl&>(rTbl);
|
|
+ for (auto& a : aIndexAndRangeMap)
|
|
+ {
|
|
+ // re-insert
|
|
+ rResortTbl.Remove(a.first);
|
|
+ rResortTbl.Insert(a.second);
|
|
+ }
|
|
}
|
|
else
|
|
InvalidateRange();
|
|
--
|
|
1.9.3
|
|
|