commit 2fe8ce572222e90327cfeed6b7da07a2c57bdbbb
author Miklos Vajna <vmiklos@suse.cz> Fri Jul 20 14:41:23 2012 +0200
committer Miklos Vajna <vmiklos@suse.cz> Fri Jul 20 15:20:51 2012 +0200
tree 4c7781a0b19fae25347a3f467a5b7335782a4292
parent d4b473dd9ba77427b28d97847067b8877c2033d9

SwXTextField::attachToRange: don't generate new fieldmark id on each import

Change-Id: If7256136cde91279ad8b684da1b7bf1666bd1dba

sw/source/core/unocore/unofield.cxx

diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index d06ec8c..1b14610 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -92,6 +92,7 @@
#include <docsh.hxx>
#include <fmtmeta.hxx> // MetaFieldManager
#include <switerator.hxx>
#include <bookmrk.hxx>
#include <rtl/strbuf.hxx>
#include <vector>
#include <xmloff/odffields.hxx>
@@ -1760,7 +1761,17 @@ void SwXTextField::attachToRange(
                        aPam,
                        OUString(),
                        ODF_COMMENTRANGE);
                ((SwPostItField*)aFmt.GetFld())->SetName(pFieldmark->GetName());
                SwPostItField* pPostItField = (SwPostItField*)aFmt.GetFld();
                if (pPostItField->GetName().isEmpty())
                    // The fieldmark always has a (generated) name.
                    pPostItField->SetName(pFieldmark->GetName());
                else
                {
                    // The field has a name already, use it.
                    sw::mark::MarkBase* pMarkBase = dynamic_cast<sw::mark::MarkBase*>(pFieldmark);
                    if (pMarkBase)
                        pMarkBase->SetName(pPostItField->GetName());
                }

                // Make sure we always insert the field at the end
                SwPaM aEnd(*aPam.End(), *aPam.End());