diff options
Diffstat (limited to 'sw/source/core')
32 files changed, 61 insertions, 66 deletions
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 7dae7b639ddc..4d27552442e8 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -1365,7 +1365,7 @@ bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj, pFEShell->IsObjSelected()) ) { Point aPt( LONG_MIN, LONG_MIN ); - pFEShell->SelectObj( aPt, 0 ); + pFEShell->SelectObj( aPt ); bCallShowCrsr = true; } pCrsrShell->KillPams(); diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 19bd9dd300df..7473c41cca27 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -524,7 +524,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns ) OUString sSourceName(sDBName.getToken(0, DB_DELIM)); OUString sTableName(sDBName.getToken(0, ';').getToken(1, DB_DELIM)); if( pMgr && !sSourceName.isEmpty() && !sTableName.isEmpty() && - pMgr->OpenDataSource(sSourceName, sTableName, -1)) + pMgr->OpenDataSource(sSourceName, sTableName)) { OUString sColumnName( GetColumnName( sTmpName )); OSL_ENSURE(!sColumnName.isEmpty(), "Missing DB column name"); @@ -587,7 +587,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns ) OUString sSourceName(sDBName.getToken(0, DB_DELIM)); OUString sTableName(sDBName.getToken(0, ';').getToken(1, DB_DELIM)); if( pMgr && !sSourceName.isEmpty() && !sTableName.isEmpty() && - pMgr->OpenDataSource(sSourceName, sTableName, -1) && + pMgr->OpenDataSource(sSourceName, sTableName) && !pMgr->IsInMerge()) { pNewExp->nValue.PutULong( pMgr->GetSelectedRecordId(sSourceName, sTableName)); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 4ddf5eb390f3..ca3a46a89a44 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -845,7 +845,7 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock ) bRet = CRSR_POSOLD; else { - UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE ); + UpdateCrsr(); bRet &= ~CRSR_POSOLD; } } diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 5c148360981f..cec7dedc750a 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -1656,7 +1656,7 @@ void DocumentFieldsManager::UpdateDBNumFields( SwDBNameInfField& rDBField, SwCal SwDBData aTmpDBData( rDBField.GetDBData(&m_rDoc) ); - if( pMgr->OpenDataSource( aTmpDBData.sDataSource, aTmpDBData.sCommand, -1 )) + if( pMgr->OpenDataSource( aTmpDBData.sDataSource, aTmpDBData.sCommand )) rCalc.VarChange( lcl_GetDBVarName( m_rDoc, rDBField), pMgr->GetSelectedRecordId(aTmpDBData.sDataSource, aTmpDBData.sCommand, aTmpDBData.nCommandType) ); } diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 545f8500d1f3..4a6d7b31f008 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -286,7 +286,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg, { nPtPos = nMkPos = rSt.GetIndex(); if( bTextAttr ) - pTextNd->DontExpandFormat( rSt, true ); + pTextNd->DontExpandFormat( rSt ); } } @@ -1820,7 +1820,7 @@ 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); + pTNd->GetAttr(currentSet, nEnd, nEnd); for (size_t i = 0; whichIds[i]; i += 2) { // yuk - want to explicitly set the pool defaults too :-/ currentSet.Put(currentSet.Get(whichIds[i])); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index eb266f6cc686..7419d871f7e8 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -225,7 +225,7 @@ SwFlyFrameFormat* SwDoc::_MakeFlySection( const SwPosition& rAnchPos, else { if( eRequestId != aAnch.GetAnchorId() && - SfxItemState::SET != pFormat->GetItemState( RES_ANCHOR, true ) ) + SfxItemState::SET != pFormat->GetItemState( RES_ANCHOR ) ) { aAnch.SetType( eRequestId ); } @@ -733,7 +733,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable, /* #i6447#: Only the selected items are copied from the old format. */ - SfxItemSet* pNewSet = pNewFormat->GetAttrSet().Clone( true ); + SfxItemSet* pNewSet = pNewFormat->GetAttrSet().Clone(); // Copy only the set attributes. // The others should apply from the Templates. @@ -755,14 +755,14 @@ lcl_InsertLabel(SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable, GetItemState( RES_BOX, true, &pItem )) pNewSet->Put( *pItem ); else if( SfxItemState::SET == pNewFormat->GetAttrSet(). - GetItemState( RES_BOX, true )) + GetItemState( RES_BOX )) pNewSet->Put( *GetDfltAttr( RES_BOX ) ); if( SfxItemState::SET == pOldFormat->GetAttrSet(). GetItemState( RES_SHADOW, true, &pItem )) pNewSet->Put( *pItem ); else if( SfxItemState::SET == pNewFormat->GetAttrSet(). - GetItemState( RES_SHADOW, true )) + GetItemState( RES_SHADOW )) pNewSet->Put( *GetDfltAttr( RES_SHADOW ) ); } else @@ -1089,10 +1089,10 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_FRAME ) ); // Set border and shadow to default if the template contains any. - if( SfxItemState::SET == pNewFormat->GetAttrSet().GetItemState( RES_BOX, true )) + if( SfxItemState::SET == pNewFormat->GetAttrSet().GetItemState( RES_BOX )) pNewSet->Put( *GetDfltAttr( RES_BOX ) ); - if( SfxItemState::SET == pNewFormat->GetAttrSet().GetItemState(RES_SHADOW,true)) + if( SfxItemState::SET == pNewFormat->GetAttrSet().GetItemState(RES_SHADOW)) pNewSet->Put( *GetDfltAttr( RES_SHADOW ) ); pNewFormat->SetFormatAttr( SwFormatContent( pSttNd )); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index e3ca08be04c3..3616589da8d8 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1944,7 +1944,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv ) pPos->nContent.Assign( pPos->nNode.GetNode().GetContentNode(),0); } } - CorrRel( aIdx, aInsPos, 0 ); + CorrRel( aIdx, aInsPos ); if (pCNd) pCNd->JoinNext(); diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx index fa94c9ab4eed..206f44fa10bb 100644 --- a/sw/source/core/doc/gctable.cxx +++ b/sw/source/core/doc/gctable.cxx @@ -402,7 +402,7 @@ static bool lcl_MergeGCLine(SwTableLine* pLn, _GCLinePara* pGCPara) SwTableLines& rBoxLns = pBox->GetTabLines(); for( auto pBoxLine : rBoxLns ) if( SfxItemState::SET != pBoxLine->GetFrameFormat()-> - GetItemState( RES_BACKGROUND, true )) + GetItemState( RES_BACKGROUND )) pGCPara->pShareFormats->SetAttr( *pBoxLine, *pItem ); } diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 14815d9ef2b5..4688d21daa94 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -629,7 +629,7 @@ OUString SwNumRule::MakeNumString( const SwNodeNum& rNum, bool bInclStrings, { if (rNum.IsCounted()) return MakeNumString(rNum.GetNumberVector(), - bInclStrings, bOnlyArabic, MAXLEVEL); + bInclStrings, bOnlyArabic); return OUString(); } diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 9a02594bd361..0c09aa93d17b 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -297,7 +297,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData, if( !pPos->nContent.GetIndex() ) { pNewSectNode = GetNodes().InsertTextSection( - pPos->nNode, *pFormat, rNewData, pTOXBase, 0, true); + pPos->nNode, *pFormat, rNewData, pTOXBase, 0); } else if( pPos->nContent.GetIndex() == pCNd->Len() ) { @@ -312,7 +312,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData, } getIDocumentContentOperations().SplitNode( *pPos, false ); pNewSectNode = GetNodes().InsertTextSection( - pPos->nNode, *pFormat, rNewData, pTOXBase, 0, true); + pPos->nNode, *pFormat, rNewData, pTOXBase, 0); } } diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 18c1d19b93f4..f0e5e3d33d84 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -425,7 +425,7 @@ LanguageType SwAutoCorrDoc::GetLanguage( sal_Int32 nPos, bool bPrevPara ) const : rCrsr.GetPoint()->nNode ).GetNode().GetTextNode(); if( pNd ) - eRet = pNd->GetLang( nPos, 0 ); + eRet = pNd->GetLang( nPos ); if(LANGUAGE_SYSTEM == eRet) eRet = GetAppLanguage(); return eRet; diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 85620ba2b889..394e20fbed4a 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -1267,7 +1267,7 @@ void SwAutoFormat::BuildIndent() !CalcLevel( *pNxtNd ) ); } } - DeleteCurrentParagraph( true ); + DeleteCurrentParagraph(); AutoCorrect(); } @@ -1305,7 +1305,7 @@ void SwAutoFormat::BuildTextIndent() pNxtNd = GetNextNode(); } } - DeleteCurrentParagraph( true ); + DeleteCurrentParagraph(); AutoCorrect(); } @@ -1342,7 +1342,7 @@ void SwAutoFormat::BuildText() break; } } - DeleteCurrentParagraph( true ); + DeleteCurrentParagraph(); AutoCorrect(); } @@ -1375,7 +1375,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) IsBlanksInString( *m_pCurTextNd ) || IsSentenceAtEnd( *m_pCurTextNd ); bool bRTL = m_pEditShell->IsInRightToLeftText(); - DeleteCurrentParagraph( true ); + DeleteCurrentParagraph(); bool bChgBullet = false, bChgEnum = false; sal_Int32 nAutoCorrPos = 0; @@ -1740,7 +1740,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) pNxtNd = GetNextNode(); } } - DeleteCurrentParagraph( true ); + DeleteCurrentParagraph(); AutoCorrect(); } @@ -1771,7 +1771,7 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl ) } else { - DeleteCurrentParagraph( true ); + DeleteCurrentParagraph(); AutoCorrect(); } } diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index d62793c27196..b8d64ff7d650 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -456,7 +456,7 @@ size_t SwEditShell::GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes ) OUString sText( rFootnote.GetViewNumStr( *mpDoc )); if( !sText.isEmpty() ) sText += " "; - sText += pTextNd->GetExpandText( 0, -1 ); + sText += pTextNd->GetExpandText(); _SeqFieldLstElem* pNew = new _SeqFieldLstElem( sText, pTextFootnote->GetSeqRefNo() ); diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 3978d5ab58c5..252f1b946019 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -245,7 +245,7 @@ const SwTextNode* GetBodyTextNode( const SwDoc& rDoc, SwPosition& rPos, { Point aPt( pLayout->Frm().Pos() ); aPt.Y()++; // get out of the header - pCntFrm = pPgFrm->GetContentPos( aPt, false, true, false ); + pCntFrm = pPgFrm->GetContentPos( aPt, false, true ); pTextNode = GetFirstTextNode( rDoc, rPos, pCntFrm, aPt ); } } @@ -594,7 +594,7 @@ size_t SwSetExpFieldType::GetSeqFieldList( SwSeqFieldList& rList ) pNd->GetNodes().IsDocNodes() ) { _SeqFieldLstElem* pNew = new _SeqFieldLstElem( - pNd->GetExpandText( 0, -1 ), + pNd->GetExpandText(), static_cast<SwSetExpField*>(pF->GetField())->GetSeqNumber() ); rList.InsertSort( pNew ); } diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 4083e31241e3..2847c4f924df 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -192,7 +192,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText ) aSet.Put( aAnchor ); SdrObject *const pNew = - pClpDoc->CloneSdrObj( *pObj, false ); + pClpDoc->CloneSdrObj( *pObj ); SwPaM aTemp(aPos); pClpDoc->getIDocumentContentOperations().InsertDrawObj(aTemp, *pNew, aSet ); @@ -867,8 +867,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames ) ::PaMCorrAbs(tmpPaM, aPos); } - bRet = GetDoc()->InsCopyOfTable( aDestPos, aBoxes, &pSrcNd->GetTable(), - false ); + bRet = GetDoc()->InsCopyOfTable( aDestPos, aBoxes, &pSrcNd->GetTable() ); if( bParkTableCrsr ) GetCrsr(); diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index e83f3b110981..d2b84558a0b4 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -247,7 +247,7 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, bool bNew ) pImpl->GetDrawView()->UnmarkAll(); pImpl->GetDrawView()->MarkObj( rFrm.GetVirtDrawObj(), - pImpl->GetPageView(), false ); + pImpl->GetPageView() ); KillPams(); ClearMark(); SelFlyGrabCrsr(); @@ -912,8 +912,7 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj, if ( pFormat ) { // select drawing object - Imp()->GetDrawView()->MarkObj( &rDrawObj, Imp()->GetPageView(), - false ); + Imp()->GetDrawView()->MarkObj( &rDrawObj, Imp()->GetPageView() ); } else { diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 2628c7f22c30..dbc361590990 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -642,7 +642,7 @@ void SwFEShell::StartCropImage() if( bForget ) { pView->UnmarkAll(); - pView->MarkObj( pTmpObj, Imp()->GetPageView(), false ); + pView->MarkObj( pTmpObj, Imp()->GetPageView() ); break; } } @@ -1868,13 +1868,11 @@ bool SwFEShell::ImpEndCreate() SdrObject* pMarkObj = pContact->GetDrawObjectByAnchorFrm( *pAnch ); if ( pMarkObj ) { - Imp()->GetDrawView()->MarkObj( pMarkObj, Imp()->GetPageView(), - false ); + Imp()->GetDrawView()->MarkObj( pMarkObj, Imp()->GetPageView() ); } else { - Imp()->GetDrawView()->MarkObj( &rSdrObj, Imp()->GetPageView(), - false ); + Imp()->GetDrawView()->MarkObj( &rSdrObj, Imp()->GetPageView() ); } } } diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 8a72d73b335a..bdade3a91e69 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -1825,7 +1825,7 @@ bool SwFEShell::SelTableRowCol( const Point& rPt, const Point* pEnd, bool bRowDr *pCrsr->GetPoint() = *ppPos[0]; pCrsr->GetPtPos() = paPt[0]; - if ( !pCrsr->IsInProtectTable( false ) ) + if ( !pCrsr->IsInProtectTable() ) { bool bNewSelection = true; diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index df3527e5e661..8dceb15acff8 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -1062,7 +1062,7 @@ const SwContentFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, // With this we won't run into problems with the columns. Point aTmp( aNew ); const SwContentFrm *pTmp = pCnt->FindPageFrm()-> - GetContentPos( aTmp, false, true, false ); + GetContentPos( aTmp, false, true ); if ( pTmp && pTmp->Frm().IsInside( aNew ) ) return pTmp; } diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index bdb7bde18efb..ad334db9158f 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -208,7 +208,7 @@ void SwFootnoteContFrm::Format( vcl::RenderContext* /*pRenderContext*/, const Sw bGrow = false; } if( bGrow ) - Grow( LONG_MAX, false ); + Grow( LONG_MAX ); else { // VarSize is determined based on the content plus the borders diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index f51953ca30c4..31b5dae4fadf 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -4226,7 +4226,7 @@ void SwFlyFrm::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, Sw const SwBorderAttrs &rAttrs = *aAccess.Get(); SwRect aPaintRect( aRect ); aPaintRect._Intersection( pParentFlyFrm->Frm() ); - pParentFlyFrm->PaintBackground( aPaintRect, pPage, rAttrs, false, false ); + pParentFlyFrm->PaintBackground( aPaintRect, pPage, rAttrs ); gProp.pSRetoucheFly2 = pOldRet; } @@ -7650,7 +7650,7 @@ Graphic SwFlyFrameFormat::MakeGraphic( ImageMap* pMap ) gProp.pSGlobalShell = pSh; bool bNoteURL = pMap && - SfxItemState::SET != GetAttrSet().GetItemState( RES_URL, true ); + SfxItemState::SET != GetAttrSet().GetItemState( RES_URL ); if( bNoteURL ) { OSL_ENSURE( !pNoteURL, "MakeGraphic: pNoteURL already used? " ); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 4a24daafda89..dd82bac59dcc 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -1919,7 +1919,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst ) if( bInCalcContent ) _InvalidateSize(); else if( nSpace < nGrow && nDist != nSpace + GetUpper()-> - Grow( nGrow - nSpace, false ) ) + Grow( nGrow - nSpace ) ) InvalidateSize(); else { diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index d25f54331502..e23ab20cb17a 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -1745,7 +1745,7 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout(); if ( pLayout ) m_bCalcLowers = pLayout->Resize( - pLayout->GetBrowseWidthByTabFrm( *this ), false ); + pLayout->GetBrowseWidthByTabFrm( *this ) ); } // as long as bMakePage is true, a new page can be created (exactly once) @@ -1868,7 +1868,7 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) { delete pAccess; m_bCalcLowers |= pLayout->Resize( - pLayout->GetBrowseWidthByTabFrm( *this ), false ); + pLayout->GetBrowseWidthByTabFrm( *this ) ); pAccess = new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); } @@ -1912,7 +1912,7 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) { delete pAccess; m_bCalcLowers |= pLayout->Resize( - pLayout->GetBrowseWidthByTabFrm( *this ), false ); + pLayout->GetBrowseWidthByTabFrm( *this ) ); pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); } @@ -1961,8 +1961,7 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) { delete pAccess; m_bCalcLowers |= pHTMLLayout->Resize( - pHTMLLayout->GetBrowseWidthByTabFrm( *this ), - false ); + pHTMLLayout->GetBrowseWidthByTabFrm( *this ) ); pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); @@ -3488,7 +3487,7 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) const SwPageDesc *pDesc = GetFormat()->GetPageDesc().GetPageDesc(); if ( (pDesc && pDesc != pPage->GetPageDesc()) || (!pDesc && pPage->GetPageDesc() != &GetFormat()->GetDoc()->GetPageDesc(0)) ) - CheckPageDescs( pPage, true ); + CheckPageDescs( pPage ); } } } diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index a91ff2baa71a..3ba82c6296fe 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -182,7 +182,7 @@ bool IsItemIncluded( const sal_uInt16 nWhich, const SwTextAttr *pAttr ) const SfxItemSet* pItemSet = CharFormat::GetItemSet( pAttr->GetAttr() ); if ( pItemSet ) - bRet = SfxItemState::SET == pItemSet->GetItemState( nWhich, true ); + bRet = SfxItemState::SET == pItemSet->GetItemState( nWhich ); return bRet; } diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx index aab92d3e93a8..4bcd38799c57 100644 --- a/sw/source/core/txtnode/atrftn.cxx +++ b/sw/source/core/txtnode/atrftn.cxx @@ -384,7 +384,7 @@ void SwTextFootnote::CopyFootnote( SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() ); sal_uLong nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1; - m_pTextNode->GetDoc()->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aEnd, NULL, true ); + m_pTextNode->GetDoc()->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aEnd, NULL ); // in case the destination section was not empty, delete the old nodes // before: Src: SxxxE, Dst: SnE diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 934697f4ab4a..633e638633b2 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -2622,7 +2622,7 @@ SwContentNode* SwTextNode::AppendNode( const SwPosition & rPos ) { // Position hinter dem eingefuegt wird SwNodeIndex aIdx( rPos.nNode, 1 ); - SwTextNode* pNew = _MakeNewTextNode( aIdx, true ); + SwTextNode* pNew = _MakeNewTextNode( aIdx ); // reset list attributes at appended text node pNew->ResetAttr( RES_PARATR_LIST_ISRESTART ); @@ -3343,7 +3343,7 @@ void SwTextNode::ReplaceText( const SwIndex& rStart, const sal_Int32 nDelLen, OUString aTmpText( sInserted.copy(1) ); m_Text = m_Text.replaceAt(rStart.GetIndex(), 0, aTmpText); - Update( rStart, aTmpText.getLength(), false ); + Update( rStart, aTmpText.getLength() ); } else { @@ -3351,7 +3351,7 @@ void SwTextNode::ReplaceText( const SwIndex& rStart, const sal_Int32 nDelLen, Update( rStart, nLen, true ); m_Text = m_Text.replaceAt(nStartPos, 0, sInserted); - Update( rStart, sInserted.getLength(), false ); + Update( rStart, sInserted.getLength() ); } SetIgnoreDontExpand( bOldExpFlg ); diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 5df015ffabd8..9c69382b2e40 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -901,7 +901,7 @@ void SwpHints::BuildPortions( SwTextNode& rNode, SwTextAttr& rNewHint, if ( !pCurrentCharFormat || 0 == CharFormat::GetItem( *pCurrentCharFormat, pItem->Which() ) ) { if ( !pNewSet ) - pNewSet = pNewStyle->Clone( true ); + pNewSet = pNewStyle->Clone(); pNewSet->ClearItem( pItem->Which() ); } } @@ -1995,7 +1995,7 @@ static void lcl_MergeAttr( SfxItemSet& rSet, const SfxPoolItem& rAttr ) { if( ( nWhich < RES_CHRATR_END || RES_TXTATR_UNKNOWN_CONTAINER == nWhich ) && - ( SfxItemState::SET == pCFSet->GetItemState( nWhich, true ) ) ) + ( SfxItemState::SET == pCFSet->GetItemState( nWhich ) ) ) rSet.Put( pCFSet->Get( nWhich ) ); nWhich = aIter.NextWhich(); } @@ -2020,7 +2020,7 @@ static void lcl_MergeAttr_ExpandChrFormat( SfxItemSet& rSet, const SfxPoolItem& { if( ( nWhich < RES_CHRATR_END || ( RES_TXTATR_AUTOFMT == rAttr.Which() && RES_TXTATR_UNKNOWN_CONTAINER == nWhich ) ) && - ( SfxItemState::SET == pCFSet->GetItemState( nWhich, true ) ) ) + ( SfxItemState::SET == pCFSet->GetItemState( nWhich ) ) ) rSet.Put( pCFSet->Get( nWhich ) ); nWhich = aIter.NextWhich(); } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 3e2d4e1d2ff8..0b2b1569ce44 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -313,7 +313,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, OSL_ENSURE( nWhichId, "lcl_HaveCommonAttributes not used correctly" ); if ( SfxItemState::SET == rSet2.GetItemState( nWhichId, false ) ) { - pNewSet = rSet2.Clone( true ); + pNewSet = rSet2.Clone(); pNewSet->ClearItem( nWhichId ); } } @@ -326,7 +326,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, if ( SfxItemState::SET == rSet2.GetItemState( pItem->Which(), false ) ) { if ( !pNewSet ) - pNewSet = rSet2.Clone( true ); + pNewSet = rSet2.Clone(); pNewSet->ClearItem( pItem->Which() ); } @@ -1938,7 +1938,7 @@ void SwTextNode::ReplaceTextOnly( sal_Int32 nPos, sal_Int32 nLen, while( nI + nCnt < nTLen && nOff == pOffsets[ nI + nCnt ] ) ++nCnt; - Update( SwIndex( this, nMyOff ), nCnt, false ); + Update( SwIndex( this, nMyOff ), nCnt ); nMyOff = nOff; //nMyOff -= nCnt; nI += nCnt - 1; diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 8c54261c18d9..7eabe1b2dd3d 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -332,7 +332,7 @@ bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr, return false; } - SfxUndoAction *const pAction( SdrUndoManager::GetRedoAction(0) ); + SfxUndoAction *const pAction( SdrUndoManager::GetRedoAction() ); if ( pAction == NULL ) { return false; diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 3d167c3b2990..171ab9c3b929 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -959,7 +959,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext) if( pRedlSaveData ) { - const bool bSuccess = FillSaveData(rPam, *pRedlSaveData, true); + const bool bSuccess = FillSaveData(rPam, *pRedlSaveData); OSL_ENSURE(bSuccess, "SwUndoDelete::Redo: used to have redline data, but now none?"); if (!bSuccess) diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index f54130e85253..fd83a21c4ed6 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -824,7 +824,7 @@ void SwUndoSaveSection::SaveSection( } pRedlSaveData = new SwRedlineSaveDatas; - if( !SwUndo::FillSaveData( aPam, *pRedlSaveData, true )) + if( !SwUndo::FillSaveData( aPam, *pRedlSaveData )) delete pRedlSaveData, pRedlSaveData = 0; nStartPos = rRange.aStart.GetIndex(); diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 34ff5ca9af7f..1473dfa9bb49 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -3031,7 +3031,7 @@ void SwUndoMergeTable::UndoImpl(::sw::UndoRedoContext & rContext) aFndBox.DelFrms( *pTable ); // ? TL_CHART2: notification or locking of controller required ? - SwTableNode* pNew = pDoc->GetNodes().SplitTable( rIdx, true ); + SwTableNode* pNew = pDoc->GetNodes().SplitTable( rIdx ); // update layout aFndBox.MakeFrms( *pTable ); |