diff options
Diffstat (limited to 'sw')
24 files changed, 66 insertions, 73 deletions
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index b57801d0a9ff..25419f142fcc 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -201,7 +201,7 @@ void SwBreakDlg::CheckEnable() { m_pPageBtn->Enable(false); if(m_pPageBtn->IsChecked()) - m_pLineBtn->Check(true); + m_pLineBtn->Check(); bEnable = false; } const bool bPage = m_pPageBtn->IsChecked(); diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index fc1bb7f79155..364bb2b64f03 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -211,8 +211,7 @@ void SwCharURLPage::Reset(const SfxItemSet* rSet) { const SwFormatINetFormat* pINetFormat = static_cast<const SwFormatINetFormat*>( pItem); m_pURLED->SetText(INetURLObject::decode(pINetFormat->GetValue(), - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8)); + INetURLObject::DECODE_UNAMBIGUOUS)); m_pURLED->SaveValue(); m_pURLED->SetText(pINetFormat->GetName()); diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 7c1fb0cea751..6d9738f7a8b6 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -246,7 +246,7 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) static_cast<SwParagraphNumTabPage&>(rPage).EnableNewStart(); ListBox & rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox(); SfxStyleSheetBasePool* pPool = rView.GetDocShell()->GetStyleSheetPool(); - pPool->SetSearchMask(SFX_STYLE_FAMILY_PSEUDO, SFXSTYLEBIT_ALL); + pPool->SetSearchMask(SFX_STYLE_FAMILY_PSEUDO); const SfxStyleSheetBase* pBase = pPool->First(); std::set<OUString> aNames; while(pBase) diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 62be945beb74..0dc4faacd151 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -182,7 +182,7 @@ void SwCondCollPage::Reset(const SfxItemSet *) m_pTbLinks->Clear(); SfxStyleSheetBasePool* pPool = m_rSh.GetView().GetDocShell()->GetStyleSheetPool(); - pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL); + pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA); m_pStyleLB->Clear(); const SfxStyleSheetBase* pBase = pPool->First(); while( pBase ) diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 4a8998a10821..a43554d65fb0 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -207,7 +207,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) { pObjShell = m_pWrtShell->GetView().GetDocShell(); if ( pObjShell ) - sDocTitle = pObjShell->GetTitle( SFX_TITLE_TITLE ); + sDocTitle = pObjShell->GetTitle(); } else { diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 4bf8261ee5ae..e348c107fb4e 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -419,7 +419,7 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) { OUString sHomePath(SvtPathOptions().GetWorkPath()); utl::TempFile aTempFile(sFind, true, &sExt, &sHomePath); - aTempFile.EnableKillingFile(true); + aTempFile.EnableKillingFile(); sTmpName = aTempFile.GetURL(); } xStore->storeAsURL(sTmpName, Sequence< PropertyValue >()); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index e036f32fe3dc..a7c8aa2fbde3 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -337,7 +337,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, // fill paragraph templates-ListBox { SfxStyleSheetBasePool* pPool = pView->GetDocShell()->GetStyleSheetPool(); - pPool->SetSearchMask( SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL ); + pPool->SetSearchMask( SFX_STYLE_FAMILY_PARA ); m_pLbDbParaColl->InsertEntry( sNoTmpl ); const SfxStyleSheetBase* pBase = pPool->First(); @@ -353,13 +353,13 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, if( pView->GetWrtShell().GetTableFormat() ) { m_pRbAsTable->Enable( false ); - m_pRbAsField->Check( true ); - m_pRbDbFormatFromDb->Check( true ); + m_pRbAsField->Check(); + m_pRbDbFormatFromDb->Check(); } else { - m_pRbAsTable->Check( true ); - m_pRbDbFormatFromDb->Check( true ); + m_pRbAsTable->Check(); + m_pRbDbFormatFromDb->Check(); m_pIbDbcolOneFrom->Enable( false ); m_pIbDbcolAllFrom->Enable( false ); } @@ -515,8 +515,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton ) nCnt = m_pLbTableDbColumn->GetEntryCount(); if( LISTBOX_APPEND == nInsPos ) for( n = 0; n < nCnt; ++n ) - m_pLbTableCol->InsertEntry( m_pLbTableDbColumn->GetEntry( n ), - LISTBOX_APPEND ); + m_pLbTableCol->InsertEntry( m_pLbTableDbColumn->GetEntry( n ) ); else for( n = 0; n < nCnt; ++n, ++nInsPos ) m_pLbTableCol->InsertEntry( m_pLbTableDbColumn->GetEntry( n ), nInsPos ); @@ -694,7 +693,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableFormatHdl, PushButton*, pButton ) // always set default-gap aBoxInfo.SetDefDist( MIN_BORDER_DIST ); // Single lines can have DontCare-status only in tables - aBoxInfo.SetValid( SvxBoxInfoItemValidFlags::DISABLE, true ); + aBoxInfo.SetValid( SvxBoxInfoItemValidFlags::DISABLE ); pTableSet->Put( aBoxInfo ); SwGetCurColNumPara aPara; @@ -1426,7 +1425,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, if( bUndo ) { - rSh.DoUndo( true ); + rSh.DoUndo(); rSh.AppendUndoForInsertFromDB( bAsTable ); rSh.EndUndo( UNDO_EMPTY ); } @@ -1823,7 +1822,7 @@ void SwInsertDBColAutoPilot::Load() // when the cursor is inside of a table, table must NEVER be selectable if( !m_pRbAsTable->IsEnabled() && m_pRbAsTable->IsChecked() ) - m_pRbAsField->Check( true ); + m_pRbAsField->Check(); break; } } diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index f13ccb01ea71..cc8e99ef03bf 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -461,7 +461,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig else while(nMoves) { - bool bMoved = rShell.MoveParagraph( 1 ); + bool bMoved = rShell.MoveParagraph(); if(!bMoved) { //insert a new paragraph before the greeting line diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index e4e96309df80..5925834e27a9 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -204,8 +204,7 @@ SectRepr::SectRepr( size_t nPos, SwSection& rSect ) void SectRepr::SetFile( const OUString& rFile ) { OUString sNewFile( INetURLObject::decode( rFile, - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8 )); + INetURLObject::DECODE_UNAMBIGUOUS )); const OUString sOldFileName( m_SectionData.GetLinkFileName() ); const OUString sSub( sOldFileName.getToken( 2, sfx2::cTokenSeparator ) ); @@ -290,8 +289,7 @@ OUString SectRepr::GetFile() const .replaceFirst( OUString(sfx2::cTokenSeparator), " ", &n ); } return INetURLObject::decode( sLinkFile.getToken( 0, sfx2::cTokenSeparator ), - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8 ); + INetURLObject::DECODE_UNAMBIGUOUS ); } OUString SectRepr::GetSubRegion() const @@ -584,12 +582,12 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) ::com::sun::star::uno::Sequence <sal_Int8> aCurPasswd; if( 1 < pBox->GetSelectionCount() ) { - m_pHideCB->EnableTriState(true); - m_pProtectCB->EnableTriState(true); + m_pHideCB->EnableTriState(); + m_pProtectCB->EnableTriState(); // edit in readonly sections - m_pEditInReadonlyCB->EnableTriState(true); + m_pEditInReadonlyCB->EnableTriState(); - m_pFileCB->EnableTriState(true); + m_pFileCB->EnableTriState(); bool bHiddenValid = true; bool bProtectValid = true; @@ -701,7 +699,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) m_pSubRegionED->Clear(); if( !aFile.isEmpty() || !sSub.isEmpty() ) { - m_pFileCB->Check(true); + m_pFileCB->Check(); m_pFileNameED->SetText(aFile); m_pSubRegionED->SetText(sSub); m_pDDECB->Check(rData.GetType() == DDE_LINK_SECTION); @@ -1763,7 +1761,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) if( bFile ) { m_pFileNameED->GrabFocus(); - m_pProtectCB->Check( true ); + m_pProtectCB->Check(); } else { @@ -1823,7 +1821,7 @@ IMPL_LINK_TYPED( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, if ( SfxItemState::SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, false, &pItem ) ) m_sFilePasswd = static_cast<const SfxStringItem*>(pItem)->GetValue(); m_pFileNameED->SetText( INetURLObject::decode( - m_sFileName, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ) ); + m_sFileName, INetURLObject::DECODE_UNAMBIGUOUS ) ); ::lcl_ReadSections(*pMedium, *m_pSubRegionED); } } diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 8fb8a3917c8c..17cf4ce5070f 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -133,13 +133,13 @@ IMPL_LINK_NOARG_TYPED(SwEnvPrtPage, AlignHdl, ToolBox *, void) { for (int i = ENV_HOR_LEFT; i <= ENV_VER_RGHT; ++i) m_pAlignBox->CheckItem(m_aIds[i], false); - m_pAlignBox->CheckItem(m_pAlignBox->GetCurItemId(), true); + m_pAlignBox->CheckItem(m_pAlignBox->GetCurItemId()); } else { // GetCurItemId() == 0 is possible! const SwEnvItem& rItem = static_cast<const SwEnvItem&>( GetItemSet().Get(FN_ENVELOP) ); - m_pAlignBox->CheckItem(m_aIds[rItem.eAlign], true); + m_pAlignBox->CheckItem(m_aIds[rItem.eAlign]); } } diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 10317ad739cd..72e2cd7a1f18 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -249,7 +249,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, m_pFormatHtmlCB->Check(bool(nMailingMode & MailTextFormats::HTML)); m_pFormatRtfCB->Check(bool(nMailingMode & MailTextFormats::RTF)); - m_pAllRB->Check(true); + m_pAllRB->Check(); // Install handlers Link<> aLk = LINK(this, SwMailMergeDlg, ButtonHdl); @@ -274,7 +274,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, FilenameHdl( m_pGenerateFromDataBaseCB ); aLk = LINK(this, SwMailMergeDlg, SaveTypeHdl); - m_pSaveSingleDocRB->Check( true ); + m_pSaveSingleDocRB->Check(); m_pSaveSingleDocRB->SetClickHdl( aLk ); m_pSaveIndividualRB->SetClickHdl( aLk ); aLk.Call( m_pSaveSingleDocRB ); diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 738eee2090fc..d344cd8ca3b5 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -430,7 +430,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) }//<-end ListBox & rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox(); SfxStyleSheetBasePool* pPool = pWrtShell->GetView().GetDocShell()->GetStyleSheetPool(); - pPool->SetSearchMask(SFX_STYLE_FAMILY_PSEUDO, SFXSTYLEBIT_ALL); + pPool->SetSearchMask(SFX_STYLE_FAMILY_PSEUDO); const SfxStyleSheetBase* pBase = pPool->First(); std::set<OUString> aNames; while(pBase) diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 266011e86c3e..8dadbbafcf74 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -642,7 +642,7 @@ void SwColumnPage::Reset(const SfxItemSet *rSet) if( SfxItemState::SET == rSet->GetItemState( RES_COLUMNBALANCE, false, &pItem )) m_pBalanceColsCB->Check(!static_cast<const SwFormatNoBalancedColumns*>(pItem)->GetValue()); else - m_pBalanceColsCB->Check( true ); + m_pBalanceColsCB->Check(); } //text direction diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 20c0b8b23905..a6ac4ab1aebf 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2329,18 +2329,18 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset) RangeModifyHdl(&m_aWidthED); // set reference values (for 100%) if (rSize.GetWidthPercent() == 0xff || rSize.GetHeightPercent() == 0xff) - m_pFixedRatioCB->Check(true); + m_pFixedRatioCB->Check(); if (rSize.GetWidthPercent() && rSize.GetWidthPercent() != 0xff && !m_pRelWidthCB->IsChecked()) { - m_pRelWidthCB->Check(true); + m_pRelWidthCB->Check(); RelSizeClickHdl(m_pRelWidthCB); m_aWidthED.SetPrcntValue(rSize.GetWidthPercent(), FUNIT_CUSTOM); } if (rSize.GetHeightPercent() && rSize.GetHeightPercent() != 0xff && !m_pRelHeightCB->IsChecked()) { - m_pRelHeightCB->Check(true); + m_pRelHeightCB->Check(); RelSizeClickHdl(m_pRelHeightCB); m_aHeightED.SetPrcntValue(rSize.GetHeightPercent(), FUNIT_CUSTOM); } @@ -2463,10 +2463,10 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) switch( eMirror ) { case RES_MIRROR_GRAPH_DONT: break; - case RES_MIRROR_GRAPH_VERT: m_pMirrorHorzBox->Check(true); break; - case RES_MIRROR_GRAPH_HOR: m_pMirrorVertBox->Check(true); break; - case RES_MIRROR_GRAPH_BOTH: m_pMirrorHorzBox->Check(true); - m_pMirrorVertBox->Check(true); + case RES_MIRROR_GRAPH_VERT: m_pMirrorHorzBox->Check(); break; + case RES_MIRROR_GRAPH_HOR: m_pMirrorVertBox->Check(); break; + case RES_MIRROR_GRAPH_BOTH: m_pMirrorHorzBox->Check(); + m_pMirrorVertBox->Check(); break; default: ; @@ -2481,7 +2481,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) { case 1: // mirror at left / even pages m_pLeftPagesRB->Check(); - m_pMirrorHorzBox->Check(true); + m_pMirrorHorzBox->Check(); break; case 2: // mirror on all pages m_pAllPagesRB->Check(); @@ -2594,8 +2594,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl) { // remember selected filter aFilterName = pGrfDlg->GetCurrentFilter(); aNewGrfName = INetURLObject::decode( pGrfDlg->GetPath(), - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8 ); + INetURLObject::DECODE_UNAMBIGUOUS ); m_pConnectED->SetModifyFlag(); m_pConnectED->SetText( aNewGrfName ); //reset mirrors because maybe a Bitmap was swapped with @@ -2792,8 +2791,7 @@ void SwFrmURLPage::Reset( const SfxItemSet *rSet ) { const SwFormatURL* pFormatURL = static_cast<const SwFormatURL*>(pItem); pURLED->SetText( INetURLObject::decode( pFormatURL->GetURL(), - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8 )); + INetURLObject::DECODE_UNAMBIGUOUS )); pNameED->SetText( pFormatURL->GetName()); pClientCB->Enable( pFormatURL->GetMap() != 0 ); diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index c3b1373bd340..c7574f6cef03 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -534,7 +534,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) if(m_pNoWrapRB->IsChecked() && !m_pNoWrapRB->IsEnabled()) { if(m_pWrapThroughRB->IsEnabled()) - m_pWrapThroughRB->Check(true); + m_pWrapThroughRB->Check(); else if(m_pWrapLeftRB->IsEnabled()) m_pWrapLeftRB->Check(); else if(m_pWrapRightRB->IsEnabled()) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 89bfda428365..76bbb9d8562f 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -848,7 +848,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r pIndexEntryWrapper = new IndexEntrySupplierWrapper(); m_pLanguageLB->SetLanguageList( SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, - false, false, false ); + false, false ); //Default mode is arranged to be the tallest mode //of alphabetical index, lock that height in now @@ -1268,8 +1268,7 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet* ) m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos(reinterpret_cast<void*>(nData))); sAutoMarkURL = INetURLObject::decode( rSh.GetTOIAutoMarkURL(), - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8 ); + INetURLObject::DECODE_UNAMBIGUOUS ); m_pFromFileCB->Check( !sAutoMarkURL.isEmpty() ); m_pCaptionSequenceLB->Clear(); @@ -1406,7 +1405,7 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox ) if(!m_pAddStylesCB->IsChecked() && !m_pFromHeadingsCB->IsChecked() && !m_pTOXMarksCB->IsChecked()) { //TODO: InfoBox? - pBox->Check(true); + pBox->Check(); } m_pAddStylesPB->Enable(m_pAddStylesCB->IsChecked()); } @@ -3159,7 +3158,7 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken& Size aEditSize(GetOutputSizePixel()); aEditSize.Width() = pButton->GetTextWidth(rText) + 5; pButton->SetSizePixel(aEditSize); - pButton->Check(true); + pButton->Check(); pButton->Show(); SetActiveControl(pButton); @@ -3639,7 +3638,7 @@ SwTOXStylesTabPage::SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& r m_pLevelLB->set_height_request(nHeight); m_pParaLayLB->set_height_request(nHeight); - SetExchangeSupport( true ); + SetExchangeSupport(); m_pEditStyleBT->SetClickHdl (LINK( this, SwTOXStylesTabPage, EditStyleHdl)); m_pAssignBT->SetClickHdl (LINK( this, SwTOXStylesTabPage, AssignHdl)); @@ -3906,7 +3905,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pB --nWidth; for(sal_uInt16 i = 1; i < 8; i++) InsertDataColumn( i, *aTitles[i - 1], nWidth, - HeaderBarItemBits::STDSTYLE, HEADERBAR_APPEND ); + HeaderBarItemBits::STDSTYLE ); } SwEntryBrowseBox::~SwEntryBrowseBox() @@ -4205,7 +4204,7 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAu } if(bError) - EndDialog(RET_CANCEL); + EndDialog(); } SwAutoMarkDlg_Impl::~SwAutoMarkDlg_Impl() diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 7504788770e3..6042913e64a4 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -432,7 +432,7 @@ static void lcl_SelectSameStrings(SwWrtShell& rSh, bool bWordOnly, bool bCaseSen //todo/mba: assuming that notes should not be searched bool bSearchInNotes = false; rSh.Find( aSearchOpt, bSearchInNotes, DOCPOS_START, DOCPOS_END, bCancel, - (FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY), false ); + (FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY) ); } void SwIndexMarkPane::InsertMark() @@ -621,7 +621,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, CloseHdl) } else { - m_rDialog.EndDialog(RET_CANCEL); + m_rDialog.EndDialog(); } return 0; } @@ -1120,7 +1120,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, CloseHdl) } else { - m_rDialog.EndDialog(RET_CANCEL); + m_rDialog.EndDialog(); } return 0; } @@ -1264,7 +1264,7 @@ IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, PushButton*, pButton) } if(bNewEntry && !m_pFromDocContentRB->IsChecked()) { - m_pFromDocContentRB->Check(true); + m_pFromDocContentRB->Check(); ChangeSourceHdl(m_pFromDocContentRB); } if(bCreate) diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 7df83b17c2b9..175e05992183 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -449,7 +449,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) { pGlossaryHdl->NewGlossary(m_pNameED->GetText(), m_pShortNameEdit->GetText(), - false, false); + false); } else if (sItemIdent == "replacetext") { diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index e105ca13355d..cbed5a87f647 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -91,7 +91,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberCharHdl) IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberEditHdl) { - m_pNumberCharBtn->Check( true ); + m_pNumberCharBtn->Check(); m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() ); return 0; @@ -105,7 +105,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberAutoBtnHdl) IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl) { - m_pNumberCharBtn->Check( true ); + m_pNumberCharBtn->Check(); SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT ); rSh.GetCurAttr( aSet ); diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 7af4e717e339..47a7b7c182e9 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -57,7 +57,7 @@ static void lcl_setLineNumbering(const OUString& rName, SwWrtShell* pSh, bool bL aFormat.SetCountLines(bLineNumber); rSet.Put(aFormat); xStyleSheet->MergeIndentAttrsOfListStyle( rSet ); - xStyleSheet->SetItemSet(rSet, false); + xStyleSheet->SetItemSet(rSet); } SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 98792e2213ec..c9eabce7157c 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -413,7 +413,7 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& ) for(sal_uInt16 i = 0; i < MAXLEVEL; i++) { if(nActNumLvl & nMask) - m_pLevelLB->SelectEntryPos( i, true); + m_pLevelLB->SelectEntryPos( i ); nMask <<= 1 ; } m_pLevelLB->SetUpdateMode(true); @@ -466,13 +466,13 @@ void SwNumPositionTabPage::Reset( const SfxItemSet* rSet ) m_pLevelLB->SetNoSelection(); if(nActNumLvl == USHRT_MAX) { - m_pLevelLB->SelectEntryPos( MAXLEVEL, true); + m_pLevelLB->SelectEntryPos( MAXLEVEL ); } else for(sal_uInt16 i = 0; i < MAXLEVEL; i++) { if(nActNumLvl & nMask) - m_pLevelLB->SelectEntryPos( i, true); + m_pLevelLB->SelectEntryPos( i ); nMask <<= 1; } m_pLevelLB->SetUpdateMode(true); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 78d379105563..76d56893dc0b 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -233,7 +233,7 @@ IMPL_LINK_NOARG(SwOutlineTabDialog, CancelHdl) { if (!bModified) rWrtSh.ResetModified(); - EndDialog(RET_CANCEL); + EndDialog(); return 0; } diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 11698c348e1c..cbe3a891b340 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -178,11 +178,11 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet) if(lHeight) { m_pMaxHeightEdit->SetValue(m_pMaxHeightEdit->Normalize(lHeight),FUNIT_TWIP); - m_pMaxHeightBtn->Check(true); + m_pMaxHeightBtn->Check(); } else { - m_pMaxHeightPageBtn->Check(true); + m_pMaxHeightPageBtn->Check(); m_pMaxHeightEdit->Enable(false); } m_pMaxHeightPageBtn->SetClickHdl(LINK(this,SwFootNotePage,HeightPage)); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 3603b39de74c..535d1b69b473 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -175,7 +175,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) else { m_pColumnRB->Enable(false); - m_pRowRB->Check(true); + m_pRowRB->Check(); m_pColLbl->SetText(aColText); } @@ -224,7 +224,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) if(!m_pDelimTabRB->IsChecked()) { m_pDelimEdt->SetText(OUString(cDeli)); - m_pDelimFreeRB->Check(true); + m_pDelimFreeRB->Check(); DelimHdl(m_pDelimFreeRB); } else @@ -439,7 +439,7 @@ IMPL_LINK( SwSortDlg, CheckHdl, void *, pControl ) else if(!m_pKeyCB1->IsChecked() && !m_pKeyCB2->IsChecked() && !m_pKeyCB3->IsChecked()) - static_cast<CheckBox *>(pControl)->Check(true); + static_cast<CheckBox *>(pControl)->Check(); return 0; } |