diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-10 14:57:22 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-10 14:57:22 +0000 |
| commit | 8049f37b13073d11005e753cb0dfa26650e60d11 (patch) | |
| tree | efbda600f7a35f00428cde9e2bd1762d5dbd0218 /sw/source/ui/dbui/dbmgr.cxx | |
| parent | f9ac64227e4786eed7cfadfb59c1df289b279b80 (diff) | |
INTEGRATION: CWS os68 (1.98.44); FILE MERGED
2005/10/31 12:28:07 os 1.98.44.2: RESYNC: (1.98-1.100); FILE MERGED
2005/10/10 12:27:26 os 1.98.44.1: #i55595# mailmerge: convert header/footer fields to text
Diffstat (limited to 'sw/source/ui/dbui/dbmgr.cxx')
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index db2ab4b46250..d4499801c6e5 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dbmgr.cxx,v $ * - * $Revision: 1.101 $ + * $Revision: 1.102 $ * - * last change: $Author: kz $ $Date: 2005-11-04 16:01:40 $ + * last change: $Author: rt $ $Date: 2005-11-10 15:57:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1613,6 +1613,12 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, } } pTargetShell->Paste( rWorkShell.GetDoc(), sal_True ); + //convert fields in page styles (header/footer - has to be done after the first document has been pasted + if(1 == nDocNo) + { + pTargetShell->CalcLayout(); + pTargetShell->ConvertFieldsToText(); + } } else { @@ -3292,7 +3298,12 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig, } } pTargetShell->Paste( rWorkShell.GetDoc(), sal_True ); - + //convert fields in page styles (header/footer - has to be done after the first document has been pasted + if(1 == nDocNo) + { + pTargetShell->CalcLayout(); + pTargetShell->ConvertFieldsToText(); + } //add the document info to the config item SwDocMergeInfo aMergeInfo; aMergeInfo.nStartPageInTarget = nPageCountBefore; |