diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-06 10:30:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-06 14:38:52 +0200 |
commit | c289c25523496f58b81e061cea82757c99e99957 (patch) | |
tree | f85f43251ddfce0ea6aa23f46729139c04497b2c /cui | |
parent | 07e87211c2b2e98fd176fef2018723b50c8dbb1a (diff) |
loplugin:simplifyconstruct in canvas..cui
Change-Id: I02eba1df117a9d0df42bcac13c3251cb4fa6da14
Reviewed-on: https://gerrit.libreoffice.org/60074
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/acccfg.cxx | 1 | ||||
-rw-r--r-- | cui/source/customize/cfg.cxx | 6 | ||||
-rw-r--r-- | cui/source/customize/macropg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 1 | ||||
-rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 1 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hyphen.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 3 | ||||
-rw-r--r-- | cui/source/dialogs/srchxtra.cxx | 1 | ||||
-rw-r--r-- | cui/source/dialogs/thesdlg.cxx | 1 | ||||
-rw-r--r-- | cui/source/inc/cfg.hxx | 3 | ||||
-rw-r--r-- | cui/source/options/optcolor.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optlingu.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 10 | ||||
-rw-r--r-- | cui/source/tabpages/numfmt.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 12 | ||||
-rw-r--r-- | cui/source/tabpages/tparea.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 1 | ||||
-rw-r--r-- | cui/source/tabpages/tplneend.cxx | 1 |
19 files changed, 7 insertions, 54 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 00717a1a7547..a06a68703d8d 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -886,7 +886,6 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey) SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const SfxItemSet& aSet ) : SfxTabPage(pParent, "AccelConfigPage", "cui/ui/accelconfigpage.ui", &aSet) , m_pMacroInfoItem() - , m_pFileDlg(nullptr) , aLoadAccelConfigStr(CuiResId(RID_SVXSTR_LOADACCELCONFIG)) , aSaveAccelConfigStr(CuiResId(RID_SVXSTR_SAVEACCELCONFIG)) , aFilterCfgStr(CuiResId(RID_SVXSTR_FILTERNAME_CFG)) diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index e7e4565e5d8b..fac9928510cc 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -395,8 +395,7 @@ MenuSaveInData::MenuSaveInData( m_aMenuResourceURL( ITEM_MENUBAR_URL ), m_aDescriptorContainer( - ITEM_DESCRIPTOR_CONTAINER ), - pRootEntry( nullptr ) + ITEM_DESCRIPTOR_CONTAINER ) { try { @@ -1887,7 +1886,6 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( weld::Window* pParent, SvxEntries* entries, SvxConfigEntry const * selection, bool bCreateMenu ) : GenericDialogController(pParent, "cui/ui/movemenu.ui", "MoveMenuDialog") - , mpEntries(nullptr) , m_xMenuBox(m_xBuilder->weld_widget("namebox")) , m_xMenuNameEdit(m_xBuilder->weld_entry("menuname")) , m_xMenuListBox(m_xBuilder->weld_tree_view("menulist")) @@ -2034,7 +2032,6 @@ SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName, , bIsModified( false ) , bIsVisible( true ) , nStyle( 0 ) - , mpEntries( nullptr ) { if (bPopUp) { @@ -2075,7 +2072,6 @@ ToolbarSaveInData::ToolbarSaveInData( bool docConfig ) : SaveInData ( xCfgMgr, xParentCfgMgr, aModuleId, docConfig ), - pRootEntry ( nullptr ), m_aDescriptorContainer ( ITEM_DESCRIPTOR_CONTAINER ) { diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index dbba1ebe1aa2..e0ab01b783f2 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -214,8 +214,6 @@ void SvxMacroTabPage_::EnableButtons() SvxMacroTabPage_::SvxMacroTabPage_(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rAttrSet) : SfxTabPage( pParent, rID, rUIXMLDescription, &rAttrSet ), - m_xAppEvents(nullptr), - m_xDocEvents(nullptr), bDocModified(false), bAppEvents(false), bInitialized(false) diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 4caf324c9ecd..e544ff18fce5 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -55,7 +55,6 @@ using namespace css; SvxCharacterMap::SvxCharacterMap(weld::Window* pParent, const SfxItemSet* pSet, bool bInsert) : GenericDialogController(pParent, "cui/ui/specialcharacters.ui", "SpecialCharactersDialog") , m_xVirDev(VclPtr<VirtualDevice>::Create()) - , pSubsetMap( nullptr ) , isSearchMode(true) , m_bHasInsert(bInsert) , mxContext(comphelper::getProcessComponentContext()) diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 75425a9672df..103e3c599e94 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -76,7 +76,6 @@ FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialTex ,m_sCancel( Button::GetStandardText( StandardButtonType::Cancel ) ) ,m_pPreSearchFocus( nullptr ) ,m_lnkContextSupplier(lnkContextSupplier) - ,m_pConfig( nullptr ) { get(m_prbSearchForText,"rbSearchForText"); get(m_prbSearchForNull,"rbSearchForNull"); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index bb7c12b627ef..9da0f6a2d2f8 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1098,7 +1098,6 @@ namespace svx HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(vcl::Window* _pParent) : ModalDialog( _pParent, "HangulHanjaOptDialog", "cui/ui/hangulhanjaoptdialog.ui" ) - , m_xConversionDictionaryList(nullptr) { get(m_pDictsLB, "dicts"); get(m_pIgnorepostCB, "ignorepost"); @@ -1723,7 +1722,6 @@ namespace svx ,m_aEditHintText ( CuiResId(RID_SVXSTR_EDITHINT) ) ,m_rDictList ( _rDictList ) ,m_nCurrentDict ( 0xFFFFFFFF ) - ,m_pSuggestions ( nullptr ) ,m_nTopPos ( 0 ) ,m_bModifiedSuggestions ( false ) ,m_bModifiedOriginal ( false ) diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index c055268dd9f3..ba55b4c3bc26 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -422,8 +422,6 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( SvxSpellWrapper* pWrapper) : SfxModalDialog(pParent, "HyphenateDialog", "cui/ui/hyphenate.ui") , m_pHyphWrapper(pWrapper) - , m_xHyphenator(nullptr) - , m_xPossHyph(nullptr) , m_aActWord(rWord) , m_nActLanguage(nLang) , m_nMaxHyphenationPos(0) diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 969bf03cdf36..9147492639e6 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -150,8 +150,7 @@ IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, mnCurrentPageId ( HyperLinkPageType::NONE ), pSet ( nullptr ), - pExampleSet ( nullptr ), - pRanges ( nullptr ) + pExampleSet ( nullptr ) { get(m_pOKBtn, "ok"); get(m_pApplyBtn, "apply"); diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 0f2907ce02dc..edfb1d0df063 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -35,7 +35,6 @@ SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabDialog(pParent, "SearchFormatDialog", "cui/ui/searchformatdialog.ui", &rSet) - , m_pFontList(nullptr) , m_nNamePageId(0) , m_nParaStdPageId(0) , m_nParaAlignPageId(0) diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 0438c335d4e3..003568a0f2fa 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -441,7 +441,6 @@ SvxThesaurusDialog::SvxThesaurusDialog( LanguageType nLanguage) : SvxStandardDialog(pParent, "ThesaurusDialog", "cui/ui/thesaurus.ui") , m_aErrStr(CuiResId(RID_SVXSTR_ERR_TEXTNOTFOUND)) - , xThesaurus(nullptr) , aLookUpText() , nLookUpLanguage(LANGUAGE_NONE) , m_bWordFound(false) diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 00ef79f0f552..b151dad1433f 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -284,8 +284,7 @@ public: bIsParentData( false ), bIsModified( false ), bIsVisible( true ), - nStyle( 0 ), - mpEntries( nullptr ) + nStyle( 0 ) {} ~SvxConfigEntry(); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 91b9d75a2269..48b7874f850e 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -982,8 +982,6 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "OptAppearancePage", "cui/ui/optappearancepage.ui", &rCoreSet) , bFillItemSetCalled(false) - , pColorConfig(nullptr) - , pExtColorConfig(nullptr) { get(m_pColorSchemeLB, "colorschemelb"); m_pColorSchemeLB->SetStyle(m_pColorSchemeLB->GetStyle() | WB_SORT); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index c427c10cd9dd..afd2f4c5de2a 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -948,9 +948,7 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) sNumPreBreak (CuiResId(RID_SVXSTR_NUM_PRE_BREAK)), sNumPostBreak (CuiResId(RID_SVXSTR_NUM_POST_BREAK)), sHyphAuto (CuiResId(RID_SVXSTR_HYPH_AUTO)), - sHyphSpecial (CuiResId(RID_SVXSTR_HYPH_SPECIAL)), - - pLinguData(nullptr) + sHyphSpecial (CuiResId(RID_SVXSTR_HYPH_SPECIAL)) { get(m_pLinguModulesFT, "lingumodulesft"); get(m_pLinguModulesCLB, "lingumodules"); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index c6c325b38fe3..5bf5038bb93c 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -170,7 +170,6 @@ private: BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent) : Window(pParent, WB_BORDER) , bIsBmp(false) - , pBitmap(nullptr) , aDrawRect(Point(0,0), GetOutputSizePixel()) { SetBorderStyle(WindowBorderStyle::MONO); @@ -321,9 +320,6 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe , bCharBackColor(false) , m_bColorSelected(false) , pPageImpl(new SvxBackgroundPage_Impl) - , pImportDlg(nullptr) - , pTableBck_Impl(nullptr) - , pHighlighting(nullptr) { get(m_pAsGrid, "asgrid"); get(m_pSelectTxt, "asft"); @@ -902,7 +898,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() { SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = nullptr; - XColorListRef pColorTable = nullptr; + XColorListRef pColorTable; if ( pDocSh && ( nullptr != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) ) { pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); @@ -1455,7 +1451,7 @@ SvxBkgTabPage::SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs) SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = nullptr; - XColorListRef pColorTable = nullptr; + XColorListRef pColorTable; if ( pDocSh && ( nullptr != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) ) { pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); @@ -1464,7 +1460,7 @@ SvxBkgTabPage::SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs) if ( !pColorTable.is() ) pColorTable = XColorList::CreateStdColorList(); - XBitmapListRef pBitmapList = nullptr; + XBitmapListRef pBitmapList; if ( pDocSh && ( nullptr != ( pItem = pDocSh->GetItem( SID_BITMAP_LIST ) ) ) ) { pBitmapList = static_cast<const SvxBitmapListItem*>(pItem)->GetBitmapList(); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 304bfbe6187f..dad69bc6dc1c 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -234,8 +234,6 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "NumberingFormatPage", "cui/ui/numberingformatpage.ui", &rCoreAttrs) - , pNumItem(nullptr) - , pNumFmtShell(nullptr) , nInitFormat(ULONG_MAX) , sAutomaticEntry(CuiResId(RID_SVXSTR_AUTO_ENTRY)) , pLastActivWindow(nullptr) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 0ed2f6b325c9..6f5445084751 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -173,8 +173,6 @@ static const vcl::Font& lcl_GetDefaultBulletFont() SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui", &rSet) - , pActNum(nullptr) - , pSaveNum(nullptr) , nActNumLvl(SAL_MAX_UINT16) , bModified(false) , bPreset(false) @@ -362,8 +360,6 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) SvxBulletPickTabPage::SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickBulletPage", "cui/ui/pickbulletpage.ui", &rSet) - , pActNum(nullptr) - , pSaveNum(nullptr) , nActNumLvl(SAL_MAX_UINT16) , bModified(false) , bPreset(false) @@ -523,8 +519,6 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet) SvxNumPickTabPage::SvxNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickOutlinePage", "cui/ui/pickoutlinepage.ui", &rSet) - , pActNum(nullptr) - , pSaveNum(nullptr) , nActNumLvl(SAL_MAX_UINT16) , nNumItemId(SID_ATTR_NUMBERING_RULE) , bModified(false) @@ -771,8 +765,6 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet) SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickGraphicPage", "cui/ui/pickgraphicpage.ui", &rSet) - , pActNum(nullptr) - , pSaveNum(nullptr) , nActNumLvl(SAL_MAX_UINT16) , nNumItemId(SID_ATTR_NUMBERING_RULE) , bModified(false) @@ -1066,8 +1058,6 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void) SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", &rSet) - , pActNum(nullptr) - , pSaveNum(nullptr) , bLastWidthModified(false) , bModified(false) , bPreset(false) @@ -2554,8 +2544,6 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tool SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", &rSet) - , pActNum(nullptr) - , pSaveNum(nullptr) , nActNumLvl(1) , nNumItemId(SID_ATTR_NUMBERING_RULE) , bModified(false) diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 655c532a1aab..2386d48f527f 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -84,12 +84,6 @@ void lclExtendSize(Size& rSize, const Size& rInputSize) SvxAreaTabPage::SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs) : SvxTabPage(pParent, "cui/ui/areatabpage.ui", "AreaTabPage", rInAttrs) - , m_pFillTabPage(nullptr) - , m_pColorList(nullptr) - , m_pGradientList(nullptr) - , m_pHatchingList(nullptr) - , m_pBitmapList(nullptr) - , m_pPatternList(nullptr) // local fixed not o be changed values for local pointers , maFixed_ChangeType(ChangeType::NONE) // init with pointers to fixed ChangeType diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 7e8682d255ac..089e07342d39 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -70,7 +70,6 @@ const sal_uInt16 SvxBitmapTabPage::pBitmapRanges[] = SvxBitmapTabPage::SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs) : SvxTabPage(pParent, "cui/ui/bitmaptabpage.ui", "BitmapTabPage", rInAttrs) , m_rOutAttrs(rInAttrs) - , m_pBitmapList(nullptr) , m_pnBitmapListState(nullptr) , m_fObjectWidth(0.0) , m_fObjectHeight(0.0) diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index a94926300d8f..4f525e922563 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -65,7 +65,6 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage aXLineAttr ( rInAttrs.GetPool() ), rXLSet ( aXLineAttr.GetItemSet() ), - pLineEndList ( nullptr ), pnLineEndListState ( nullptr ), pPageType ( nullptr ), nDlgType ( 0 ), |