diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-11-06 16:43:28 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-11-14 13:26:11 +0100 |
| commit | 7b47afeed36c6b9089ac484e2331377d36251d0f (patch) | |
| tree | 2c95ba6495559dea923bd17b664be4d355a57107 | |
| parent | a6b78999adc23f70071de811d36c19ce01aee013 (diff) | |
name of mailmerge marks is actually irrelevant
UNO bookmarks have internals names and ignore this
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
Change-Id: I37baa4c9bcf9cec37f91e3b1d0fb2fad322ceda8
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 9685b3ba495d..fe9e339a40a5 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -1227,7 +1227,8 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, if (bMergeShell) { SwDocMergeInfo aMergeInfo; - aMergeInfo.startPageInTarget = pTargetDoc->getIDocumentMarkAccess()->makeMark( appendedDocStart, "MailMergeInternalStart" + OUString::number( nStartRow ), + // Name of the mark is actually irrelevant, UNO bookmarks have internals names. + aMergeInfo.startPageInTarget = pTargetDoc->getIDocumentMarkAccess()->makeMark( appendedDocStart, "", IDocumentMarkAccess::UNO_BOOKMARK ); aMergeInfo.nDBRow = nStartRow; rMergeDescriptor.pMailMergeConfigItem->AddMergedDocument( aMergeInfo ); |