From 3af36642f1b703b698fe2d53e8c064233dd64de8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 12 Sep 2018 09:37:37 +0200 Subject: loplugin:simplifyconstruct in sw Change-Id: I17c9009637edc04d9d06fa9a0bd19572eefd4fe8 Reviewed-on: https://gerrit.libreoffice.org/60370 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/source/ui/chrdlg/chardlg.cxx | 1 - sw/source/ui/dbui/dbinsdlg.cxx | 2 -- sw/source/ui/dbui/mmlayoutpage.cxx | 1 - sw/source/ui/dialog/uiregionsw.cxx | 2 -- sw/source/ui/envelp/envlop1.cxx | 2 -- sw/source/ui/fldui/javaedit.cxx | 1 - sw/source/ui/frmdlg/column.cxx | 4 ---- sw/source/ui/frmdlg/frmpage.cxx | 1 - sw/source/ui/index/cnttab.cxx | 3 --- sw/source/ui/index/swuiidxmrk.cxx | 2 -- sw/source/ui/misc/glossary.cxx | 1 - sw/source/ui/misc/num.cxx | 1 - sw/source/ui/misc/titlepage.cxx | 1 - 13 files changed, 22 deletions(-) (limited to 'sw/source/ui') diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 716d88528121..9dfa7dd920c8 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -133,7 +133,6 @@ void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SwCharURLPage::SwCharURLPage(TabPageParent pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "modules/swriter/ui/charurlpage.ui", "CharURLPage", &rCoreSet) - , pINetItem(nullptr) , bModified(false) , m_xURLED(m_xBuilder->weld_entry("urled")) , m_xTextFT(m_xBuilder->weld_label("textft")) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 74de0e146404..00541fb7181e 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -191,8 +191,6 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, , aDBData(rData) , sNoTmpl(SwResId(SW_STR_NONE)) , pView(&rView) - , pTableSet(nullptr) - , pRep(nullptr) { get(m_pRbAsTable, "astable"); get(m_pRbAsField, "asfields"); diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 23e6d7b845a2..a67325a730ec 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -77,7 +77,6 @@ using namespace ::com::sun::star::view; SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : svt::OWizardPage(_pParent, "MMLayoutPage", "modules/swriter/ui/mmlayoutpage.ui") - , m_pExampleFrame(nullptr) , m_pExampleWrtShell(nullptr) , m_pAddressBlockFormat(nullptr) , m_bIsGreetingInserted(false) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index bbf7f3c6838a..659a5473df04 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -317,7 +317,6 @@ SwEditRegionDlg::SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh ) "modules/swriter/ui/editsectiondialog.ui") , m_bSubRegionsFilled(false) , rSh(rWrtSh) - , m_pDocInserter(nullptr) , bDontCheckPasswd(true) { get(m_pCurName, "curname"); @@ -1513,7 +1512,6 @@ SwInsertSectionTabPage::SwInsertSectionTabPage( : SfxTabPage(pParent, "SectionPage", "modules/swriter/ui/sectionpage.ui", &rAttrSet) , m_pWrtSh(nullptr) - , m_pDocInserter(nullptr) { get(m_pCurName, "sectionnames"); m_pCurName->SetStyle(m_pCurName->GetStyle() | WB_SORT); diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 16118d2ab258..23974fd60fa4 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -125,8 +125,6 @@ SwEnvDlg::SwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, , aEnvItem(static_cast( rSet.Get(FN_ENVELOP))) , pSh(pWrtSh) , pPrinter(pPrt) - , pAddresseeSet(nullptr) - , pSenderSet(nullptr) , m_xModify(m_xBuilder->weld_button("modify")) { if (!bInsert) diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 02c649984936..5b1fc9cbfa11 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -42,7 +42,6 @@ SwJavaEditDialog::SwJavaEditDialog(weld::Window* pParent, SwWrtShell* pWrtSh) , m_bNew(true) , m_bIsUrl(false) , m_pSh(pWrtSh) - , m_pFileDlg(nullptr) , m_xTypeED(m_xBuilder->weld_entry("scripttype")) , m_xUrlRB(m_xBuilder->weld_radio_button("url")) , m_xEditRB(m_xBuilder->weld_radio_button("text")) diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 5ad0abb3ae6c..51a66653b94e 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -86,9 +86,6 @@ inline bool IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect ) SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh) : weld::GenericDialogController(pParent, "modules/swriter/ui/columndialog.ui", "ColumnDialog") , m_rWrtShell(rSh) - , m_pPageSet(nullptr) - , m_pSectionSet(nullptr) - , m_pSelectionSet(nullptr) , m_pFrameSet(nullptr) , m_nOldSelection(0) , m_nSelectionWidth(0) @@ -381,7 +378,6 @@ void SwColumnPage::ResetColWidth() // Now as TabPage SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "modules/swriter/ui/columnpage.ui", "ColumnPage", &rSet) - , m_xColMgr(nullptr) , m_nFirstVis(0) , m_nMinWidth(MINLAY) , m_pModifiedField(nullptr) diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 8925187a4a7a..a76e9034904d 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2373,7 +2373,6 @@ void SwFramePage::EnableVerticalPositioning( bool bEnable ) SwGrfExtPage::SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "PicturePage", "modules/swriter/ui/picturepage.ui", &rSet) - , pGrfDlg(nullptr) , bHtmlMode(false) { get(m_pMirror, "flipframe"); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 82ae77962ea9..445c83a83006 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -219,7 +219,6 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& "modules/swriter/ui/tocdialog.ui", &rSet) , m_pMgr( new SwTOXMgr( &rShell ) ) , m_rWrtShell(rShell) - , m_pExampleFrame(nullptr) , m_pParamTOXBase(pCurTOX) , m_sUserDefinedIndex(SwResId(STR_USER_DEFINED_INDEX)) , m_nInitialTOXType(nToxType) @@ -762,7 +761,6 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, Button*, pBtn, void) SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "TocIndexPage", "modules/swriter/ui/tocindexpage.ui", &rAttrSet) - , pIndexRes(nullptr) , sAutoMarkType(SwResId(STR_AUTOMARK_TYPE)) , m_bWaitingInitialSettings(true) { @@ -3614,7 +3612,6 @@ sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType) const SwTOXStylesTabPage::SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet ) : SfxTabPage(pParent, "TocStylesPage", "modules/swriter/ui/tocstylespage.ui", &rAttrSet) - , m_pCurrentForm(nullptr) { get(m_pLevelLB, "levels"); get(m_pAssignBT, "assign"); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index dd1d887723e4..dd0c76f59f7b 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -85,8 +85,6 @@ SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg, , bPhoneticED2_ChangedByUser(false) , nLangForPhoneticReading(LANGUAGE_CHINESE_SIMPLIFIED) , bIsPhoneticReadingEnabled(false) - , xExtendedIndexEntrySupplier(nullptr) - , pTOXMgr(nullptr) , pSh(&rWrtShell) { rDialog.get(m_pFrame, "frame"); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 1d991e7ab272..5e7cee384d25 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -183,7 +183,6 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame const * pViewFrame, : SvxStandardDialog(&pViewFrame->GetWindow(), "AutoTextDialog", "modules/swriter/ui/autotext.ui") , sReadonlyPath(SwResId(STR_READONLY_PATH)) - , pExampleFrame(nullptr) , pGlossaryHdl(pGlosHdl) , bResume(false) , bSelection(pWrtShell->IsSelection()) diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index b127062e75bf..5b8d8b066e95 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -56,7 +56,6 @@ static bool bLastRelative = false; //merged SwNumPositionTabPage::SwNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "modules/swriter/ui/outlinepositionpage.ui", "OutlinePositionPage", &rSet) - , pActNum(nullptr) , pSaveNum(nullptr) , pWrtSh(nullptr) , pOutlineDlg(nullptr) diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 7415b6be78c3..06d9728cc0c7 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -149,7 +149,6 @@ sal_uInt16 SwTitlePageDlg::GetInsertPosition() const SwTitlePageDlg::SwTitlePageDlg(weld::Window *pParent) : GenericDialogController(pParent, "modules/swriter/ui/titlepage.ui", "DLG_TITLEPAGE") - , mpPageFormatDesc(nullptr) , m_xUseExistingPagesRB(m_xBuilder->weld_radio_button("RB_USE_EXISTING_PAGES")) , m_xPageCountNF(m_xBuilder->weld_spin_button("NF_PAGE_COUNT")) , m_xDocumentStartRB(m_xBuilder->weld_radio_button("RB_DOCUMENT_START")) -- cgit