sw/source/core/fields/reffld.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit cee3e301b4553095b70cf6abff15038b4aae8936 Author: Cédric Bosdonnat <cedric.bosdonnat....@free.fr> Date: Wed Feb 8 14:06:09 2012 +0100 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 <mst...@redhat.com> diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index eca22ba..ddf36b2 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
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits