diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-04-11 20:57:49 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-11 21:10:11 +0100 |
commit | 74d942fb2396a268adfcc915e75b8b32fae851dc (patch) | |
tree | 9864e3f053b22057738eed2ff301ebcae559a020 | |
parent | 4fae09f7ed6360dd6c7b4ce2e57166221820d450 (diff) |
Resolves: fdo#48039 use same algorithm for assigning get/set replacement ids
i.e. use the same algorithm for assigning replacement ids for both get and set
exp fields.
Otherwise, consider for ex.
1. fields exists with ids of 1 and 2 in master document
2. a field exists with id of 1 in subdocument and must be reassigned a new
id to not collide with the pre existing master ids
In get orig algorithm assigned first unused slot of master to subdocument field
i.e. 0 unused in master, so subdocument:1 converted to master:0
In set orig algorithm sorted all used master slots and assigned largest used id
plus 1 (therefore unused) to subdocument field i.e. largest id used in master is
2, so subdocument:1 converted to master:3
so get can't find set and error's out with:
Error: Reference source not found
Change-Id: Ie8758dc22cf8deeeeff079532284e57eeaf4a9bd
-rw-r--r-- | sw/source/core/fields/reffld.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 68a00d7a47a4..4c668b04ea20 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -993,14 +993,9 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool bField ) GetFieldIdsFromDoc( rDestDoc, aIds ); GetFieldIdsFromDoc( rDoc, aDstIds ); - // Define the mappings now - sal_uInt16 nMaxDstId = -1; - if ( !aIds.empty() ) - nMaxDstId = *aIds.rbegin(); - - // Map all the src fields to their value + nMaxDstId + // Map all the new src fields to the next available unused id for ( std::set<sal_uInt16>::iterator pIt = aDstIds.begin(); pIt != aDstIds.end(); ++pIt ) - AddId( ++nMaxDstId, *pIt ); + AddId( GetFirstUnusedId(aIds), *pIt ); // Change the Sequence number of all the SetExp fields in the destination document SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false ); @@ -1023,9 +1018,9 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool bField ) bInit = true; } -/// Get the lowest unused ID in the passed set. +/// Get the lowest number unused in the passed set. /// @param[in] rIds The set of used ID numbers. -/// @returns The lowest unused ID. +/// @returns The lowest number unused by the passed set sal_uInt16 _RefIdsMap::GetFirstUnusedId( std::set<sal_uInt16> &rIds ) { sal_uInt16 num(0); |