diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2012-02-08 14:06:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-02-08 14:46:28 +0100 |
| commit | cee3e301b4553095b70cf6abff15038b4aae8936 (patch) | |
| tree | f44d4012c2107554cce952d729945f78964193ac | |
| parent | 13ba00aa224ed4fdf6b2acbda865a2d07a548369 (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.
(cherry picked from commit 44f971506c0ed37928c48e55d8007f24b0c43a5f)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/core/fields/reffld.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index eca22ba37ef5..ddf36b2e0e53 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 |