sw/inc/doc.hxx | 2 +-
sw/source/core/doc/docnew.cxx | 6 +++---
sw/source/uibase/dbui/dbmgr.cxx | 6 ++++--
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 3b11057b75434526f67e678ddc1deb9ebd61c752
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Sep 12 21:50:36 2014 +0200
sw: rename SwDoc::Append to something unique
Change-Id: Ibb9db5ecdea6439df20fc1ee609267dcdd864405
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index f914326..08e82c6 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1647,7 +1647,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 a05b426..f64c32f 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -925,7 +925,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
@@ -939,8 +939,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/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index f249ffc..bc242be 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1118,7 +1118,8 @@ bool SwDBManager::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();
@@ -2877,7 +2878,8 @@ sal_Int32 SwDBManager::MergeDocuments(
SwMailMergeConfigItem& rMMConfig,
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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
