diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-06-28 01:41:17 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2014-09-10 11:06:01 +0000 |
| commit | c808802e94eba48dc23d7fca133ed35c17feb163 (patch) | |
| tree | 8faaf4dfaec9a046137d57eb084d0d74f9afca66 /sw/inc/doc.hxx | |
| parent | 8e174eab91acec0f1578af4dac23be76dce700af (diff) | |
MM: introduce SwDoc::Append helper function
This drops all the specialized, workaround code from MM, introduced
to use the SwFEShell::Paste function and additionally merges
and renames SwDoc::Paste into SwDoc::Append.
There is still a little common codepath, therefore this adds
comments to always update both functions.
Change-Id: I704b3ef3257dd977dac95e16e25049ff8ade97ed
Reviewed-on: https://gerrit.libreoffice.org/10967
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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index a1d6236cc9b5..f91432649da9 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -460,7 +460,6 @@ private: OUString msDocAccTitle; void InitTOXTypes(); - void Paste( const SwDoc& ); public: enum DocumentType { @@ -1646,7 +1645,10 @@ public: ::sw::MetaFieldManager & GetMetaFieldManager(); ::sw::UndoManager & GetUndoManager(); ::sw::UndoManager const& GetUndoManager() const; + SfxObjectShell* CreateCopy(bool bCallInitNew) const; + void Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber, + SwPageDesc* pTargetPageDesc, bool bDeletePrevious = false ); /** * Dumps the entire nodes structure to the given destination (file nodes.xml in the current directory by default) |