From 6c5fa17611b8f8f3c94473eabd768f310de3e7ff Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 21 Aug 2015 09:03:23 +0200 Subject: loplugin: defaultparams Change-Id: I2315996f0fa147615554baf8607882eb32af2f34 --- sw/source/ui/table/convert.cxx | 2 +- sw/source/ui/table/tabledlg.cxx | 22 ++++++++-------- sw/source/ui/vba/vbatablehelper.cxx | 2 +- sw/source/uibase/app/appenv.cxx | 4 +-- sw/source/uibase/app/applab.cxx | 2 +- sw/source/uibase/app/docsh.cxx | 8 +++--- sw/source/uibase/app/docsh2.cxx | 12 ++++----- sw/source/uibase/app/docst.cxx | 2 +- sw/source/uibase/app/docstyle.cxx | 20 +++++++-------- sw/source/uibase/app/swmodul1.cxx | 2 +- sw/source/uibase/config/uinums.cxx | 2 +- sw/source/uibase/dbui/dbmgr.cxx | 7 +++-- sw/source/uibase/dbui/dbui.cxx | 2 +- .../uibase/dialog/SwSpellDialogChildWindow.cxx | 4 +-- sw/source/uibase/dochdl/gloshdl.cxx | 10 ++++---- sw/source/uibase/dochdl/swdtflvr.cxx | 4 +-- sw/source/uibase/docvw/AnnotationMenuButton.cxx | 8 +++--- sw/source/uibase/docvw/AnnotationWin.cxx | 8 +++--- sw/source/uibase/docvw/HeaderFooterWin.cxx | 6 ++--- sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 2 +- sw/source/uibase/docvw/SidebarWin.cxx | 4 +-- sw/source/uibase/docvw/edtwin.cxx | 30 +++++++++++----------- sw/source/uibase/docvw/romenu.cxx | 2 +- sw/source/uibase/docvw/srcedtw.cxx | 10 ++++---- sw/source/uibase/lingu/olmenu.cxx | 14 +++++----- sw/source/uibase/misc/glosdoc.cxx | 2 +- sw/source/uibase/misc/redlndlg.cxx | 4 +-- sw/source/uibase/ribbar/conform.cxx | 2 +- sw/source/uibase/ribbar/drawbase.cxx | 2 +- sw/source/uibase/ribbar/inputwin.cxx | 6 ++--- sw/source/uibase/ribbar/workctrl.cxx | 2 +- 31 files changed, 103 insertions(+), 104 deletions(-) (limited to 'sw/source') diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index be75802e7a94..866c2f006e76 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -217,7 +217,7 @@ IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton ) { if( mpKeepColumn->IsEnabled() ) mpKeepColumn->SaveValue(); - mpKeepColumn->Check( true ); + mpKeepColumn->Check(); } mpKeepColumn->Enable( mpTabBtn->IsChecked() ); mpOtherEd->Enable( mpOtherBtn->IsChecked() ); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 6283bbdccead..1a490e2b2bf9 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -483,7 +483,7 @@ void SwFormatTablePage::Reset( const SfxItemSet* ) if(pTableData->GetWidthPercent()) { - m_pRelWidthCB->Check(true); + m_pRelWidthCB->Check(); RelWidthClickHdl(m_pRelWidthCB); m_aWidthMF.SetPrcntValue(pTableData->GetWidthPercent(), FUNIT_CUSTOM); @@ -1564,9 +1564,9 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet ) m_pPageCollCB->Enable(); m_pPgBrkCB->Check(); - m_pPgBrkCB->Check( true ); + m_pPgBrkCB->Check(); m_pColBrkRB->Check( false ); - m_pPgBrkBeforeRB->Check( true ); + m_pPgBrkBeforeRB->Check(); m_pPgBrkAfterRB->Check( false ); } else @@ -1592,28 +1592,28 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet ) switch ( eBreak ) { case SVX_BREAK_PAGE_BEFORE: - m_pPgBrkRB->Check( true ); + m_pPgBrkRB->Check(); m_pColBrkRB->Check( false ); - m_pPgBrkBeforeRB->Check( true ); + m_pPgBrkBeforeRB->Check(); m_pPgBrkAfterRB->Check( false ); break; case SVX_BREAK_PAGE_AFTER: - m_pPgBrkRB->Check( true ); + m_pPgBrkRB->Check(); m_pColBrkRB->Check( false ); m_pPgBrkBeforeRB->Check( false ); - m_pPgBrkAfterRB->Check( true ); + m_pPgBrkAfterRB->Check(); break; case SVX_BREAK_COLUMN_BEFORE: m_pPgBrkRB->Check( false ); - m_pColBrkRB->Check( true ); - m_pPgBrkBeforeRB->Check( true ); + m_pColBrkRB->Check(); + m_pPgBrkBeforeRB->Check(); m_pPgBrkAfterRB->Check( false ); break; case SVX_BREAK_COLUMN_AFTER: m_pPgBrkRB->Check( false ); - m_pColBrkRB->Check( true ); + m_pColBrkRB->Check(); m_pPgBrkBeforeRB->Check( false ); - m_pPgBrkAfterRB->Check( true ); + m_pPgBrkAfterRB->Check(); break; default:; //prevent warning } diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index 8a960548ce6b..84e34638145d 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, false ); + pTable->GetTabCols( rCols, pStart, false ); } sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols& rCols ) diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index f4fcb423ff86..cd19bc6ce47c 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -454,7 +454,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) // Move Flys to the "old" pages if (!aFlyArr.empty()) - pSh->SetPageObjsNewPage(aFlyArr, 1); + pSh->SetPageObjsNewPage(aFlyArr); // Finished pSh->SttEndDoc(true); @@ -462,7 +462,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) pSh->EndAllAction(); if (nMode == ENV_NEWDOC) - pSh->DoUndo(true); + pSh->DoUndo(); else pSh->EndUndo(UNDO_UI_INSERT_ENVELOPE); diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index f7778b3fb6f4..454ac3d60e47 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -389,7 +389,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) pSh->GotoFly(pFirstFlyFormat->GetName(), FLYCNTTYPE_ALL, false); pSh->EndAllAction(); - pSh->DoUndo( true ); + pSh->DoUndo(); } if( rItem.aWriting.indexOf( '<' ) >= 0 ) diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 7a3d9be84173..e1237d3c1a69 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -795,7 +795,7 @@ bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor DELETEZ(m_pOLEChildList); if( bResetModified ) - EnableSetModified( true ); + EnableSetModified(); } return bRet; } @@ -840,7 +840,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, delete pOrig; } if ( bResetModified ) - EnableSetModified( true ); + EnableSetModified(); } void SwDocShell::SetVisArea( const Rectangle &rRect ) @@ -861,7 +861,7 @@ void SwDocShell::SetVisArea( const Rectangle &rRect ) aRect.Move( nMoveX, nMoveY ); // Calls SfxInPlaceObject::SetVisArea()! - m_pView->SetVisArea( aRect, true ); + m_pView->SetVisArea( aRect ); } else SfxObjectShell::SetVisArea( aRect ); @@ -875,7 +875,7 @@ Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const SwNodeIndex aIdx( m_pDoc->GetNodes().GetEndOfExtras(), 1 ); SwContentNode* pNd = m_pDoc->GetNodes().GoNext( &aIdx ); - const SwRect aPageRect = pNd->FindPageFrmRect( false, 0, false ); + const SwRect aPageRect = pNd->FindPageFrmRect( false, 0 ); return aPageRect.SVRect(); } return SfxObjectShell::GetVisArea( nAspect ); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 8037523dfa9c..1f28a9fe6cbf 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -304,7 +304,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( !bIsDocModified ) m_pDoc->getIDocumentState().ResetModified(); if ( bResetModified ) - EnableSetModified( true ); + EnableSetModified(); } break; } @@ -1129,7 +1129,7 @@ void SwDocShell::Execute(SfxRequest& rReq) pViewShell = pVFrame ? pVFrame->GetViewShell() : 0; pCurrView = dynamic_cast( pViewShell ); } - m_pDoc->GetNumberFormatter(true)->SetYear2000(nYear2K); + m_pDoc->GetNumberFormatter()->SetYear2000(nYear2K); } break; case FN_OPEN_FILE: @@ -1234,7 +1234,7 @@ void SwDocShell::SetModified( bool bSet ) else m_pDoc->getIDocumentState().ResetModified(); - EnableSetModified( true ); + EnableSetModified(); } UpdateChildWindows(); @@ -1391,12 +1391,12 @@ sal_uLong SwDocShell::LoadStylesFromFile( const OUString& rURL, // search for filter in WebDocShell, too SfxMedium aMed( rURL, STREAM_STD_READ ); const SfxFilter* pFlt = 0; - aMatcher.DetectFilter( aMed, &pFlt, false, false ); + aMatcher.DetectFilter( aMed, &pFlt, false ); if(!pFlt) { OUString sWebFactory(OUString::createFromAscii(SwWebDocShell::Factory().GetShortName())); SfxFilterMatcher aWebMatcher( sWebFactory ); - aWebMatcher.DetectFilter( aMed, &pFlt, false, false ); + aWebMatcher.DetectFilter( aMed, &pFlt, false ); } // --> OD #i117339# - trigger import only for own formats bool bImport( false ); @@ -1566,7 +1566,7 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh, pMed->GetItemSet()->Put( SfxStringItem( SID_PASSWORD, rPasswd )); if( !pSfxFlt ) - aMatcher.DetectFilter( *pMed, &pSfxFlt, false, false ); + aMatcher.DetectFilter( *pMed, &pSfxFlt, false ); if( pSfxFlt ) { diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index a6407ed1369c..9815b98a6a1d 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -817,7 +817,7 @@ sal_uInt16 SwDocShell::Edit( { if( bNew ) { - GetWrtShell()->Undo(1); + GetWrtShell()->Undo(); m_pDoc->GetIDocumentUndoRedo().ClearRedo(); } diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 6c1411a0f4ea..a66148cf6bf3 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -1182,7 +1182,7 @@ SfxItemSet& SwDocStyleSheet::GetItemSet() aBoxInfo.SetMinDist( true );// set minimum size in tables and paragraphs aBoxInfo.SetDefDist( MIN_BORDER_DIST );// always set Default-Gap // Single lines can only have DontCare-Status in tables - aBoxInfo.SetValid( SvxBoxInfoItemValidFlags::DISABLE, true ); + aBoxInfo.SetValid( SvxBoxInfoItemValidFlags::DISABLE ); if( nFamily == SFX_STYLE_FAMILY_CHAR ) { @@ -1342,7 +1342,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, const OUString sStyle = pCondItem->GetStyle( i ); if (sStyle.isEmpty()) continue; - SwFormat *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0, true ); + SwFormat *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0 ); if (pFindFormat) { aCond.RegisterToFormat( *pFindFormat ); @@ -1374,7 +1374,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, const OUString sStyle = pCondItem->GetStyle( i ); if (sStyle.isEmpty()) continue; - SwTextFormatColl *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0, true ); + SwTextFormatColl *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0 ); if (pFindFormat) { pCColl->InsertCondition( SwCollCondition( pFindFormat, @@ -1723,7 +1723,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) { bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); - pCharFormat = lcl_FindCharFormat(rDoc, aName, this, true ); + pCharFormat = lcl_FindCharFormat(rDoc, aName, this ); } pFormat = pCharFormat; @@ -1750,7 +1750,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) { bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); - pColl = lcl_FindParaFormat(rDoc, aName, this, true ); + pColl = lcl_FindParaFormat(rDoc, aName, this ); } pFormat = pColl; @@ -1773,7 +1773,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) { bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); - pFrameFormat = lcl_FindFrameFormat(rDoc, aName, this, true ); + pFrameFormat = lcl_FindFrameFormat(rDoc, aName, this ); } pFormat = pFrameFormat; if( !bCreate && !pFormat ) @@ -1792,7 +1792,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) { bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); - pDesc = lcl_FindPageDesc( rDoc, aName, this, true ); + pDesc = lcl_FindPageDesc( rDoc, aName, this ); } if( pDesc ) @@ -1820,7 +1820,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) { bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); - pNumRule = lcl_FindNumRule( rDoc, aName, this, true ); + pNumRule = lcl_FindNumRule( rDoc, aName, this ); } if( pNumRule ) @@ -1898,7 +1898,7 @@ void SwDocStyleSheet::Create() if( !pCharFormat ) pCharFormat = rDoc.MakeCharFormat(aName, rDoc.GetDfltCharFormat()); - pCharFormat->SetAuto( false ); + pCharFormat->SetAuto(); break; case SFX_STYLE_FAMILY_PARA : @@ -2833,7 +2833,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Next() mxIterSheet->SetMask( nMask ); if(mxIterSheet->pSet) { - mxIterSheet->pSet->ClearItem(0); + mxIterSheet->pSet->ClearItem(); mxIterSheet->pSet= 0; } return mxIterSheet.get(); diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index 1dc1d29285c3..d6aaa2385e81 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -133,7 +133,7 @@ SwView* SwModule::GetNextView(SwView* pView) { OSL_ENSURE(PTR_CAST(SwView, pView),"return no SwView"); const TypeId aTypeId = TYPE(SwView); - SwView* pNView = static_cast(SfxViewShell::GetNext(*pView, &aTypeId, true)); + SwView* pNView = static_cast(SfxViewShell::GetNext(*pView, &aTypeId)); return pNView; } diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx index 7ac29152690f..4c33c075b102 100644 --- a/sw/source/uibase/config/uinums.cxx +++ b/sw/source/uibase/config/uinums.cxx @@ -256,7 +256,7 @@ void SwNumRulesWithName::_SwNumFormatGlobal::ChgNumFormat( SwWrtShell& rSh, if( IsPoolUserFormat( nCharPoolId ) ) { pFormat = rSh.MakeCharFormat( sCharFormatName ); - pFormat->SetAuto( false ); + pFormat->SetAuto(); } else pFormat = rSh.GetCharFormatFromPool( nCharPoolId ); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index a5c97013a7ba..912f27407f41 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1309,7 +1309,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, } } pWorkView->StartPrint( aOptions, IsMergeSilent(), rMergeDescriptor.bPrintAsync ); - SfxPrinter* pDocPrt = pWorkView->GetPrinter(false); + SfxPrinter* pDocPrt = pWorkView->GetPrinter(); JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : SfxViewShell::GetJobSetup(); Printer::PreparePrintJob( pWorkView->GetPrinterController(), aJobSetup ); #if ENABLE_CUPS && !defined(MACOSX) @@ -2637,8 +2637,7 @@ OUString SwDBManager::LoadAndRegisterDataSource(const DBConnURITypes type, const uno::Reference xDBContext = sdb::DatabaseContext::create(xContext); OUString sNewName = INetURLObject::decode( aURL.getName(), - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8 ); + INetURLObject::DECODE_UNAMBIGUOUS ); sal_Int32 nExtLen = aURL.GetExtension().getLength(); sNewName = sNewName.replaceAt( sNewName.getLength() - nExtLen - 1, nExtLen + 1, "" ); if (pPrefix) @@ -2692,7 +2691,7 @@ OUString SwDBManager::LoadAndRegisterDataSource(const DBConnURITypes type, const // Cannot embed, as embedded data source would need the URL of the parent document. OUString sHomePath(SvtPathOptions().GetWorkPath()); utl::TempFile aTempFile(sNewName, true, &sOutputExt, pDestDir ? pDestDir : &sHomePath); - aTempFile.EnableKillingFile(true); + aTempFile.EnableKillingFile(); OUString sTmpName = aTempFile.GetURL(); xStore->storeAsURL(sTmpName, uno::Sequence()); } diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx index fbbdf3b262dc..a23431460407 100644 --- a/sw/source/uibase/dbui/dbui.cxx +++ b/sw/source/uibase/dbui/dbui.cxx @@ -121,7 +121,7 @@ CancelableDialog::~CancelableDialog() void CancelableDialog::dispose() { - EndDialog( 0 ); + EndDialog(); m_pCancelButton.clear(); Dialog::dispose(); diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index b6b157d4a25a..f2c2c338ae1a 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -542,7 +542,7 @@ void SwSpellDialogChildWindow::GetFocus() case SHELL_MODE_TABLE_LIST_TEXT: { SwPaM* pCursor = pWrtShell->GetCrsr(); - if(m_pSpellState->m_pPointNode != &pCursor->GetNode(true) || + if(m_pSpellState->m_pPointNode != &pCursor->GetNode() || m_pSpellState->m_pMarkNode != &pCursor->GetNode(false)|| m_pSpellState->m_nPointPos != pCursor->GetPoint()->nContent.GetIndex()|| m_pSpellState->m_nMarkPos != pCursor->GetMark()->nContent.GetIndex()) @@ -599,7 +599,7 @@ void SwSpellDialogChildWindow::LoseFocus() { // store a node pointer and a pam-position to be able to check on next GetFocus(); SwPaM* pCursor = pWrtShell->GetCrsr(); - m_pSpellState->m_pPointNode = &pCursor->GetNode(true); + m_pSpellState->m_pPointNode = &pCursor->GetNode(); m_pSpellState->m_pMarkNode = &pCursor->GetNode(false); m_pSpellState->m_nPointPos = pCursor->GetPoint()->nContent.GetIndex(); m_pSpellState->m_nMarkPos = pCursor->GetMark()->nContent.GetIndex(); diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 9f44305e1175..b7a293a209bc 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -155,7 +155,7 @@ OUString SwGlossaryHdl::GetGroupName( size_t nId, OUString* pTitle ) OUString sRet = rStatGlossaries.GetGroupName(nId); if(pTitle) { - SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sRet, false); + SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sRet); if (pGroup && !pGroup->GetError()) { *pTitle = pGroup->GetName(); @@ -190,7 +190,7 @@ bool SwGlossaryHdl::RenameGroup(const OUString& rOld, OUString& rNew, const OUSt FindGroupName(sOldGroup); if(rOld == rNew) { - SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sOldGroup, false); + SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sOldGroup); if(pGroup) { pGroup->SetName(rNewTitle); @@ -214,8 +214,8 @@ bool SwGlossaryHdl::RenameGroup(const OUString& rOld, OUString& rNew, const OUSt bool SwGlossaryHdl::CopyOrMove( const OUString& rSourceGroupName, OUString& rSourceShortName, const OUString& rDestGroupName, const OUString& rLongName, bool bMove ) { - SwTextBlocks* pSourceGroup = rStatGlossaries.GetGroupDoc(rSourceGroupName, false); - SwTextBlocks* pDestGroup = rStatGlossaries.GetGroupDoc(rDestGroupName, false); + SwTextBlocks* pSourceGroup = rStatGlossaries.GetGroupDoc(rSourceGroupName); + SwTextBlocks* pDestGroup = rStatGlossaries.GetGroupDoc(rDestGroupName); if (pDestGroup->IsReadOnly() || (bMove && pSourceGroup->IsReadOnly()) ) { delete pDestGroup; @@ -278,7 +278,7 @@ OUString SwGlossaryHdl::GetGlossaryShortName(const OUString &rName) { OUString sReturn; SwTextBlocks *pTmp = - pCurGrp ? pCurGrp: rStatGlossaries.GetGroupDoc( aCurGrp, false ); + pCurGrp ? pCurGrp: rStatGlossaries.GetGroupDoc( aCurGrp ); if(pTmp) { sal_uInt16 nIdx = pTmp->GetLongIndex( rName ); diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 206579d4b627..64a8b1a43b8f 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -743,7 +743,7 @@ bool SwTransferable::WriteObject( tools::SvRef& xStream, SwDoc* pDoc = static_cast(pObject); xWrt->bWriteClipboardDoc = true; xWrt->bWriteOnlyFirstTable = 0 != (TRNSFR_TABELLE & eBufferType); - xWrt->SetShowProgress( false ); + xWrt->SetShowProgress(); #if defined(DEBUGPASTE) SvFileStream aPasteDebug(OUString( @@ -3199,7 +3199,7 @@ void SwTransferable::DragFinished( sal_Int8 nAction ) { if ( !(pWrtShell->IsSelFrmMode() || pWrtShell->IsObjSelected()) ) //SmartCut, take one of the blanks along - pWrtShell->IntelligentCut( pWrtShell->GetSelectionType(), true ); + pWrtShell->IntelligentCut( pWrtShell->GetSelectionType() ); pWrtShell->DelRight(); } pWrtShell->EndUndo( UNDO_UI_DRAG_AND_MOVE ); diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index 2df32e5f72bd..3a207b03e865 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -84,9 +84,9 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt ) else { pButtonPopup->EnableItem(FN_DELETE_COMMENT, !mrSidebarWin.IsProtected() ); - pButtonPopup->EnableItem(FN_DELETE_NOTE_AUTHOR, true ); - pButtonPopup->EnableItem(FN_DELETE_ALL_NOTES, true ); - pButtonPopup->EnableItem(FN_FORMAT_ALL_NOTES, true ); + pButtonPopup->EnableItem(FN_DELETE_NOTE_AUTHOR); + pButtonPopup->EnableItem(FN_DELETE_ALL_NOTES); + pButtonPopup->EnableItem(FN_FORMAT_ALL_NOTES); } if (mrSidebarWin.IsProtected()) @@ -111,7 +111,7 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt ) } else { - pButtonPopup->EnableItem(FN_REPLY, true); + pButtonPopup->EnableItem(FN_REPLY); } } diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index efe88768a5a9..f8a25e3e8795 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -106,7 +106,7 @@ void SwAnnotationWin::SetPostItText() { Engine()->Clear(); GetOutlinerView()->SetAttribs(DefaultItem()); - GetOutlinerView()->InsertText(sNewText,false); + GetOutlinerView()->InsertText(sNewText); } Engine()->ClearModifyFlag(); @@ -243,15 +243,15 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText) + " (" + rLocalData.getDate( pWin->GetDate()) + ", " + rLocalData.getTime( pWin->GetTime(), false) + "): \""; - GetOutlinerView()->InsertText(aText,false); + GetOutlinerView()->InsertText(aText); // insert old, selected text or "..." // TODO: iterate over all paragraphs, not only first one to find out if it is empty if (!pText->GetTextObject().GetText(0).isEmpty()) GetOutlinerView()->GetEditView().InsertText(pText->GetTextObject()); else - GetOutlinerView()->InsertText(OUString("..."),false); - GetOutlinerView()->InsertText(OUString("\"\n"),false); + GetOutlinerView()->InsertText(OUString("...")); + GetOutlinerView()->InsertText(OUString("\"\n")); GetOutlinerView()->SetSelection(ESelection(0,0,EE_PARA_ALL,EE_TEXTPOS_ALL)); SfxItemSet aAnswerSet( DocView().GetDocShell()->GetPool() ); diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 5533fd63d112..af2b08ac77e3 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -452,17 +452,17 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot ) const SfxPoolItem* pItem; if ( SfxItemState::SET == aSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { pHFFormat->SetFormatAttr( *pItem ); - rView.GetDocShell()->SetModified(true); + rView.GetDocShell()->SetModified(); } if ( SfxItemState::SET == aSet.GetItemState( RES_BOX, false, &pItem ) ) { pHFFormat->SetFormatAttr( *pItem ); - rView.GetDocShell()->SetModified(true); + rView.GetDocShell()->SetModified(); } if ( SfxItemState::SET == aSet.GetItemState( RES_SHADOW, false, &pItem ) ) { pHFFormat->SetFormatAttr( *pItem ); - rView.GetDocShell()->SetModified(true); + rView.GetDocShell()->SetModified(); } } } diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index 94f7356a4cbf..114cf66f6e25 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -256,7 +256,7 @@ void SidebarTextControlAccessibleContext::ProcessWindowEvent( const VclWindowEve case VCLEVENT_WINDOW_GETFOCUS: case VCLEVENT_CONTROL_GETFOCUS: { - mpAccessibleTextHelper->SetFocus( true ); + mpAccessibleTextHelper->SetFocus(); } break; case VCLEVENT_WINDOW_LOSEFOCUS: diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 4157947b0469..63bd1f1d70df 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1185,7 +1185,7 @@ IMPL_LINK(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll) IMPL_LINK_NOARG(SwSidebarWin, ModifyHdl) { - mrView.GetDocShell()->SetModified(true); + mrView.GetDocShell()->SetModified(); return 0; } @@ -1349,7 +1349,7 @@ void SwSidebarWin::SwitchToFieldPos() GotoPos(); sal_uInt32 aCount = MoveCaret(); if (aCount) - mrView.GetDocShell()->GetWrtShell()->SwCrsrShell::Right(aCount, 0, false); + mrView.GetDocShell()->GetWrtShell()->SwCrsrShell::Right(aCount, 0); GrabFocusToDocument(); } diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 1ca2bf911178..e27c158762f5 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -1293,7 +1293,7 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir ) // switch snapping off if(!bWasNoSnap) - const_cast(rDragStat).SetNoSnap(true); + const_cast(rDragStat).SetNoSnap(); if(bWasSnapEnabled) pSdrView->SetSnapEnabled(false); @@ -1614,7 +1614,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt) else rSh.SttSelect(); rSh.MoveSection( fnSectionCurr, fnSectionEnd ); - rSh.Pop( true ); + rSh.Pop(); rSh.EndSelect(); sFormulaEntry = "="; } @@ -1984,7 +1984,7 @@ KEYINPUT_CHECKTABLE_INSDEL: } } if ( bCallNumOrNoNum - && rSh.NumOrNoNum( !bOnlyBackspaceKey, true ) ) + && rSh.NumOrNoNum( !bOnlyBackspaceKey ) ) { eKeyState = KS_NumOrNoNum; } @@ -2208,10 +2208,10 @@ KEYINPUT_CHECKTABLE_INSDEL: rSh.GetCurAttr(aSet); if(SfxItemState::SET == aSet.GetItemState(RES_TXTATR_INETFMT, false)) { - const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, true); + const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT); bNormalChar = false; eKeyState = KS_End; - rSh.ClickToINetAttr(static_cast(rItem), URLLOAD_NOFILTER); + rSh.ClickToINetAttr(static_cast(rItem)); } } } @@ -2464,7 +2464,7 @@ KEYINPUT_CHECKTABLE_INSDEL: break; case KS_NumDown: - rSh.NumUpDown( true ); + rSh.NumUpDown(); m_nKS_NUMDOWN_Count = 2; break; case KS_NumUp: @@ -2496,7 +2496,7 @@ KEYINPUT_CHECKTABLE_INSDEL: break; case KS_OutlineDown: - rSh.OutlineUpDown( 1 ); + rSh.OutlineUpDown(); break; case KS_OutlineUp: rSh.OutlineUpDown( -1 ); @@ -3016,7 +3016,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) pHdl->GetKind() == HDL_ANCHOR_TR ) ) { // #i121463# Set selected during drag - pHdl->SetSelected(true); + pHdl->SetSelected(); m_pAnchorMarker = new SwAnchorMarker( pHdl ); UpdatePointer( aDocPos, rMEvt.GetModifier() ); return; @@ -4074,7 +4074,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) { if ( m_pApplyTempl ) { - UpdatePointer(aDocPt, 0); // maybe a frame has to be marked here + UpdatePointer(aDocPt); // maybe a frame has to be marked here break; } // change ui if mouse is over SwPostItField @@ -4257,14 +4257,14 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) if (aTextBoxShapes.find(pFormat) == aTextBoxShapes.end()) { pSdrView->UnmarkAllObj(); - pSdrView->MarkObj(pObj,pPV,false,false); + pSdrView->MarkObj(pObj,pPV,false); } 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, false); + pSdrView->MarkObj(pShape, pPV, false); } } } @@ -5435,7 +5435,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) rSh.GetCrsr()->GetPoint()->nContent = nPosIdx; rSh.GetCrsr()->GetMark()->nNode = nPosNodeIdx; rSh.GetCrsr()->GetMark()->nContent = - rSh.GetCrsr()->GetContentNode( true )->Len(); + rSh.GetCrsr()->GetContentNode()->Len(); } else if( nPosNodeIdx == nMarkNodeIdx ) { @@ -5590,7 +5590,7 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) rSh.Edit(); } - UpdatePointer( aDocPos, 0 ); + UpdatePointer( aDocPos ); if( !rSh.IsSelFrmMode() && !GetView().GetViewFrame()->GetDispatcher()->IsLocked() ) @@ -5628,7 +5628,7 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) rSh.EnterSelFrmMode( &aDocPos ); g_bFrmDrag = true; - UpdatePointer( aDocPos, 0 ); + UpdatePointer( aDocPos ); return bRet; } } @@ -5683,7 +5683,7 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) m_rView.LeaveDrawCreate(); m_rView.AttrChangedNotify( &rSh ); } - UpdatePointer( aDocPos, 0 ); + UpdatePointer( aDocPos ); bRet = true; } } diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index 6896e9bb5fc6..b659f83c3110 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -63,7 +63,7 @@ void SwReadOnlyPopup::Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher &rD SfxItemState eState = rDis.GetBindings()->QueryState( nSID, _pItem ); if (eState >= SfxItemState::DEFAULT) { - EnableItem( nMID, true ); + EnableItem( nMID ); if (_pItem) { CheckItem ( nMID, !_pItem->ISA(SfxVoidItem) && diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 4665d844507e..1b585cd15a34 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, true ); + pTextView->ShowCursor( true ); InitScrollBars(); StartListening( *pTextEngine ); @@ -580,14 +580,14 @@ IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll) { long nDiff = pTextView->GetStartDocPos().Y() - pScroll->GetThumbPos(); GetTextView()->Scroll( 0, nDiff ); - pTextView->ShowCursor( false, true ); + pTextView->ShowCursor( false ); pScroll->SetThumbPos( pTextView->GetStartDocPos().Y() ); } else { long nDiff = pTextView->GetStartDocPos().X() - pScroll->GetThumbPos(); GetTextView()->Scroll( nDiff, 0 ); - pTextView->ShowCursor( false, true ); + pTextView->ShowCursor( false ); pScroll->SetThumbPos( pTextView->GetStartDocPos().X() ); } GetSrcView()->GetViewFrame()->GetBindings().Invalidate( SID_TABLE_CELL ); @@ -656,7 +656,7 @@ void SwSrcEditWindow::DoSyntaxHighlight( sal_uInt16 nPara ) if ( nPara < pTextEngine->GetParagraphCount() ) { bool bTempModified = IsModified(); - pTextEngine->RemoveAttribs( nPara, true ); + pTextEngine->RemoveAttribs( nPara ); OUString aSource( pTextEngine->GetText( nPara ) ); pTextEngine->SetUpdateMode( false ); ImpDoHighlight( aSource, nPara ); @@ -739,7 +739,7 @@ void SwSrcEditWindow::ImpDoHighlight( const OUString& rSource, sal_uInt16 nLineO r.eType = svtools::HTMLUNKNOWN; Color aColor((ColorData)SW_MOD()->GetColorConfig().GetColorValue((svtools::ColorConfigEntry)r.eType).nColor); sal_uInt16 nLine = nLineOff+r.nLine; - pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1, true ); + pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1 ); } } diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index d04ef90da678..d5c6c50915d8 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -207,7 +207,7 @@ void SwSpellPopup::fillLangPopupMenu( if (aEntryText == aCurLang) { //make a check mark for the current language - pPopupMenu->CheckItem( nItemId, true ); + pPopupMenu->CheckItem( nItemId ); } rLangTable[ nItemId ] = aEntryText; ++nItemId; @@ -216,7 +216,7 @@ void SwSpellPopup::fillLangPopupMenu( pPopupMenu->InsertItem( nLangItemIdStart + MN_NONE_OFFSET, OUString(SW_RES( STR_LANGSTATUS_NONE )), MenuItemBits::RADIOCHECK ); if ( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) == aCurLang ) - pPopupMenu->CheckItem( nLangItemIdStart + MN_NONE_OFFSET, true ); + pPopupMenu->CheckItem( nLangItemIdStart + MN_NONE_OFFSET ); pPopupMenu->InsertItem( nLangItemIdStart + MN_RESET_OFFSET, OUString(SW_RES( STR_RESET_TO_DEFAULT_LANGUAGE )), MenuItemBits::NONE ); pPopupMenu->InsertItem( nLangItemIdStart + MN_MORE_OFFSET, OUString(SW_RES( STR_LANGSTATUS_MORE )), MenuItemBits::NONE ); @@ -432,11 +432,11 @@ SwSpellPopup::SwSpellPopup( pMenu = GetPopupMenu(MN_SET_LANGUAGE_SELECTION); fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_SELECTION_START, aSeq, pWrtSh, m_aLangTable_Text ); - EnableItem( MN_SET_LANGUAGE_SELECTION, true ); + EnableItem( MN_SET_LANGUAGE_SELECTION ); pMenu = GetPopupMenu(MN_SET_LANGUAGE_PARAGRAPH); fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_PARAGRAPH_START, aSeq, pWrtSh, m_aLangTable_Paragraph ); - EnableItem( MN_SET_LANGUAGE_PARAGRAPH, true ); + EnableItem( MN_SET_LANGUAGE_PARAGRAPH ); if (bUseImagesInMenus) { @@ -581,11 +581,11 @@ m_aInfo16( SW_RES(IMG_INFO_16) ) PopupMenu *pMenu = GetPopupMenu(MN_SET_LANGUAGE_SELECTION); fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_SELECTION_START, aSeq, pWrtSh, m_aLangTable_Text ); - EnableItem( MN_SET_LANGUAGE_SELECTION, true ); + EnableItem( MN_SET_LANGUAGE_SELECTION ); pMenu = GetPopupMenu(MN_SET_LANGUAGE_PARAGRAPH); fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_PARAGRAPH_START, aSeq, pWrtSh, m_aLangTable_Paragraph ); - EnableItem( MN_SET_LANGUAGE_PARAGRAPH, true ); + EnableItem( MN_SET_LANGUAGE_PARAGRAPH ); if (bUseImagesInMenus) { @@ -653,7 +653,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) if (0 <= nAltIdx && nAltIdx < m_aSuggestions.getLength() && (m_bGrammarResults || m_xSpellAlt.is())) { bool bOldIns = m_pSh->IsInsMode(); - m_pSh->SetInsMode( true ); + m_pSh->SetInsMode(); OUString aTmp( m_aSuggestions[ nAltIdx ] ); OUString aOrig( m_bGrammarResults ? OUString() : m_xSpellAlt->getWord() ); diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx index df1f77ae5781..4d002603692b 100644 --- a/sw/source/uibase/misc/glosdoc.cxx +++ b/sw/source/uibase/misc/glosdoc.cxx @@ -147,7 +147,7 @@ OUString SwGlossaries::GetGroupTitle( const OUString& rGroupName ) OUString sGroup(rGroupName); if (sGroup.indexOf(GLOS_DELIM)<0) FindGroupName(sGroup); - SwTextBlocks* pGroup = GetGroupDoc(sGroup, false); + SwTextBlocks* pGroup = GetGroupDoc(sGroup); if(pGroup) { sRet = pGroup->GetName(); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 8c17d0b0c186..3c574200454b 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -191,7 +191,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer { pActLB->InsertEntry(sFormatCollSet); pActLB->InsertEntry(sAutoFormat); - pTPView->ShowUndo(true); + pTPView->ShowUndo(); pTPView->DisableUndo(); // no UNDO events yet } @@ -1110,7 +1110,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) rRedline.GetRedlineData().GetTimeStamp() ), SID_ATTR_POSTIT_DATE )); - boost::scoped_ptr pDlg(pFact->CreateSvxPostItDialog( pParentDlg, aSet, false )); + boost::scoped_ptr pDlg(pFact->CreateSvxPostItDialog( pParentDlg, aSet )); OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->HideAuthor(); diff --git a/sw/source/uibase/ribbar/conform.cxx b/sw/source/uibase/ribbar/conform.cxx index 29b1a343770b..fe9ed99e6680 100644 --- a/sw/source/uibase/ribbar/conform.cxx +++ b/sw/source/uibase/ribbar/conform.cxx @@ -101,7 +101,7 @@ void ConstFormControl::CreateDefaultObject() m_pSh->MakeDrawView(); SdrView *pSdrView = m_pSh->GetDrawView(); - pSdrView->SetDesignMode(true); + pSdrView->SetDesignMode(); m_pSh->BeginCreate( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), FmFormInventor, aStartPos); m_pSh->MoveCreate(aEndPos); m_pSh->EndCreate(SDRCREATE_FORCEEND); diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index 80d55eae1b77..aea8dbecbd2e 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -56,7 +56,7 @@ SwDrawBase::SwDrawBase(SwWrtShell* pSwWrtShell, SwEditWin* pWindow, SwView* pSwV SwDrawBase::~SwDrawBase() { if (m_pView->GetWrtShellPtr()) // In the view-dtor could the wrtsh already been deleted... - m_pSh->GetDrawView()->SetEditMode(true); + m_pSh->GetDrawView()->SetEditMode(); } bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index c9c4f45d5bce..702a7b828b01 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -136,8 +136,8 @@ void SwInputWindow::dispose() // wake rulers if(pView) { - pView->GetHRuler().SetActive( true ); - pView->GetVRuler().SetActive( true ); + pView->GetHRuler().SetActive(); + pView->GetVRuler().SetActive(); } delete pMgr; if(pWrtShell) @@ -246,7 +246,7 @@ void SwInputWindow::ShowWin() m_bDoesUndo = pWrtShell->DoesUndo(); if( !m_bDoesUndo ) { - pWrtShell->DoUndo( true ); + pWrtShell->DoUndo(); } if( !pWrtShell->SwCrsrShell::HasSelection() ) diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 81f546240309..a7c1e4ada781 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -335,7 +335,7 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& sal_uInt16 nItemId = SwView::GetMoveType(); m_pInfoField->SetText(m_pToolBox->GetItemText(nItemId)); - m_pToolBox->CheckItem( nItemId, true ); + m_pToolBox->CheckItem( nItemId ); m_pToolBox->SetSelectHdl(LINK(this, SwScrollNaviPopup, SelectHdl)); m_pToolBox->StartSelection(); -- cgit