diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-09-12 21:50:36 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-11-14 13:23:08 +0100 |
| commit | eabd9b085bcae9d61dbeb8cedf263c17916b1311 (patch) | |
| tree | dd32e6ddeda12311b242c263372d886f896dda1b | |
| parent | 9b52ce7d88ae613927f33816e4f994d21dc4ded8 (diff) | |
:sw: rename SwDoc::Append to something unique
(cherry picked from commit 3b11057b75434526f67e678ddc1deb9ebd61c752)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
Change-Id: Ibb9db5ecdea6439df20fc1ee609267dcdd864405
(cherry picked from commit 4896a4984473857d5b12df69a287c44c485105b7)
(cherry picked from commit bd73285aff577350d7dff4907aad9053f7721dd1)
| -rw-r--r-- | sw/inc/doc.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/doc/docnew.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index e5addc17898a..a3ac7c58c37f 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -2077,7 +2077,7 @@ public: ::sw::UndoManager const& GetUndoManager() const; SfxObjectShell* CreateCopy(bool bCallInitNew) const; - void Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber, + void AppendDoc(const SwDoc& rSource, sal_uInt16 nStartPageNumber, SwPageDesc* pTargetPageDesc, bool bDeletePrevious = false ); /** diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index bf5f21637940..cf518ed8ffed 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -1142,7 +1142,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const SAL_INFO( "sw.createcopy", "CC-Nd-Src: " << CNTNT_DOC( this ) ); SAL_INFO( "sw.createcopy", "CC-Nd: " << CNTNT_DOC( pRet ) ); #endif - pRet->Append(*this, 0, NULL, bCallInitNew); + pRet->AppendDoc(*this, 0, NULL, bCallInitNew); #ifdef DBG_UTIL SAL_INFO( "sw.createcopy", "CC-Nd: " << CNTNT_DOC( pRet ) ); #endif @@ -1156,8 +1156,8 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const } // appends all pages of source SwDoc - based on SwFEShell::Paste( SwDoc* ) -void SwDoc::Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber, - SwPageDesc* pTargetPageDesc, bool bDeletePrevious ) +void SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNumber, + SwPageDesc *const pTargetPageDesc, bool const bDeletePrevious) { // GetEndOfExtras + 1 = StartOfContent == no content node! // @see IDocumentContentOperations::CopyRange diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 229b5848f899..d02871e231c7 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -1209,7 +1209,8 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, if ( nDocNo <= MAX_DOC_DUMP ) lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo ); #endif - pTargetDoc->Append( *(rWorkShell.GetDoc()), nStartingPageNo, pTargetPageDesc, nDocNo == 1 ); + pTargetDoc->AppendDoc(*rWorkShell.GetDoc(), + nStartingPageNo, pTargetPageDesc, nDocNo == 1); // #i72820# calculate layout to be able to find the correct page index pTargetShell->CalcLayout(); |