diff options
88 files changed, 166 insertions, 177 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 ); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 4881531c9273..70c899a6cde3 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -2126,9 +2126,9 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat { const SvxLRSpaceItem *pLRItem = 0; const SvxULSpaceItem *pULItem = 0; - if( SfxItemState::SET == rItemSet.GetItemState( RES_LR_SPACE, true ) ) + if( SfxItemState::SET == rItemSet.GetItemState( RES_LR_SPACE ) ) pLRItem = &aLRItem; - if( SfxItemState::SET == rItemSet.GetItemState( RES_UL_SPACE, true ) ) + if( SfxItemState::SET == rItemSet.GetItemState( RES_UL_SPACE ) ) pULItem = &aULItem; if( pLRItem || pULItem ) OutCSS1_SvxULSpace_SvxLRSpace( *this, pULItem, pLRItem ); diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 055255f30eda..94430495dda1 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -135,7 +135,7 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl ) { if( bLFPossible ) OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist, true ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist ); IncIndentLevel(); bLFPossible = true; } diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 8caf83dbc1df..9ffbd19ad983 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -308,7 +308,7 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt ) sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed); sOut.append('>'); rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, true ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript ); HTMLOutFuncs::Out_String( rWrt.Strm(), rFormatFootnote.GetViewNumStr(*rWrt.pDoc), rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 1ab0bf1c38cf..9a1a3c447260 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -729,7 +729,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, sOutStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append("=\"") .append(bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom) .append("\""); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOutStr.getStr(), true ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOutStr.getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption, rWrt.eDestEnc, &rWrt.aNonConvertableCharacters ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_caption, false ); } @@ -744,7 +744,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, if( bColGroups ) { rWrt.OutNewLine(); // <COLGRP> in neue Zeile - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup, true ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup ); rWrt.IncIndentLevel(); // Inhalt von <COLGRP> einruecken } @@ -787,8 +787,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup, false ); rWrt.OutNewLine(); // <COLGRP> in neue Zeile - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup, - true ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup ); rWrt.IncIndentLevel(); // Inhalt von <COLGRP> einruecken } } @@ -822,7 +821,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, { rWrt.OutNewLine(); // <THEAD>/<TDATA> in neue Zeile HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), - bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, true ); + bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody ); rWrt.IncIndentLevel(); // Inhalt von <THEAD>/<TDATA> einr. } @@ -838,8 +837,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, for( auto nCnt = (pRow2->nBottomBorder / DEF_LINE_WIDTH_1) - 1; nCnt; --nCnt ) { rWrt.OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow, - true ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow, false ); } @@ -858,7 +856,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, bTHead = false; HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), - bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, true ); + bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody ); rWrt.IncIndentLevel(); // Inhalt von <THEAD>/<TDATA> einr. } } @@ -1088,13 +1086,13 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode, if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine(); // <CENTER> in neuer Zeile if( text::HoriOrientation::CENTER==eDivHoriOri ) - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, true ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center ); else { OStringBuffer sOut(OOO_STRING_SVTOOLS_HTML_division); sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append("=\"") .append(OOO_STRING_SVTOOLS_HTML_AL_right).append("\""); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr(), true ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr() ); } rHTMLWrt.IncIndentLevel(); // Inhalt von <CENTER> einruecken rHTMLWrt.bLFPossible = true; diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index a964ca1dc961..7d9dd7dae785 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -433,8 +433,7 @@ SwHTMLParser::~SwHTMLParser() sal_uInt16 nLinkMode = pDoc->getIDocumentSettingAccess().getLinkUpdateMode( true ); if( nLinkMode != NEVER && bAsync && SfxObjectCreateMode::INTERNAL!=pDoc->GetDocShell()->GetCreateMode() ) - pDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( nLinkMode == MANUAL, - true, false ); + pDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( nLinkMode == MANUAL ); if ( pDoc->GetDocShell()->IsLoading() ) { diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index a7fe1f02f566..f9d3fc94146f 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -75,7 +75,7 @@ namespace myImplHelpers nDist += rSz.GetHeight(); else { - SwRect aRect(rFormat.FindLayoutRect(false)); + SwRect aRect(rFormat.FindLayoutRect()); if (aRect.Height()) nDist += aRect.Height(); else diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index ab7edbb69d28..8f9946a323be 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -169,13 +169,13 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet, { Graphic aGr1; GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); - if( rGF.ImportGraphic( aGr1, OUString(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK ) + if( rGF.ImportGraphic( aGr1, OUString(), *pGraphicStream ) == GRFILTER_OK ) { Graphic aGr2; delete pGraphicStream; pGraphicStream = ::utl::UcbStreamHelper::CreateStream( aCnt.GetGraphicStream( pRet->GetObjRef() ) ); - if( pGraphicStream && rGF.ImportGraphic( aGr2, OUString(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK ) + if( pGraphicStream && rGF.ImportGraphic( aGr2, OUString(), *pGraphicStream ) == GRFILTER_OK ) { if ( aGr1 == aGr2 ) bGraphicNeeded = false; diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 35e05fe8a241..287d51b9aed5 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -242,8 +242,7 @@ extern void WW8PicShadowToReal( WW8_PIC_SHADOW* pPicS, WW8_PIC* pPic ); bool SwWW8ImplReader::GetPictGrafFromStream(Graphic& rGraphic, SvStream& rSrc) { - return 0 == GraphicFilter::GetGraphicFilter().ImportGraphic(rGraphic, OUString(), rSrc, - GRFILTER_FORMAT_DONTKNOW); + return 0 == GraphicFilter::GetGraphicFilter().ImportGraphic(rGraphic, OUString(), rSrc); } bool SwWW8ImplReader::ReadGrafFile(OUString& rFileName, Graphic*& rpGraphic, diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 2d4e71066b11..f39e0fa00f95 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2839,7 +2839,7 @@ void SwWW8ImplReader::PostProcessAttrs() m_pCtrlStck->NewAttr(*m_pPostProcessAttrsInfo->mPaM.GetPoint(), *pItem); m_pCtrlStck->SetAttr(*m_pPostProcessAttrsInfo->mPaM.GetMark(), - pItem->Which(), true); + pItem->Which()); } while (!aIter.IsAtEnd() && 0 != (pItem = aIter.NextItem())); } diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 233cc11627c6..00892215b7bf 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2375,7 +2375,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem) // rows of a band can be duplicated easy. pTable = pIo->m_rDoc.InsertTable( SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 0 ), - *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0, false ); + *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0 ); OSL_ENSURE(pTable && pTable->GetFrameFormat(), "insert table failed"); if (!pTable || !pTable->GetFrameFormat()) diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 7427ce3e16c5..287dfde6c67d 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -339,7 +339,7 @@ IMPL_LINK_NOARG_TYPED( SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, ListBo IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, EditNumStyleHdl_Impl, Button*, void) { OUString aTemplName(m_pNumberStyleLB->GetSelectEntry()); - ExecuteEditNumStyle_Impl( SID_STYLE_EDIT, aTemplName, OUString(),SFX_STYLE_FAMILY_PSEUDO, 0 ); + ExecuteEditNumStyle_Impl( SID_STYLE_EDIT, aTemplName, OUString(),SFX_STYLE_FAMILY_PSEUDO ); } // Internal: Perform functions through the Dispatcher diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 873708621172..1ca1d49ffe91 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -474,7 +474,7 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet* ) } if (m_pProspectCB->IsChecked()) { - m_pProspectCB_RTL->Enable(true); + m_pProspectCB_RTL->Enable(); m_pNoRB->Enable( false ); m_pOnlyRB->Enable( false ); m_pEndRB->Enable( false ); diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 2e5f5ba90c99..a41b95849552 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -518,7 +518,7 @@ IMPL_LINK_TYPED(SwAddressListDialog, StaticListBoxSelectHdl_Impl, void*, p, void m_aDBData.sDataSource = SvTabListBox::GetEntryText(pSelect, ITEMID_NAME - 1); m_aDBData.sCommand = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1); m_aDBData.nCommandType = pUserData->nCommandType; - m_pOK->Enable(true); + m_pOK->Enable(); } if(SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1) == m_sConnecting) m_pListLB->SetEntryText(OUString(), pSelect, ITEMID_TABLE - 1); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index d108103ce461..9f9fb7fbce30 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -218,7 +218,7 @@ void SwAddressControl_Impl::SetData(SwCSVData& rDBData) } else { - m_pScrollBar->Enable(true); + m_pScrollBar->Enable(); m_pScrollBar->SetRange(Range(0, nLines)); m_pScrollBar->SetThumbPos(0); m_pScrollBar->SetVisibleSize(nVisibleLines); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index c9157bc58df3..5c65f3ff498c 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -1743,8 +1743,8 @@ void SwInsertDBColAutoPilot::Load() m_pIbDbcolAllTo->Enable( false ); m_pIbDbcolOneTo->Enable( false ); } - m_pIbDbcolOneFrom->Enable( true ); - m_pIbDbcolAllFrom->Enable( true ); + m_pIbDbcolOneFrom->Enable(); + m_pIbDbcolAllFrom->Enable(); } m_pEdDbText->SetText( pNewData->sEdit ); diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 3a0cf443a898..fe8c59a3543b 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -705,8 +705,8 @@ IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, Address m_pFieldCB->InsertEntry(*aIterator); } m_pFieldCB->SetText(sSelect); - m_pFieldCB->Enable(true); - m_pFieldFT->Enable(true); + m_pFieldCB->Enable(); + m_pFieldFT->Enable(); } else { diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 16dfdd50b3b4..b0438805205b 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -622,7 +622,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, SwOneExampleFrame&, void) { - m_pExampleContainerWIN->Show(true); + m_pExampleContainerWIN->Show(); Reference< XModel > & xModel = m_pExampleFrame->GetModel(); //now the ViewOptions should be set properly diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 6aad4e4211d8..6f949aee867a 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -432,7 +432,7 @@ IMPL_LINK_TYPED(SwMailMergeOutputPage, OutputTypeHdl_Impl, Button*, pButton, voi Control** pSaveMergeControl = aSaveMergedControls; do { - (*pSaveMergeControl)->Show(true); + (*pSaveMergeControl)->Show(); } while(*(++pSaveMergeControl)); if(!m_pFromRB->IsChecked() && !m_pSaveAsOneRB->IsChecked()) @@ -453,7 +453,7 @@ IMPL_LINK_TYPED(SwMailMergeOutputPage, OutputTypeHdl_Impl, Button*, pButton, voi Control** pPrinterControl = aPrintControls; do { - (*pPrinterControl)->Show(true); + (*pPrinterControl)->Show(); } while(*(++pPrinterControl)); if(!m_pFromRB->IsChecked()) @@ -475,7 +475,7 @@ IMPL_LINK_TYPED(SwMailMergeOutputPage, OutputTypeHdl_Impl, Button*, pButton, voi vcl::Window** pMailControl = aMailControls; do { - (*pMailControl)->Show(true); + (*pMailControl)->Show(); } while(*(++pMailControl)); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index e88370572485..918addc6883f 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -168,7 +168,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, } } - m_pLanguageLB->SetLanguageList( SvxLanguageListFlags::ALL, true, false ); + m_pLanguageLB->SetLanguageList( SvxLanguageListFlags::ALL, true ); m_pLanguageLB->SelectLanguage( aOpt.GetLanguage() ); } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index f4fe433bfeb8..7c5cc8584e60 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -573,12 +573,12 @@ IMPL_LINK_TYPED( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox, void { bDontCheckPasswd = true; SvTreeListEntry* pEntry=pBox->FirstSelected(); - m_pHideCB->Enable(true); + m_pHideCB->Enable(); // edit in readonly sections - m_pEditInReadonlyCB->Enable(true); + m_pEditInReadonlyCB->Enable(); - m_pProtectCB->Enable(true); - m_pFileCB->Enable(true); + m_pProtectCB->Enable(); + m_pFileCB->Enable(); ::com::sun::star::uno::Sequence <sal_Int8> aCurPasswd; if( 1 < pBox->GetSelectionCount() ) { @@ -676,8 +676,8 @@ IMPL_LINK_TYPED( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox, void } else if (pEntry ) { - m_pCurName->Enable(true); - m_pOptionsPB->Enable(true); + m_pCurName->Enable(); + m_pOptionsPB->Enable(); SectRepr* pRepr=static_cast<SectRepr*>(pEntry->GetUserData()); SwSectionData const& rData( pRepr->GetSectionData() ); m_pConditionED->SetText(rData.GetCondition()); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 4a5d5b4002c9..1e63bb8e6a81 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1227,7 +1227,7 @@ void SwColumnPage::Update(MetricField *pInteractiveField) void SwColumnPage::ActivatePage(const SfxItemSet& rSet) { bool bVertical = false; - if (SfxItemState::DEFAULT <= rSet.GetItemState(RES_FRAMEDIR, true)) + if (SfxItemState::DEFAULT <= rSet.GetItemState(RES_FRAMEDIR)) { const SvxFrameDirectionItem& rDirItem = static_cast<const SvxFrameDirectionItem&>(rSet.Get(RES_FRAMEDIR)); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 63145d2620c1..95b8aee2f1c9 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -3074,7 +3074,7 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet ) if( (!bHtmlMode || (0 != (nHtmlMode&HTMLMODE_SOME_STYLES))) && sDlgType != "PictureDialog" && sDlgType != "ObjectDialog" && SfxItemState::UNKNOWN != ( eState = rSet->GetItemState( - RES_FRAMEDIR, true )) ) + RES_FRAMEDIR )) ) { pTextFlowFT->Show(); pTextFlowLB->Show(); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 57b073269961..d4cad9b07265 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -847,7 +847,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r pIndexEntryWrapper = new IndexEntrySupplierWrapper(); m_pLanguageLB->SetLanguageList( SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, - false, false ); + false ); //Default mode is arranged to be the tallest mode //of alphabetical index, lock that height in now @@ -4105,7 +4105,7 @@ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) } if( pToInsert ) aEntryArr.push_back(pToInsert); - RowInserted(0, aEntryArr.size() + 1, true); + RowInserted(0, aEntryArr.size() + 1); } void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) @@ -4172,7 +4172,7 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAu SetText(GetText() + ": " + sAutoMarkURL); bool bError = false; if( bCreateMode ) - m_pEntriesBB->RowInserted(0, 1, true); + m_pEntriesBB->RowInserted(0); else { SfxMedium aMed( sAutoMarkURL, STREAM_STD_READ ); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 7f5108e0c577..a1726f11421e 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1068,7 +1068,7 @@ SwAuthorMarkPane::SwAuthorMarkPane(Dialog &rDialog, bool bNewDlg) m_rDialog.get(m_pEntryLB, "entrylb"); m_rDialog.get(m_pActionBT, bNewEntry ? OString("insert") : OString("modify")); - m_pActionBT->Show(true); + m_pActionBT->Show(); m_rDialog.get(m_pCloseBT, "close"); m_rDialog.get(m_pCreateEntryPB, "new"); m_rDialog.get(m_pEditEntryPB, "edit"); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 24cbf3ce654e..59d9bf13e465 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -91,7 +91,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent, m_pPathLB->SetEntryData(i, reinterpret_cast<void*>(nCaseReadonly)); } m_pPathLB->SelectEntryPos(0); - m_pPathLB->Enable(true); + m_pPathLB->Enable(); const size_t nCount = pHdl->GetGroupCnt(); for( size_t i = 0; i < nCount; ++i) diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 3ab52b95f415..6f94e2c7c6a0 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -446,8 +446,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) if (sItemIdent == "replace") { pGlossaryHdl->NewGlossary(m_pNameED->GetText(), - m_pShortNameEdit->GetText(), - false); + m_pShortNameEdit->GetText()); } else if (sItemIdent == "replacetext") { diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index f4b424fae7c3..8f0f7247e7e0 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -96,7 +96,7 @@ IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberEditHdl, Edit&, void) IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberAutoBtnHdl, Button*, void) { - m_pOkBtn->Enable( true ); + m_pOkBtn->Enable(); } IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberExtCharHdl, Button*, void) diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 569b42efa367..6b15cf6a57a5 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -344,8 +344,8 @@ void SwNumPositionTabPage::InitControls() if ( aNumFormatArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::LISTTAB ) { - m_pListtabFT->Enable( true ); - m_pListtabMF->Enable( true ); + m_pListtabFT->Enable(); + m_pListtabMF->Enable(); if ( bSameListtab ) { m_pListtabMF->SetValue(m_pListtabMF->Normalize(aNumFormatArr[nLvl]->GetListtabPos()),FUNIT_TWIP); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index f88b043c5ab9..5c235f9fea9b 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -512,8 +512,8 @@ void SwOutlineSettingsTabPage::Update() else m_pCharFormatLB->SetNoSelection(); - m_pAllLevelFT->Enable(true); - m_pAllLevelNF->Enable(true); + m_pAllLevelFT->Enable(); + m_pAllLevelNF->Enable(); m_pAllLevelNF->SetMax(MAXLEVEL); if(bSameComplete) { @@ -545,8 +545,8 @@ void SwOutlineSettingsTabPage::Update() if(nTmpLevel) { - m_pAllLevelFT->Enable(true); - m_pAllLevelNF->Enable(true); + m_pAllLevelFT->Enable(); + m_pAllLevelNF->Enable(); m_pAllLevelNF->SetMax(nTmpLevel + 1); m_pAllLevelNF->SetValue(rFormat.GetIncludeUpperLevels()); } diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 6c3e70d16617..d4410caf9953 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -217,7 +217,7 @@ bool SwTextGridPage::FillItemSet(SfxItemSet *rSet) void SwTextGridPage::Reset(const SfxItemSet *rSet) { - if(SfxItemState::DEFAULT <= rSet->GetItemState(RES_TEXTGRID, true)) + if(SfxItemState::DEFAULT <= rSet->GetItemState(RES_TEXTGRID)) { const SwTextGridItem& rGridItem = static_cast<const SwTextGridItem&>(rSet->Get(RES_TEXTGRID)); RadioButton* pButton = 0; @@ -306,7 +306,7 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet) void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet) { - if( SfxItemState::UNKNOWN != rSet.GetItemState( RES_FRAMEDIR, true )) + if( SfxItemState::UNKNOWN != rSet.GetItemState( RES_FRAMEDIR )) { const SvxFrameDirectionItem& rDirItem = static_cast<const SvxFrameDirectionItem&>(rSet.Get(RES_FRAMEDIR)); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index f6cdfa9d71e9..a75f46504e51 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -205,7 +205,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) if( LANGUAGE_NONE == nLang || LANGUAGE_DONTKNOW == nLang ) nLang = (sal_uInt16)GetAppLanguage(); - m_pLangLB->SetLanguageList( SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, true, false); + m_pLangLB->SetLanguageList( SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, true ); m_pLangLB->SelectLanguage( nLang ); LanguageHdl( 0 ); diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index 84e34638145d..8ffa710dcba8 100644 --- a/sw/source/ui/vba/vbatablehelper.cxx +++ b/sw/source/ui/vba/vbatablehelper.cxx @@ -162,7 +162,7 @@ void SwVbaTableHelper::InitTabCols( SwTabCols& rCols, const SwTableBox *pStart, rCols.SetLeft ( 0 ); rCols.SetRight ( UNO_TABLE_COLUMN_SUM ); rCols.SetRightMax( UNO_TABLE_COLUMN_SUM ); - pTable->GetTabCols( rCols, pStart, false ); + pTable->GetTabCols( rCols, pStart ); } sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols& rCols ) diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index a2577777d6ae..c0ef493cc4f4 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -510,8 +510,8 @@ IMPL_LINK_NOARG_TYPED(SwHeaderFooterWin, FadeHandler, Timer *, void) if (m_nFadeRate != 100 && !IsVisible()) { - Show(true); - m_pLine->Show(true); + Show(); + m_pLine->Show(); } else if (m_nFadeRate == 100 && IsVisible()) { diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index bfe146a685f5..d06acb2f7a72 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -321,7 +321,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { if (!pField) { - AddPostIts(true); + AddPostIts(); break; } // get field to be inserted from hint diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index 81ca453323f7..0070daefbee5 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -108,8 +108,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel ) { SwContentAtPos aSwContentAtPos( SwContentAtPos::SW_INETATTR ); bStart = rSh.GetContentAtPos( aDocPos, - aSwContentAtPos, - false ); + aSwContentAtPos ); } if ( bStart && !m_bIsInDrag ) diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index b5d36c0923dd..4cbf5d5455dd 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -644,9 +644,9 @@ IMPL_LINK_NOARG_TYPED(SwEditWin, TimerHandler, Timer *, void) // take the center point of VisArea to // decide in which direction the user want. if( aModPt.Y() < ( rVisArea.Top() + rVisArea.Height() / 2 ) ) - rSh.Up( true, 1 ); + rSh.Up( true ); else - rSh.Down( true, 1 ); + rSh.Down( true ); } } @@ -780,7 +780,7 @@ static sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView& SfxItemSet aLangSet(rView.GetPool(), nWhich, nWhich); SwWrtShell& rSh = rView.GetWrtShell(); rSh.GetCurAttr(aLangSet); - if(SfxItemState::DEFAULT <= aLangSet.GetItemState(nWhich, true)) + if(SfxItemState::DEFAULT <= aLangSet.GetItemState(nWhich)) { LanguageType eLang = static_cast<const SvxLanguageItem&>(aLangSet.Get(nWhich)).GetLanguage(); if ( eLang == eBufferLanguage ) @@ -1833,7 +1833,7 @@ KEYINPUT_CHECKTABLE_INSDEL: case KEY_DELETE: if ( !rSh.HasReadonlySel() || rSh.CrsrInsideInputField()) { - if (rSh.IsInFrontOfLabel() && rSh.NumOrNoNum(false)) + if (rSh.IsInFrontOfLabel() && rSh.NumOrNoNum()) eKeyState = KS_NumOrNoNum; } else @@ -2259,7 +2259,7 @@ KEYINPUT_CHECKTABLE_INSDEL: if( bNormalChar && rSh.IsInFrontOfLabel() ) { - rSh.NumOrNoNum(false); + rSh.NumOrNoNum(); } if( !m_aInBuffer.isEmpty() && ( !bNormalChar || bIsDocReadOnly )) @@ -3592,7 +3592,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) { SwContentAtPos aContentAtPos( SwContentAtPos::SW_CLICKFIELD | SwContentAtPos::SW_INETATTR ); - if( rSh.GetContentAtPos( aDocPos, aContentAtPos, false ) && + if( rSh.GetContentAtPos( aDocPos, aContentAtPos ) && !rSh.IsReadOnlyAvailable() && aContentAtPos.IsInProtectSect() ) bLockView = true; @@ -4282,14 +4282,14 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) if (aTextBoxShapes.find(pFormat) == aTextBoxShapes.end()) { pSdrView->UnmarkAllObj(); - pSdrView->MarkObj(pObj,pPV,false); + pSdrView->MarkObj(pObj,pPV); } else { // If the fly frame is a textbox of a shape, then select the shape instead. SdrObject* pShape = aTextBoxShapes[pFormat]->FindSdrObject(); pSdrView->UnmarkAllObj(); - pSdrView->MarkObj(pShape, pPV, false); + pSdrView->MarkObj(pShape, pPV); } } } @@ -4399,7 +4399,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) if ( aSttPt != aEndPt ) { rSh.StartUndo( UNDO_UI_DRAG_AND_COPY ); - rSh.Copy(&rSh, aSttPt, aEndPt, false); + rSh.Copy(&rSh, aSttPt, aEndPt); rSh.EndUndo( UNDO_UI_DRAG_AND_COPY ); } } @@ -4525,7 +4525,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) SwContentAtPos::SW_INETATTR | SwContentAtPos::SW_SMARTTAG | SwContentAtPos::SW_FORMCTRL); - if( rSh.GetContentAtPos( aDocPt, aContentAtPos, false ) ) + if( rSh.GetContentAtPos( aDocPt, aContentAtPos ) ) { // Do it again if we're not on a field/hyperlink to update the cursor accordingly if ( SwContentAtPos::SW_FIELD != aContentAtPos.eContentAtPos @@ -5642,7 +5642,7 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) bool bUnLockView = !rSh.IsViewLocked(); rSh.LockView( true ); - bool bSelObj = rSh.SelectObj( aDocPos, 0); + bool bSelObj = rSh.SelectObj( aDocPos ); if( bUnLockView ) rSh.LockView( false ); diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index 93271eddbbdd..0bdf4e47d2ad 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -94,7 +94,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : if ( sURL.isEmpty() ) { SwContentAtPos aContentAtPos( SwContentAtPos::SW_INETATTR ); - if( rSh.GetContentAtPos( rDocPos, aContentAtPos, false)) + if( rSh.GetContentAtPos( rDocPos, aContentAtPos)) { const SwFormatINetFormat &rIItem = *static_cast<const SwFormatINetFormat*>(aContentAtPos.aFnd.pAttr); sURL = rIItem.GetValue(); diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 19048587803d..6ad94fe373b9 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -542,7 +542,7 @@ void SwSrcEditWindow::CreateTextEngine() pTextEngine->EnableUndo( true ); pTextEngine->SetUpdateMode( true ); - pTextView->ShowCursor( true ); + pTextView->ShowCursor(); InitScrollBars(); StartListening( *pTextEngine ); diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index f0f90478439e..3efc0ca2e1ce 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -44,7 +44,7 @@ // Taking the updated values from the set void SwPageExample::UpdateExample( const SfxItemSet& rSet ) { - if (SfxItemState::DEFAULT <= rSet.GetItemState(RES_FRAMEDIR, true)) + if (SfxItemState::DEFAULT <= rSet.GetItemState(RES_FRAMEDIR)) { const SvxFrameDirectionItem& rDirItem = static_cast<const SvxFrameDirectionItem&>(rSet.Get(RES_FRAMEDIR)); @@ -633,7 +633,7 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet ) { DELETEZ(pGridItem); //get the grid information - if(SfxItemState::DEFAULT <= rSet.GetItemState(RES_TEXTGRID, true)) + if(SfxItemState::DEFAULT <= rSet.GetItemState(RES_TEXTGRID)) pGridItem = static_cast<SwTextGridItem*>(static_cast<const SwTextGridItem&>(rSet.Get(RES_TEXTGRID)).Clone()); SwPageExample::UpdateExample(rSet); } diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 1c5e2351081b..da00c2b83f4e 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -855,7 +855,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) rSet.Put(aEditAttr.Get(nEEWhich), nWhich); if(nEEWhich == EE_CHAR_KERNING) { - SfxItemState eState = aEditAttr.GetItemState( EE_CHAR_KERNING, true ); + SfxItemState eState = aEditAttr.GetItemState( EE_CHAR_KERNING ); if ( eState == SfxItemState::DONTCARE ) { rSet.InvalidateItem(EE_CHAR_KERNING); diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 50c290802746..cac03184b213 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -1107,7 +1107,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) { rSh.EnterStdMode(); rSh.StartAllAction(); - rSh.GetLinkManager().UpdateAllLinks( false, false, false ); + rSh.GetLinkManager().UpdateAllLinks( false, false ); rSh.EndAllAction(); } } @@ -2559,7 +2559,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest ) rSh.StartUndo(UNDO_INSTABLE); bCallEndUndo = true; - bool bInserted = rSh.TextToTable( aInsTableOpts, '\t', text::HoriOrientation::FULL ); + bool bInserted = rSh.TextToTable( aInsTableOpts, '\t' ); rSh.EnterStdMode(); if (bInserted) rTempView.AutoCaption(TABLE_CAP); diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 69b808b99523..e18373416f52 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -500,7 +500,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) : text::WritingMode_TB_RL, SDRATTR_TEXTDIRECTION ) ); pTmpView->SetAttributes( aAttr ); - rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin(), false); + rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin()); rSh.GetView().AttrChangedNotify( &rSh ); } return; @@ -543,7 +543,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) aAttr.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) ); } pTmpView->SetAttributes( aAttr ); - rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin(), false ); + rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin() ); rSh.GetView().AttrChangedNotify( &rSh ); } return; diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 641b1f00257e..0cb89f9b01bf 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -1015,7 +1015,7 @@ void SwTableShell::Execute(SfxRequest &rReq) case FN_TABLE_MERGE_TABLE: { - bool bPrev = rSh.CanMergeTable( true ); + bool bPrev = rSh.CanMergeTable(); bool bNext = rSh.CanMergeTable( false ); if( bPrev && bNext ) diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 525d7cd88001..d004a735f1d5 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -156,7 +156,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) break; case FN_INSERT_SOFT_HYPHEN: - if( CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( true ) && + if( CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar() && CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( true, -1 )) rSh.Insert( OUString( CHAR_SOFTHYPHEN ) ); break; @@ -473,7 +473,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) // the suggestion has to be removed before GetView().GetEditWin().StopQuickHelp(); SvGlobalName aGlobalName( SO3_SM_CLASSID ); - rSh.InsertObject( svt::EmbeddedObjectRef(), &aGlobalName, true ); + rSh.InsertObject( svt::EmbeddedObjectRef(), &aGlobalName ); } break; @@ -580,7 +580,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog("FrameDialog", GetView().GetViewFrame(), &GetView().GetViewFrame()->GetWindow(), - aSet, true)); + aSet)); OSL_ENSURE(pDlg, "Dialog creation failed!"); if(pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet()) { diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 2e1b8eba6a56..0c042bb94e2c 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -1370,7 +1370,7 @@ void SwTextShell::Execute(SfxRequest &rReq) RES_TXTATR_INETFMT, RES_TXTATR_INETFMT); rWrtSh.GetCurAttr(aSet); - if(SfxItemState::SET <= aSet.GetItemState( RES_TXTATR_INETFMT, true )) + if(SfxItemState::SET <= aSet.GetItemState( RES_TXTATR_INETFMT )) { const SwFormatINetFormat& rINetFormat = dynamic_cast<const SwFormatINetFormat&>( aSet.Get(RES_TXTATR_INETFMT) ); if( nSlot == FN_COPY_HYPERLINK_LOCATION ) @@ -1718,7 +1718,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) RES_TXTATR_INETFMT, RES_TXTATR_INETFMT); rSh.GetCurAttr(aSet); - if(SfxItemState::SET > aSet.GetItemState( RES_TXTATR_INETFMT, true ) || rSh.HasReadonlySel()) + if(SfxItemState::SET > aSet.GetItemState( RES_TXTATR_INETFMT ) || rSh.HasReadonlySel()) { rSet.DisableItem(nWhich); } @@ -1732,8 +1732,8 @@ void SwTextShell::GetState( SfxItemSet &rSet ) rSh.GetCurAttr(aSet); // If a hyperlink is selected, either alone or along with other text... - if ((aSet.GetItemState(RES_TXTATR_INETFMT, true) < SfxItemState::SET && - aSet.GetItemState(RES_TXTATR_INETFMT, true) != SfxItemState::DONTCARE) || + if ((aSet.GetItemState(RES_TXTATR_INETFMT) < SfxItemState::SET && + aSet.GetItemState(RES_TXTATR_INETFMT) != SfxItemState::DONTCARE) || rSh.HasReadonlySel()) { rSet.DisableItem(nWhich); diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx index 41c4d84aaf6c..6ed39e5740b8 100644 --- a/sw/source/uibase/shells/txtcrsr.cxx +++ b/sw/source/uibase/shells/txtcrsr.cxx @@ -104,10 +104,10 @@ void SwTextShell::ExecBasicMove(SfxRequest &rReq) rSh.Right( CRSR_SKIP_CELLS, bSelect, 1, false, true ); break; case FN_LINE_UP: - rSh.Up( bSelect, 1 ); + rSh.Up( bSelect ); break; case FN_LINE_DOWN: - rSh.Down( bSelect, 1 ); + rSh.Down( bSelect ); break; default: OSL_FAIL("wrong Dispatcher"); @@ -415,7 +415,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq) bRet = rSh.GotoNxtPrvTOXMark( false ); break; case FN_NEXT_TBLFML: - bRet = rSh.GotoNxtPrvTableFormula( true ); + bRet = rSh.GotoNxtPrvTableFormula(); break; case FN_PREV_TBLFML: bRet = rSh.GotoNxtPrvTableFormula( false ); diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index 86f242bcf339..90b707c1a369 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -210,7 +210,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( aName = pSh->GetTableFormat()->GetName(); // insert node before table pSh->MoveTable( fnTableCurr, fnTableStart ); - pSh->Up( false, 1 ); + pSh->Up( false ); if ( pSh->IsCrsrInTable() ) { if ( aName != pSh->GetTableFormat()->GetName() ) diff --git a/sw/source/uibase/uiview/scroll.cxx b/sw/source/uibase/uiview/scroll.cxx index d95da36e3956..680af2a0ce1d 100644 --- a/sw/source/uibase/uiview/scroll.cxx +++ b/sw/source/uibase/uiview/scroll.cxx @@ -114,7 +114,7 @@ void SwScrollbar::AutoShow() } else if ( !ScrollBar::IsVisible() ) { - ScrollBar::Show(true); + ScrollBar::Show(); } } diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 0f5fd71d54f4..d6f7783d39b5 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1204,7 +1204,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse ) Point aCrsrPos2( nXTmp, nYTmp ); bSelectObj = m_pWrtShell->IsObjSelectable( aCrsrPos2 ); - m_pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos2, false ); + m_pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos2 ); if( bSelectObj ) { m_pWrtShell->SelectObj( aCrsrPos2 ); diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 982d5e96a72f..7c528dc42a31 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1544,7 +1544,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) RES_PARATR_NUMRULE, RES_PARATR_NUMRULE); rShell.GetCurAttr(aSet); if(SfxItemState::DEFAULT <= - aSet.GetItemState(RES_PARATR_NUMRULE, true)) + aSet.GetItemState(RES_PARATR_NUMRULE)) { const OUString& rNumStyle = static_cast<const SfxStringItem &>( diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 7a4364af6a11..421f2dce5a7e 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -495,7 +495,7 @@ bool SwView::EnterDrawTextMode(const Point& aDocPos) { // Refuse to edit editeng text of the shape if it has textbox attached. if (!lcl_isTextBox(pObj)) - bReturn = BeginTextEdit( pObj, pPV, m_pEditWin, false ); + bReturn = BeginTextEdit( pObj, pPV, m_pEditWin ); } pSdrView->SetHitTolerancePixel( nOld ); diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index c2d1fe64f42f..e37d68a55cc4 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1066,7 +1066,7 @@ static OUString lcl_CreateOutlineString( size_t nIndex, sEntry += "."; } sEntry += rOutlineNodes[ nIndex ]-> - GetTextNode()->GetExpandText( 0, -1, false ); + GetTextNode()->GetExpandText(); return sEntry; } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 3fd0e98e910b..878269290623 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1802,7 +1802,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, } } sEntry += pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText(nPos, false); - sOutlineText = pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText(nPos, true); + sOutlineText = pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText(nPos); bIsOutlineMoveable = static_cast<SwOutlineContent*>(pCnt)->IsMoveable(); bOutline = true; } diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 100fddaa9cf2..1c43dd420de4 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -827,7 +827,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry case CTX_UPDATE_LINK: case CTX_UPDATE_ALL: { - pActiveShell->GetLinkManager().UpdateAllLinks(true); + pActiveShell->GetLinkManager().UpdateAllLinks(); if(CTX_UPDATE_ALL == nSelectedPopupEntry) nSlot = FN_UPDATE_TOX; pCont = 0; @@ -989,7 +989,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry else { pActiveShell->SplitNode(); // Empty document - pActiveShell->Up( false, 1 ); + pActiveShell->Up( false ); } pActiveShell->GetView().GetEditWin().GrabFocus(); } diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 89065f4d2843..e7a3806b95e2 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -327,7 +327,7 @@ void SwWrtShell::UnSelectFrm() { // Remove Frame selection with guaranteed invalid position Point aPt(LONG_MIN, LONG_MIN); - SelectObj(aPt, 0); + SelectObj(aPt); SwTransferable::ClearSelection( *this ); } @@ -875,7 +875,7 @@ int SwWrtShell::IntelligentCut(int nSelection, bool bCut) return NO_WORD; cPrev = GetChar(false, -1); - cNext = GetChar(true); + cNext = GetChar(); int cWord = NO_WORD; // is a word selected? diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index cb690424a655..6e52a5ee8a1e 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -422,7 +422,7 @@ void SwWrtShell::ClickToINetAttr( const SwFormatINetFormat& rItem, sal_uInt16 nF { SwCallMouseEvent aCallEvent; aCallEvent.Set( &rItem ); - GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent, false ); + GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent ); } // So that the implementation of templates is displayed immediately @@ -452,7 +452,7 @@ bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter ) { SwCallMouseEvent aCallEvent; aCallEvent.Set( EVENT_OBJECT_URLITEM, pFnd ); - GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent, false ); + GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent ); } ::LoadURL(*this, sURL, nFilter, sTargetFrameName); |