diff options
Diffstat (limited to 'sw/source/core/doc')
| -rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 10 | ||||
| -rw-r--r-- | sw/source/core/doc/docfmt.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 513656a65251..4d18f7ee605c 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -1764,7 +1764,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons if( pDoc != &m_rDoc ) { // ordinary copy - bRet = CopyImpl( rPam, rPos, true, bCopyAll, pRedlineRange ); + bRet = CopyImpl( rPam, rPos, bCopyAll, pRedlineRange ); } else if( ! ( *pStt <= rPos && rPos < *pEnd && ( pStt->nNode != pEnd->nNode || @@ -1772,7 +1772,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons { // Copy to a position outside of the area, or copy a single TextNode // Do an ordinary copy - bRet = CopyImpl( rPam, rPos, true, bCopyAll, pRedlineRange ); + bRet = CopyImpl( rPam, rPos, bCopyAll, pRedlineRange ); } else { @@ -4319,7 +4319,7 @@ static void lcl_PopNumruleState( } bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, - const bool bMakeNewFrames, const bool bCopyAll, + const bool bCopyAll, SwPaM *const pCpyRange ) const { SwDoc* pDoc = rPos.nNode.GetNode().GetDoc(); @@ -4653,13 +4653,13 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, SwNodeIndex aSaveIdx( aInsPos, -1 ); assert(pStt->nNode != pEnd->nNode); pEnd->nContent = 0; // TODO why this? - CopyWithFlyInFly( aRg, aInsPos, &tmp, bMakeNewFrames, false ); + CopyWithFlyInFly( aRg, aInsPos, &tmp, /*bMakeNewFrames*/true, false ); ++aSaveIdx; pEnd->nNode = aSaveIdx; pEnd->nContent.Assign( aSaveIdx.GetNode().GetTextNode(), 0 ); } else - CopyWithFlyInFly( aRg, aInsPos, &tmp, bMakeNewFrames, false ); + CopyWithFlyInFly( aRg, aInsPos, &tmp, /*bMakeNewFrames*/true, false ); bCopyBookmarks = false; } diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index deacc7c61609..7ad9ee7b6f77 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -546,7 +546,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet ) if( !rSet.Count() ) return; - SwModify aCallMod( nullptr ); + SwModify aCallMod; SwAttrSet aOld( GetAttrPool(), rSet.GetRanges() ), aNew( GetAttrPool(), rSet.GetRanges() ); SfxItemIter aIter( rSet ); |