summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2012-02-08 14:06:09 +0100
committerCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2012-02-08 14:11:24 +0100
commit44f971506c0ed37928c48e55d8007f24b0c43a5f (patch)
tree7ffe8d0247994ab735e279880d247b8054412829
parentf3e40273b699910108007faf8a7991fe0498ad97 (diff)
fdo#35669: Update the references even if nothing uses them here
Merge the references with the other document even if there is no field using them as this may break the sequence and references in other parts of a master document.
-rw-r--r--sw/source/core/fields/reffld.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 05c3eda29e16..b01471abc4ba 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1074,8 +1074,7 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
{
- if( &rDestDoc != pDoc &&
- rDestDoc.GetSysFldType( RES_GETREFFLD )->GetDepends() )
+ if( &rDestDoc != pDoc )
{
// dann gibt es im DestDoc RefFelder, also muessen im SourceDoc
// alle RefFelder auf einduetige Ids in beiden Docs umgestellt