diff options
26 files changed, 106 insertions, 107 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 11039cdb1adc..df092d9ca5d1 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -1862,8 +1862,8 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam ) } } - SwContentNode *pTmpNode = rPam.GetBound( true ).nNode.GetNode().GetContentNode(); - rPam.GetBound( true ).nContent.Assign( pTmpNode, 0 ); + SwContentNode *pTmpNode = rPam.GetBound().nNode.GetNode().GetContentNode(); + rPam.GetBound().nContent.Assign( pTmpNode, 0 ); pTmpNode = rPam.GetBound( false ).nNode.GetNode().GetContentNode(); rPam.GetBound( false ).nContent.Assign( pTmpNode, 0 ); m_rDoc.GetNodes().Delete( aRg.aStart, nNodeDiff+1 ); @@ -2680,7 +2680,7 @@ void DocumentContentOperationsManager::ReRead( SwPaM& rPam, const OUString& rGrf GetMirrorGrf().GetValue() ) pGrfNd->SetAttr( SwMirrorGrf() ); - pGrfNd->ReRead( rGrfName, rFltName, pGraphic, pGrafObj, true ); + pGrfNd->ReRead( rGrfName, rFltName, pGraphic, pGrafObj ); m_rDoc.getIDocumentState().SetModified(); } } diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 08f29a616c20..0672cd082a80 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -1652,7 +1652,7 @@ void DocumentFieldsManager::UpdateDBNumFields( SwDBNameInfField& rDBField, SwCal SwDBData aTmpDBData( rDBField.GetDBData(&m_rDoc) ); - if( pMgr->OpenDataSource( aTmpDBData.sDataSource, aTmpDBData.sCommand, -1, false )) + if( pMgr->OpenDataSource( aTmpDBData.sDataSource, aTmpDBData.sCommand, -1 )) rCalc.VarChange( lcl_GetDBVarName( m_rDoc, rDBField), pMgr->GetSelectedRecordId(aTmpDBData.sDataSource, aTmpDBData.sCommand, aTmpDBData.nCommandType) ); } diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index d838226b58e3..7ded4a6e8cbd 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -439,8 +439,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, rpRange = 0; OUString sItem( INetURLObject::decode( rStr, - INetURLObject::DECODE_WITH_CHARSET, - RTL_TEXTENCODING_UTF8 )); + INetURLObject::DECODE_WITH_CHARSET )); sal_Int32 nPos = sItem.indexOf( cMarkSeparator ); diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 610c95f7f780..f25ab085a1fe 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -257,7 +257,7 @@ namespace if( pCSttNd && !pCEndNd ) { - aPam.GetBound( true ).nContent.Assign( 0, 0 ); + aPam.GetBound().nContent.Assign( 0, 0 ); aPam.GetBound( false ).nContent.Assign( 0, 0 ); aPam.DeleteMark(); rDoc.getIDocumentContentOperations().DelFullPara( aPam ); @@ -367,7 +367,7 @@ namespace if( pCSttNd && !pCEndNd ) { - aPam.GetBound( true ).nContent.Assign( 0, 0 ); + aPam.GetBound().nContent.Assign( 0, 0 ); aPam.GetBound( false ).nContent.Assign( 0, 0 ); aPam.DeleteMark(); rDoc.getIDocumentContentOperations().DelFullPara( aPam ); @@ -500,7 +500,7 @@ namespace const SwPosition* pStt = rPam.Start(), * pEnd = pStt == rPam.GetPoint() ? rPam.GetMark() : rPam.GetPoint(); - const SwRangeRedline* pFnd = rArr.FindAtPosition( *pStt, n, true ); + const SwRangeRedline* pFnd = rArr.FindAtPosition( *pStt, n ); if( pFnd && // Is new a part of it? ( *pFnd->Start() != *pStt || *pFnd->End() > *pEnd )) { @@ -2333,7 +2333,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons // If the starting position points to the last valid ContentNode, // we take the next Redline in any case. sal_uInt16 n = 0; - const SwRangeRedline* pFnd = GetRedlineTable().FindAtPosition( rSttPos, n, true ); + const SwRangeRedline* pFnd = GetRedlineTable().FindAtPosition( rSttPos, n ); if( pFnd ) { const SwPosition* pEnd = pFnd->End(); @@ -2569,7 +2569,7 @@ bool DocumentRedlineManager::SetRedlineComment( const SwPaM& rPaM, const OUStrin * pEnd = pStt == rPaM.GetPoint() ? rPaM.GetMark() : rPaM.GetPoint(); sal_uInt16 n = 0; - if( GetRedlineTable().FindAtPosition( *pStt, n, true ) ) + if( GetRedlineTable().FindAtPosition( *pStt, n ) ) { for( ; n < mpRedlineTable->size(); ++n ) { diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index d06574e9e39f..39f74e727b22 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -1164,7 +1164,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId ) if( !bIsModified ) m_rDoc.getIDocumentState().ResetModified(); pNewFormat->SetPoolFormatId( nId ); - pNewFormat->SetAuto( false ); // no AutoFormat + pNewFormat->SetAuto(); // no AutoFormat } switch( nId ) @@ -1341,7 +1341,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId ) aProtect.SetPosProtect( true ); aSet.Put( aProtect ); - pNewFormat->SetAutoUpdateFormat( true ); + pNewFormat->SetAutoUpdateFormat(); } break; } diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx index 323e4752adf0..1bd077ba2453 100644 --- a/sw/source/core/doc/doccorr.cxx +++ b/sw/source/core/doc/doccorr.cxx @@ -67,7 +67,7 @@ namespace const SwPosition& rNewPos) { bool bRet = false; - bRet |= lcl_PosCorrAbs(rPam.GetBound(true ), rStart, rEnd, rNewPos); + bRet |= lcl_PosCorrAbs(rPam.GetBound(), rStart, rEnd, rNewPos); bRet |= lcl_PosCorrAbs(rPam.GetBound(false), rStart, rEnd, rNewPos); return bRet; }; diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 8663fda3b57b..cdf5f7d516a4 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -603,7 +603,7 @@ void SwDoc::BroadcastStyleOperation(const OUString& rName, SfxStyleFamily eFamil if (pPool) { - pPool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL ); + pPool->SetSearchMask(eFamily); SfxStyleSheetBase * pBase = pPool->Find(rName); if (pBase != NULL) diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 99cf11502345..863222779a01 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -535,7 +535,7 @@ IMPL_LINK_TYPED(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) // Date field pInfo->SetRepresentation( static_cast<const SvxDateField*>( pField)->GetFormatted( - *GetNumberFormatter( true ), LANGUAGE_SYSTEM) ); + *GetNumberFormatter(), LANGUAGE_SYSTEM) ); } else if (pField && pField->ISA(SvxURLField)) { @@ -583,7 +583,7 @@ IMPL_LINK_TYPED(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) // Time field pInfo->SetRepresentation( static_cast<const SvxExtTimeField*>( pField)->GetFormatted( - *GetNumberFormatter( true ), LANGUAGE_SYSTEM) ); + *GetNumberFormatter(), LANGUAGE_SYSTEM) ); } else { diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 81abb44695c2..65934d76bebc 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -406,13 +406,13 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) // If the passed PaM is not in the Crsr ring, // treat it separately (e.g. when it's being called from AutoFormat) - if( pOldTextNd == rPam.GetBound( true ).nContent.GetIdxReg() ) - rPam.GetBound( true ) = aAlphaPos; + if( pOldTextNd == rPam.GetBound().nContent.GetIdxReg() ) + rPam.GetBound() = aAlphaPos; if( pOldTextNd == rPam.GetBound( false ).nContent.GetIdxReg() ) rPam.GetBound( false ) = aAlphaPos; } // delete the Node, at last! - pDoc->GetNodes().Delete( aOldIdx, 1 ); + pDoc->GetNodes().Delete( aOldIdx ); } else { @@ -448,9 +448,9 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) pDoc->CorrRel( aIdx, *rPam.GetPoint(), 0, true ); // #i100466# adjust given <rPam>, if it does not belong to the cursors - if ( pDelNd == rPam.GetBound( true ).nContent.GetIdxReg() ) + if ( pDelNd == rPam.GetBound().nContent.GetIdxReg() ) { - rPam.GetBound( true ) = SwPosition( SwNodeIndex( *pTextNd ), SwIndex( pTextNd ) ); + rPam.GetBound() = SwPosition( SwNodeIndex( *pTextNd ), SwIndex( pTextNd ) ); } if( pDelNd == rPam.GetBound( false ).nContent.GetIdxReg() ) { diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx index e3531caceb14..0a89b4f93fde 100644 --- a/sw/source/core/doc/docfly.cxx +++ b/sw/source/core/doc/docfly.cxx @@ -181,7 +181,7 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFormatAnchor& rAnch, case FLY_AS_CHAR: if( pFlyFormat && rAnch.GetContentAnchor() ) { - const SwFrm* pOld = static_cast<const SwFlyFrameFormat*>(pFlyFormat)->GetFrm( &aRet, false ); + const SwFrm* pOld = static_cast<const SwFlyFrameFormat*>(pFlyFormat)->GetFrm( &aRet ); if( pOld ) aRet = pOld->Frm().Pos(); } @@ -204,7 +204,7 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFormatAnchor& rAnch, { const SwFlyFrameFormat* pFormat = static_cast<SwFlyFrameFormat*>(rAnch.GetContentAnchor()-> nNode.GetNode().GetFlyFormat()); - const SwFrm* pOld = pFormat ? pFormat->GetFrm( &aRet, false ) : 0; + const SwFrm* pOld = pFormat ? pFormat->GetFrm( &aRet ) : 0; if( pOld ) aRet = pOld->Frm().Pos(); } @@ -752,7 +752,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList, : aPt; // allow drawing objects in header/footer - pNewAnchorFrm = ::FindAnchor( pOldAnchorFrm, aNewPoint, false ); + pNewAnchorFrm = ::FindAnchor( pOldAnchorFrm, aNewPoint ); if ( pNewAnchorFrm->IsTextFrm() && static_cast<const SwTextFrm*>(pNewAnchorFrm)->IsFollow() ) { pNewAnchorFrm = static_cast<const SwTextFrm*>(pNewAnchorFrm)->FindMaster(); @@ -823,7 +823,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList, else // Change of anchors { // allow drawing objects in header/footer - pNewAnchorFrm = ::FindAnchor( pOldAnchorFrm, aPt, false ); + pNewAnchorFrm = ::FindAnchor( pOldAnchorFrm, aPt ); if( pNewAnchorFrm->IsProtected() ) { pNewAnchorFrm = 0; diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index d438f5379812..32e3a2db6bc6 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -852,7 +852,7 @@ SwCharFormat *SwDoc::MakeCharFormat( const OUString &rFormatName, { SwCharFormat *pFormat = new SwCharFormat( GetAttrPool(), rFormatName, pDerivedFrom ); mpCharFormatTable->push_back( pFormat ); - pFormat->SetAuto( false ); + pFormat->SetAuto(); getIDocumentState().SetModified(); if (GetIDocumentUndoRedo().DoesUndo()) @@ -889,7 +889,7 @@ SwTextFormatColl* SwDoc::MakeTextFormatColl( const OUString &rFormatName, SwTextFormatColl *pFormatColl = new SwTextFormatColl( GetAttrPool(), rFormatName, pDerivedFrom ); mpTextFormatCollTable->push_back(pFormatColl); - pFormatColl->SetAuto( false ); + pFormatColl->SetAuto(); getIDocumentState().SetModified(); if (GetIDocumentUndoRedo().DoesUndo()) @@ -923,7 +923,7 @@ SwConditionTextFormatColl* SwDoc::MakeCondTextFormatColl( const OUString &rForma SwConditionTextFormatColl*pFormatColl = new SwConditionTextFormatColl( GetAttrPool(), rFormatName, pDerivedFrom ); mpTextFormatCollTable->push_back(pFormatColl); - pFormatColl->SetAuto( false ); + pFormatColl->SetAuto(); getIDocumentState().SetModified(); if (GetIDocumentUndoRedo().DoesUndo()) @@ -948,7 +948,7 @@ SwGrfFormatColl* SwDoc::MakeGrfFormatColl( const OUString &rFormatName, SwGrfFormatColl *pFormatColl = new SwGrfFormatColl( GetAttrPool(), rFormatName, pDerivedFrom ); mpGrfFormatCollTable->push_back( pFormatColl ); - pFormatColl->SetAuto( false ); + pFormatColl->SetAuto(); getIDocumentState().SetModified(); return pFormatColl; } @@ -1129,7 +1129,7 @@ SwFormat* SwDoc::CopyFormat( const SwFormat& rFormat, // #i40550# SwFormat* pNewFormat = (this->*fnCopyFormat)( rFormat.GetName(), pParent, false, true ); pNewFormat->SetAuto( rFormat.IsAuto() ); - pNewFormat->CopyAttrs( rFormat, true ); // copy the attributes + pNewFormat->CopyAttrs( rFormat ); // copy the attributes pNewFormat->SetPoolFormatId( rFormat.GetPoolFormatId() ); pNewFormat->SetPoolHelpId( rFormat.GetPoolHelpId() ); @@ -1173,7 +1173,7 @@ SwTextFormatColl* SwDoc::CopyTextColl( const SwTextFormatColl& rColl ) pNewColl = new SwConditionTextFormatColl( GetAttrPool(), rColl.GetName(), pParent); mpTextFormatCollTable->push_back( pNewColl ); - pNewColl->SetAuto( false ); + pNewColl->SetAuto(); getIDocumentState().SetModified(); // copy the conditions @@ -1185,7 +1185,7 @@ SwTextFormatColl* SwDoc::CopyTextColl( const SwTextFormatColl& rColl ) pNewColl = MakeTextFormatColl( rColl.GetName(), pParent ); // copy the auto formats or the attributes - pNewColl->CopyAttrs( rColl, true ); + pNewColl->CopyAttrs( rColl ); if(rColl.IsAssignedToListLevelOfOutlineStyle()) pNewColl->AssignToListLevelOfOutlineStyle(rColl.GetAssignedOutlineStyleLevel()); @@ -1281,7 +1281,7 @@ void SwDoc::CopyFormatArr( const SwFormatsBase& rSourceArr, continue; pDest = FindFormatByName( rDestArr, pSrc->GetName() ); - pDest->SetAuto( false ); + pDest->SetAuto(); pDest->DelDiffs( *pSrc ); // #i94285#: existing <SwFormatPageDesc> instance, before copying attributes @@ -1362,7 +1362,7 @@ void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader, { SwFrameFormat* pNewFormat = new SwFrameFormat( GetAttrPool(), "CpyDesc", GetDfltFrameFormat() ); - pNewFormat->CopyAttrs( *pOldFormat, true ); + pNewFormat->CopyAttrs( *pOldFormat ); if( SfxItemState::SET == pNewFormat->GetAttrSet().GetItemState( RES_CNTNT, false, &pItem )) @@ -1723,7 +1723,7 @@ SwTableNumFormatMerge::SwTableNumFormatMerge( const SwDoc& rSrc, SwDoc& rDest ) // a different Doc -> Number formatter needs to be merged SvNumberFormatter* pN; if( &rSrc != &rDest && 0 != ( pN = const_cast<SwDoc&>(rSrc).GetNumberFormatter( false ) )) - ( pNFormat = rDest.GetNumberFormatter( true ))->MergeFormatter( *pN ); + ( pNFormat = rDest.GetNumberFormatter())->MergeFormatter( *pN ); if( &rSrc != &rDest ) static_cast<SwGetRefFieldType*>(rSrc.getIDocumentFieldsAccess().GetSysFieldType( RES_GETREFFLD ))-> @@ -1818,10 +1818,10 @@ void SwDoc::SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& rSet } whichIds.push_back(0); SfxItemSet currentSet(GetAttrPool(), &whichIds[0]); - pTNd->GetAttr(currentSet, nEnd, nEnd, false, true, false); + pTNd->GetAttr(currentSet, nEnd, nEnd, false, true); for (size_t i = 0; whichIds[i]; i += 2) { // yuk - want to explicitly set the pool defaults too :-/ - currentSet.Put(currentSet.Get(whichIds[i], true)); + currentSet.Put(currentSet.Get(whichIds[i])); } getIDocumentContentOperations().InsertItemSet( rPam, rSet, SetAttrMode::DONTEXPAND ); diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index d2f129b334d9..b6991e44ad30 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -63,7 +63,7 @@ enum SwSplitDocType bool SwDoc::GenerateGlobalDoc( const OUString& rPath, const SwTextFormatColl* pSplitColl ) { - return SplitDoc( SPLITDOC_TO_GLOBALDOC, rPath, false, pSplitColl, 0 ); + return SplitDoc( SPLITDOC_TO_GLOBALDOC, rPath, false, pSplitColl ); } bool SwDoc::GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel ) @@ -79,7 +79,7 @@ bool SwDoc::GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel ) bool SwDoc::GenerateHTMLDoc( const OUString& rPath, const SwTextFormatColl* pSplitColl ) { - return SplitDoc( SPLITDOC_TO_HTML, rPath, false, pSplitColl, 0 ); + return SplitDoc( SPLITDOC_TO_HTML, rPath, false, pSplitColl ); } // two helpers for outline mode @@ -308,7 +308,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 2 ); if( aIdx.GetIndex() + 1 != pDoc->GetNodes().GetEndOfContent().GetIndex() ) - pDoc->GetNodes().Delete( aIdx, 1 ); + pDoc->GetNodes().Delete( aIdx ); // All Flys in the section GetDocumentContentOperationsManager().CopyFlyInFlyImpl( aRg, 0, aIdx ); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 621c4bf040b9..214187c48366 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -416,7 +416,7 @@ SwFlyFrameFormat* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rS OSL_ENSURE( aIndex.GetNode().GetTextNode(), "a TextNode should be here" ); aPos.nContent.Assign( 0, 0 ); // Deregister index! - GetNodes().Delete( aIndex, 1 ); + GetNodes().Delete( aIndex ); // This is a hack: whilst FlyFrames/Headers/Footers are not undoable we delete all Undo objects if( GetIDocumentUndoRedo().DoesUndo() ) diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 548bd633358b..51a30ba125b9 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -1000,11 +1000,11 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu SwPaM aInsertPam( aTargetIdx ); #ifdef DBG_UTIL - SAL_INFO( "sw.docappend", "Pam-Nd: " << aCpyPam.GetNode( true ).GetIndex() - aCpyPam.GetNode( false ).GetIndex() + 1 + SAL_INFO( "sw.docappend", "Pam-Nd: " << aCpyPam.GetNode().GetIndex() - aCpyPam.GetNode( false ).GetIndex() + 1 << " (0x" << std::hex << (int) aCpyPam.GetNode( false ).GetNodeType() << std::dec << " " << aCpyPam.GetNode( false ).GetIndex() - << " - 0x" << std::hex << (int) aCpyPam.GetNode( true ).GetNodeType() << std::dec - << " " << aCpyPam.GetNode( true ).GetIndex() << ")" ); + << " - 0x" << std::hex << (int) aCpyPam.GetNode().GetNodeType() << std::dec + << " " << aCpyPam.GetNode().GetIndex() << ")" ); #endif this->GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL ); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 62e18943e9e8..c45a7ef04170 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1934,7 +1934,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv ) SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTable()[ n ]; SwPosition* pPos; - if( ( pPos = &pTmp->GetBound(true))->nNode == aIdx ) + if( ( pPos = &pTmp->GetBound())->nNode == aIdx ) { ++pPos->nNode; pPos->nContent.Assign( pPos->nNode.GetNode().GetContentNode(),0); @@ -1945,7 +1945,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv ) pPos->nContent.Assign( pPos->nNode.GetNode().GetContentNode(),0); } } - CorrRel( aIdx, aInsPos, 0, false ); + CorrRel( aIdx, aInsPos, 0 ); if (pCNd) pCNd->JoinNext(); @@ -1970,7 +1970,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv ) // prevent assertion from aPam's target being deleted // (Alternatively, one could just let aPam go out of scope, but // that requires touching a lot of code.) - aPam.GetBound(true).nContent.Assign( NULL, 0 ); + aPam.GetBound().nContent.Assign( NULL, 0 ); aPam.GetBound(false).nContent.Assign( NULL, 0 ); getIDocumentRedlineAccess().AppendRedline( pNewRedline, true ); diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 0bc2a80e4938..0a71de7c7ba6 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -1135,8 +1135,8 @@ void SwRangeRedline::MoveToSection() for( SwRedlineTable::size_type n = 0; n < rTable.size(); ++n ) { SwRangeRedline* pRedl = rTable[ n ]; - if( pRedl->GetBound(true) == *pStt ) - pRedl->GetBound(true) = *pEnd; + if( pRedl->GetBound() == *pStt ) + pRedl->GetBound() = *pEnd; if( pRedl->GetBound(false) == *pStt ) pRedl->GetBound(false) = *pEnd; } @@ -1285,8 +1285,8 @@ void SwRangeRedline::DelCopyOfSection(size_t nMyPos) for( SwRedlineTable::size_type n = 0; n < rTable.size(); ++n ) { SwRangeRedline* pRedl = rTable[ n ]; - if( pRedl->GetBound(true) == *pStt ) - pRedl->GetBound(true) = *pEnd; + if( pRedl->GetBound() == *pStt ) + pRedl->GetBound() = *pEnd; if( pRedl->GetBound(false) == *pStt ) pRedl->GetBound(false) = *pEnd; } @@ -1318,9 +1318,9 @@ void SwRangeRedline::DelCopyOfSection(size_t nMyPos) { --n; bBreak = true; - if( rTable[ n ]->GetBound(true) == *aPam.GetPoint() ) + if( rTable[ n ]->GetBound() == *aPam.GetPoint() ) { - rTable[ n ]->GetBound(true) = *pEnd; + rTable[ n ]->GetBound() = *pEnd; bBreak = false; } if( rTable[ n ]->GetBound(false) == *aPam.GetPoint() ) @@ -1335,7 +1335,7 @@ void SwRangeRedline::DelCopyOfSection(size_t nMyPos) *GetMark() = *pEnd; DeleteMark(); - aPam.GetBound( true ).nContent.Assign( 0, 0 ); + aPam.GetBound().nContent.Assign( 0, 0 ); aPam.GetBound( false ).nContent.Assign( 0, 0 ); aPam.DeleteMark(); pDoc->getIDocumentContentOperations().DelFullPara( aPam ); @@ -1367,10 +1367,10 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos) for( n = nMyPos+1; !bBreak && n < rTable.size(); ++n ) { bBreak = true; - if( rTable[ n ]->GetBound(true) == *GetPoint() ) + if( rTable[ n ]->GetBound() == *GetPoint() ) { SwRangeRedline* pRedl = rTable[n]; - aBehindArr.push_back(&pRedl->GetBound(true)); + aBehindArr.push_back(&pRedl->GetBound()); bBreak = false; } if( rTable[ n ]->GetBound(false) == *GetPoint() ) @@ -1384,10 +1384,10 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos) { --n; bBreak = true; - if( rTable[ n ]->GetBound(true) == *GetPoint() ) + if( rTable[ n ]->GetBound() == *GetPoint() ) { SwRangeRedline* pRedl = rTable[n]; - aBeforeArr.push_back(&pRedl->GetBound(true)); + aBeforeArr.push_back(&pRedl->GetBound()); bBreak = false; } if( rTable[ n ]->GetBound(false) == *GetPoint() ) diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index a7e5f41c6398..a492b4602909 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -353,7 +353,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt) pRedlPam->GetMark()->nContent.Assign( pCNd, 0 ); pRedlPam->GetPoint()->nNode.Assign( aEndIdx.GetNode() ); - pCNd = pRedlPam->GetContentNode( true ); + pCNd = pRedlPam->GetContentNode(); sal_Int32 nCLen = 0; if( !pCNd && 0 != (pCNd = GetNodes()[ aEndIdx.GetIndex()-1 ]->GetContentNode())) @@ -735,7 +735,7 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar, // If first Node is empty -> delete it if(bDelFirst) - pDoc->GetNodes().Delete( aTar, 1 ); + pDoc->GetNodes().Delete( aTar ); } /// Generate two-dimensional array of FndBoxes diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 155dee47db2b..0f53a03812d9 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -623,7 +623,7 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType, for( auto pSectionFormat : *mpSectionFormatTable ) { - const SwSectionNode *pSectNd = pSectionFormat->GetSectionNode( false ); + const SwSectionNode *pSectNd = pSectionFormat->GetSectionNode(); if ( !pSectNd ) continue; @@ -839,7 +839,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr, // find the first layout node for this TOX, if it only find the content // in his own chapter const SwTextNode* pOwnChapterNode = IsFromChapter() - ? ::lcl_FindChapterNode( *pSectNd, 0 ) + ? ::lcl_FindChapterNode( *pSectNd ) : 0; SwNode2Layout aN2L( *pSectNd ); @@ -1020,7 +1020,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr, sal_uLong nIdx = pSectNd->GetIndex(); // don't delete if index is empty if(nIdx + 2 < pSectNd->EndOfSectionIndex()) - pDoc->GetNodes().Delete( aInsPos, 1 ); + pDoc->GetNodes().Delete( aInsPos ); aN2L.RestoreUpperFrms( pDoc->GetNodes(), nIdx, nIdx + 1 ); std::set<SwRootFrm*> aAllLayouts = pDoc->GetAllLayouts(); @@ -1151,7 +1151,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl, if( pTOXSrc->GetNodes().IsDocNodes() && pTOXSrc->GetText().getLength() && pTOXSrc->HasWriterListeners() && pTOXSrc->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) && - (!IsFromChapter() || ::lcl_FindChapterNode( *pTOXSrc, 0 ) == pOwnChapterNode ) && + (!IsFromChapter() || ::lcl_FindChapterNode( *pTOXSrc ) == pOwnChapterNode ) && !pTOXSrc->HasHiddenParaField() && !SwScriptInfo::IsInHiddenRange( *pTOXSrc, pTextMark->GetStart() ) ) { @@ -1212,7 +1212,7 @@ void SwTOXBaseSection::UpdateOutline( const SwTextNode* pOwnChapterNode ) !pTextNd->HasHiddenParaField() && !pTextNd->HasHiddenCharAttribute( true ) && ( !IsFromChapter() || - ::lcl_FindChapterNode( *pTextNd, 0 ) == pOwnChapterNode )) + ::lcl_FindChapterNode( *pTextNd ) == pOwnChapterNode )) { SwTOXPara * pNew = new SwTOXPara( *pTextNd, nsSwTOXElement::TOX_OUTLINELEVEL ); InsertSorted( pNew ); @@ -1251,7 +1251,7 @@ void SwTOXBaseSection::UpdateTemplate( const SwTextNode* pOwnChapterNode ) pTextNd->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) && pTextNd->GetNodes().IsDocNodes() && ( !IsFromChapter() || pOwnChapterNode == - ::lcl_FindChapterNode( *pTextNd, 0 ) ) ) + ::lcl_FindChapterNode( *pTextNd ) ) ) { SwTOXPara * pNew = new SwTOXPara( *pTextNd, nsSwTOXElement::TOX_TEMPLATE, i + 1 ); InsertSorted(pNew); @@ -1282,7 +1282,7 @@ void SwTOXBaseSection::UpdateSequence( const SwTextNode* pOwnChapterNode ) rTextNode.getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) && rTextNode.GetNodes().IsDocNodes() && ( !IsFromChapter() || - ::lcl_FindChapterNode( rTextNode, 0 ) == pOwnChapterNode ) ) + ::lcl_FindChapterNode( rTextNode ) == pOwnChapterNode ) ) { const SwSetExpField& rSeqField = dynamic_cast<const SwSetExpField&>(*(pFormatField->GetField())); const OUString sName = GetSequenceName() @@ -1475,7 +1475,7 @@ void SwTOXBaseSection::UpdateContent( SwTOXElement eMyType, } if( pCNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) && ( !IsFromChapter() || - ::lcl_FindChapterNode( *pCNd, 0 ) == pOwnChapterNode )) + ::lcl_FindChapterNode( *pCNd ) == pOwnChapterNode )) { SwTOXPara * pNew = new SwTOXPara( *pCNd, eMyType, ( USHRT_MAX != nSetLevel ) @@ -1513,7 +1513,7 @@ void SwTOXBaseSection::UpdateTable( const SwTextNode* pOwnChapterNode ) aContentIdx.GetIndex() < pTableNd->EndOfSectionIndex() ) { if( pCNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) && (!IsFromChapter() || - ::lcl_FindChapterNode( *pCNd, 0 ) == pOwnChapterNode )) + ::lcl_FindChapterNode( *pCNd ) == pOwnChapterNode )) { SwTOXTable * pNew = new SwTOXTable( *pCNd ); if( IsLevelFromChapter() && TOX_TABLES != SwTOXBase::GetType()) diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx index c65ec4d42cf8..ff90fa42fca9 100644 --- a/sw/source/core/doc/ftnidx.cxx +++ b/sw/source/core/doc/ftnidx.cxx @@ -288,7 +288,7 @@ const SwSectionNode* SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr( const SwSectionNode* pNd = rTextFootnote.GetTextNode().FindSectionNode(); while( pNd && FTNEND_ATTXTEND_OWNNUMSEQ != ( nVal = static_cast<const SwFormatFootnoteEndAtTextEnd&>(pNd->GetSection().GetFormat()-> - GetFormatAttr( nWh, true )).GetValue() ) && + GetFormatAttr( nWh )).GetValue() ) && FTNEND_ATTXTEND_OWNNUMANDFMT != nVal ) pNd = pNd->StartOfSectionNode()->FindSectionNode(); diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index 62ae12cb2238..760de5226391 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -553,7 +553,7 @@ static void lcl_CpyBox( const SwTable& rCpyTable, const SwTableBox* pCpyBox, SwPosition aMvPos( aInsIdx ); SwContentNode* pCNd = SwNodes::GoPrevious( &aMvPos.nNode ); aMvPos.nContent.Assign( pCNd, pCNd->Len() ); - SwDoc::CorrAbs( aInsIdx, aEndNdIdx, aMvPos, false ); + SwDoc::CorrAbs( aInsIdx, aEndNdIdx, aMvPos ); } // If we still have FlyFrames hanging around, delete them too @@ -681,7 +681,7 @@ bool SwTable::InsNewTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes if( pUndo ) pUndo->InsertRow( *this, aBoxes, aTarget.mnAddLine ); else - InsertRow( pDoc, aBoxes, aTarget.mnAddLine, true ); + InsertRow( pDoc, aBoxes, aTarget.mnAddLine ); aTarget.moreLines( *this ); bClear = true; @@ -884,9 +884,9 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes, if( pUndo ? !pUndo->InsertRow( *this, SelLineFromBox( pInsBox, - aBoxes, true ), nNewLns ) + aBoxes ), nNewLns ) : !InsertRow( pDoc, SelLineFromBox( pInsBox, - aBoxes, true ), nNewLns, true ) ) + aBoxes ), nNewLns ) ) return false; } @@ -990,7 +990,7 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes, // Delete the Frames aFndBox.SetTableLines( *this ); //Not dispose accessible table - aFndBox.DelFrms( *this,false ); + aFndBox.DelFrms( *this ); if( 1 == rCpyTable.GetTabSortBoxes().size() ) { diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index c4986f5b28b0..ec0070f928cb 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -1162,7 +1162,7 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn pLastBox = pNewLine->GetTabBoxes()[0]; // reset SwNodeIndex aInsPos( *pLastBox->GetSttNd(), 1 ); pDoc->GetNodes()._MoveNodes(aRg, pDoc->GetNodes(), aInsPos, false); - pDoc->GetNodes().Delete( aInsPos, 1 ); // delete the empty one + pDoc->GetNodes().Delete( aInsPos ); // delete the empty one } } } @@ -1915,7 +1915,7 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara) pFromDoc->GetDocumentContentOperationsManager().CopyWithFlyInFly( aCpyRg, 0, aInsIdx, NULL, false ); // Delete the initial TextNode - pCpyPara->pDoc->GetNodes().Delete( aInsIdx, 1 ); + pCpyPara->pDoc->GetNodes().Delete( aInsIdx ); } ++pCpyPara->nInsPos; } @@ -2003,7 +2003,7 @@ bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTableNd ) SwSelBoxes aSelBoxes; SwTableBox* pBox = GetTabSortBoxes()[ 0 ]; pBox = GetTableBox( pBox->GetSttNd()->StartOfSectionNode()->GetIndex() + 1 ); - SelLineFromBox( pBox, aSelBoxes, true ); + SelLineFromBox( pBox, aSelBoxes ); _FndBox aFndBox( 0, 0 ); { diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 22f4a5f34941..e4a760efa6bf 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -1264,12 +1264,12 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c pNewSect->SetCondition( GetSection().GetCondition() ); pNewSect->SetLinkFileName( GetSection().GetLinkFileName() ); if( !pNewSect->IsHiddenFlag() && GetSection().IsHidden() ) - pNewSect->SetHidden( true ); + pNewSect->SetHidden(); if( !pNewSect->IsProtectFlag() && GetSection().IsProtect() ) - pNewSect->SetProtect( true ); + pNewSect->SetProtect(); // edit in readonly sections if( !pNewSect->IsEditInReadonlyFlag() && GetSection().IsEditInReadonly() ) - pNewSect->SetEditInReadonly( true ); + pNewSect->SetEditInReadonly(); SwNodeRange aRg( *this, +1, *EndOfSectionNode() ); // Where am I? rNds._Copy( aRg, aInsPos, false ); @@ -1400,7 +1400,7 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const for( auto pFormat : *mpSectionFormatTable ) { - const SwSectionNode *const pSectNd = pFormat->GetSectionNode( false ); + const SwSectionNode *const pSectNd = pFormat->GetSectionNode(); if( pSectNd != nullptr ) { const OUString rNm = pSectNd->GetSection().GetSectionName(); diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 2ec5f3dc12e8..70b56363b4a0 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -168,7 +168,7 @@ lcl_SetDfltBoxAttr(SwTableBox& rBox, DfltBoxAttrList_t & rBoxFormatArr, if( pAutoFormat ) pAutoFormat->UpdateToSet( nId, (SfxItemSet&)pNewTableBoxFormat->GetAttrSet(), SwTableAutoFormat::UPDATE_BOX, - pDoc->GetNumberFormatter( true ) ); + pDoc->GetNumberFormatter() ); else ::lcl_SetDfltBoxAttr( *pNewTableBoxFormat, nId ); @@ -201,7 +201,7 @@ static SwTableBoxFormat *lcl_CreateAFormatBoxFormat( SwDoc &rDoc, std::vector<Sw SwTableBoxFormat* pBoxFormat = rDoc.MakeTableBoxFormat(); rAutoFormat.UpdateToSet( nId, (SfxItemSet&)pBoxFormat->GetAttrSet(), SwTableAutoFormat::UPDATE_BOX, - rDoc.GetNumberFormatter( true ) ); + rDoc.GetNumberFormatter( ) ); if( USHRT_MAX != nCols ) pBoxFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, USHRT_MAX / nCols, 0 )); @@ -1875,7 +1875,7 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor ) pDelBox = pLn->GetTabBoxes().back(); } SwTableBox* pNextBox = pDelLine->FindNextBox( pTableNd->GetTable(), - pDelBox, true ); + pDelBox ); while( pNextBox && pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() ) pNextBox = pNextBox->FindNextBox( pTableNd->GetTable(), pNextBox ); @@ -1887,7 +1887,7 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor ) while( !pDelBox->GetSttNd() ) pDelBox = pDelBox->GetTabLines()[0]->GetTabBoxes()[0]; pNextBox = pDelLine->FindPreviousBox( pTableNd->GetTable(), - pDelBox, true ); + pDelBox ); while( pNextBox && pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() ) pNextBox = pNextBox->FindPreviousBox( pTableNd->GetTable(), pNextBox ); @@ -2693,8 +2693,8 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* , OSL_ENSURE( rFill.Count(), "Deleting from empty vector. Fasten your seatbelts!" ); // #i60818# There may be only one entry in rFill. Make // code robust by checking count of rFill. - if ( rFill.Count() ) rFill.Remove( 0, 1 ); - if ( rFill.Count() ) rFill.Remove( rFill.Count() - 1 , 1 ); + if ( rFill.Count() ) rFill.Remove( 0 ); + if ( rFill.Count() ) rFill.Remove( rFill.Count() - 1 ); rFill.SetLastRowAllowedToChange( !pTab->HasFollowFlowLine() ); } @@ -3688,7 +3688,7 @@ static bool lcl_SetAFormatBox( _FndBox & rBox, _SetAFormatTabPara *pSetPara ) SwTableAutoFormat::UPDATE_CHAR, 0 ); pSetPara->rTableFormat.UpdateToSet( nPos, aBoxSet, SwTableAutoFormat::UPDATE_BOX, - pDoc->GetNumberFormatter( true ) ); + pDoc->GetNumberFormatter() ); if( aCharSet.Count() ) { sal_uLong nSttNd = pSetBox->GetSttIdx()+1; @@ -3876,7 +3876,7 @@ bool SwDoc::GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGe SwTableAutoFormat::UPDATE_CHAR, 0 ); rGet.UpdateFromSet( nPos, pFBox->GetFrameFormat()->GetAttrSet(), SwTableAutoFormat::UPDATE_BOX, - GetNumberFormatter( true ) ); + GetNumberFormatter() ); } } diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index b8382bbf319b..75537b5920a5 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1668,7 +1668,7 @@ bool SwContentNode::GetAttr( SfxItemSet& rSet, bool bInParent ) const const SwAttrSet& rAttrSet = GetSwAttrSet(); if( bInParent ) - return rSet.Set( rAttrSet, true ); + return rSet.Set( rAttrSet ); rSet.Put( rAttrSet ); return rSet.Count() != 0; diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 71704fc0db07..7cf97fcfa04b 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -915,7 +915,7 @@ void SwNodes::SectionDown(SwNodeRange *pRange, SwStartNodeType eSttNdTyp ) SwNodeIndex aTmpIdx( *pAktNode->StartOfSectionNode() ); if( pAktNode->GetEndNode() ) - DelNodes( pRange->aStart, 1 ); // prevent empty section + DelNodes( pRange->aStart ); // prevent empty section else { // insert a new StartNode @@ -929,7 +929,7 @@ void SwNodes::SectionDown(SwNodeRange *pRange, SwStartNodeType eSttNdTyp ) // For other nodes, insert a new end node. --pRange->aEnd; if( pRange->aEnd.GetNode().GetStartNode() ) - DelNodes( pRange->aEnd, 1 ); + DelNodes( pRange->aEnd ); else { ++pRange->aEnd; @@ -988,10 +988,10 @@ void SwNodes::SectionUp(SwNodeRange *pRange) } return ; } - DelNodes( pRange->aStart, 1 ); + DelNodes( pRange->aStart ); } else if( aIdx == pRange->aStart.GetIndex()-1 ) // before StartNode - DelNodes( aIdx, 1 ); + DelNodes( aIdx ); else new SwEndNode( pRange->aStart, *aIdx.GetNode().GetStartNode() ); @@ -1000,7 +1000,7 @@ void SwNodes::SectionUp(SwNodeRange *pRange) // For other nodes, insert a new end node. SwNodeIndex aTmpIdx( pRange->aEnd ); if( pRange->aEnd.GetNode().IsEndNode() ) - DelNodes( pRange->aEnd, 1 ); + DelNodes( pRange->aEnd ); else { new SwStartNode( pRange->aEnd ); @@ -1767,7 +1767,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange, SwStartNode* pSttNd = aRg.aStart.GetNode().GetStartNode(); _CopyNodes( SwNodeRange( *pSttNd, + 1, *pSttNd->EndOfSectionNode() ), - aInsPos, bNewFrms, false ); + aInsPos, bNewFrms ); // insert a DummyNode for the box-EndNode? if( bTableInsDummyNode ) diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 52ec387a4d14..360eded8a934 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -207,7 +207,7 @@ SwSection::SwSection( { if( pParentSect->IsHiddenFlag() ) { - SetHidden( true ); + SetHidden(); } m_Data.SetProtectFlag( pParentSect->IsProtectFlag() ); @@ -524,7 +524,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) if( bUpdateFootnote ) { - SwSectionNode* pSectNd = GetFormat()->GetSectionNode( false ); + SwSectionNode* pSectNd = GetFormat()->GetSectionNode(); if( pSectNd ) pSectNd->GetDoc()->GetFootnoteIdxs().UpdateFootnote(SwNodeIndex( *pSectNd )); } @@ -1185,7 +1185,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) ::sfx2::SvBaseLink::UpdateResult SwIntrnlSectRefLink::DataChanged( const OUString& rMimeType, const uno::Any & rValue ) { - SwSectionNode* pSectNd = rSectFormat.GetSectionNode( false ); + SwSectionNode* pSectNd = rSectFormat.GetSectionNode(); SwDoc* pDoc = rSectFormat.GetDoc(); SotClipboardFormatId nDataFormat = SotExchange::GetFormatIdFromMimeType( rMimeType ); @@ -1290,7 +1290,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) if( nRet ) { - rSection.SetConnectFlag(true); + rSection.SetConnectFlag(); SwNodeIndex aSave( pPam->GetPoint()->nNode, -1 ); SwNodeRange* pCpyRg = 0; @@ -1378,7 +1378,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) pPam->SetMark(); // Rewire both SwPositions pDoc->CorrAbs( aSave, *pPam->GetPoint(), 0, true ); - pDoc->GetNodes().Delete( aSave, 1 ); + pDoc->GetNodes().Delete( aSave ); } delete pCpyRg; } @@ -1423,7 +1423,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) if( !IsError( aTmpReader.Read( *pRead ) )) { - rSection.SetConnectFlag(true); + rSection.SetConnectFlag(); } if( pESh ) @@ -1483,7 +1483,7 @@ void SwIntrnlSectRefLink::Closed() pDoc->UpdateSection( n, aSectionData ); // Make all Links within the Section visible again - SwSectionNode* pSectNd = rSectFormat.GetSectionNode( false ); + SwSectionNode* pSectNd = rSectFormat.GetSectionNode(); if( pSectNd ) SwSection::MakeChildLinksVisible( *pSectNd ); @@ -1591,13 +1591,13 @@ void SwSection::BreakLink() const SwNode* SwIntrnlSectRefLink::GetAnchor() const { - return rSectFormat.GetSectionNode( false ); + return rSectFormat.GetSectionNode(); } bool SwIntrnlSectRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 , sal_Int32 ) const { - SwStartNode* pSttNd = rSectFormat.GetSectionNode( false ); + SwStartNode* pSttNd = rSectFormat.GetSectionNode(); return pSttNd && nSttNd < pSttNd->GetIndex() && pSttNd->EndOfSectionIndex() < nEndNd; |