diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-08-03 12:10:40 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2014-09-24 16:11:07 +0000 |
| commit | cde554a731596f1ca53a911656b6503c96dadcc7 (patch) | |
| tree | 8529880c50358bc7895c1d331dd5d81fe01829ba /sw/inc/doc.hxx | |
| parent | 3930c14be021e325c1efdb3fa7858069085286f8 (diff) | |
fdo#81782 MM: copy most document properties
Mail merge wasn't copying the document properties into the target
document. It also has to copy most document properties into the
working copy, as ConvertFieldsToText is called just there.
Change-Id: I7e07fec712c225f667d960a94f4eb3fd0b83f041
Reviewed-on: https://gerrit.libreoffice.org/10987
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw/inc/doc.hxx')
| -rw-r--r-- | sw/inc/doc.hxx | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 21466fabcfe7..1742d8e9ed31 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -899,7 +899,22 @@ public: void ReplaceDefaults( const SwDoc& rSource ); // Replace all compatability options with those from rSource. - void ReplaceCompatabilityOptions(const SwDoc& rSource); + void ReplaceCompatabilityOptions( const SwDoc& rSource ); + + /** Replace all user defined document properties with xSourceDocProps. + + Convenince function used by ReplaceDocumentProperties to skip some UNO calls. + */ + void ReplaceUserDefinedDocumentProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xSourceDocProps ); + + // Replace all user defined document properties with those from rSource. + void ReplaceUserDefinedDocumentProperties( const SwDoc& rSource ); + + /** Replace document properties with those from rSource. + + This includes the user defined document properties! + */ + void ReplaceDocumentProperties(const SwDoc& rSource); // Query if style (paragraph- / character- / frame- / page-) is used. bool IsUsed( const SwModify& ) const; |