diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-12 09:37:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-12 12:24:13 +0200 |
| commit | 3af36642f1b703b698fe2d53e8c064233dd64de8 (patch) | |
| tree | e9c0c84e82aa2b60484dd020be53beacba0ed47b | |
| parent | a170f5c4a53f6a02ce9d7bb7458e3677c0d69ad3 (diff) | |
loplugin:simplifyconstruct in sw
Change-Id: I17c9009637edc04d9d06fa9a0bd19572eefd4fe8
Reviewed-on: https://gerrit.libreoffice.org/60370
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
119 files changed, 53 insertions, 257 deletions
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index 01ea1112cc5d..04d711b555d5 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -107,7 +107,6 @@ namespace sw { public: UnoCursorPointer() - : m_pCursor(nullptr) {} UnoCursorPointer(std::shared_ptr<SwUnoCursor> const & pCursor) : m_pCursor(pCursor) diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 0181b1db1f7b..2fd055fc9dbf 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -1633,15 +1633,8 @@ void SwAccessibleMap::DoInvalidateShapeFocus() */ SwAccessibleMap::SwAccessibleMap( SwViewShell *pSh ) : - mpFrameMap( nullptr ), - mpShapeMap( nullptr ), - mpEvents( nullptr ), - mpEventMap( nullptr ), - mpSelectedParas( nullptr ), mpVSh( pSh ), - mpPreview( nullptr ), mbShapeSelected( false ), - mpSeletedFrameMap(nullptr), maDocName(SwAccessibleContext::GetResource(STR_ACCESS_DOC_NAME)) { pSh->GetLayout()->AddAccessibleShell(); diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 2e234a31d1fd..8d7b01d4da53 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -534,8 +534,6 @@ SwAccessibleParagraph::SwAccessibleParagraph( : SwClient( const_cast<SwTextNode*>(rTextFrame.GetTextNode()) ) // #i108125# , SwAccessibleContext( pInitMap, AccessibleRole::PARAGRAPH, &rTextFrame ) , m_sDesc() - , m_pPortionData( nullptr ) - , m_pHyperTextData( nullptr ) , m_nOldCaretPos( -1 ) , m_bIsHeading( false ) //Get the real heading level, Heading1 ~ Heading10 diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index 667ec0dabf1d..0d9bd2460819 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -77,7 +77,6 @@ SwAccessiblePortionData::SwAccessiblePortionData( m_aFieldPosition(), m_aAttrFieldType(), m_aPortionAttrs(), - m_pSentences( nullptr ), m_nBeforePortions( 0 ), m_bFinished( false ) { diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 3b3e7df0949d..2d253cc3029e 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -672,8 +672,7 @@ void SwAccessibleTable::GetStates( SwAccessibleTable::SwAccessibleTable( std::shared_ptr<SwAccessibleMap> const& pInitMap, const SwTabFrame* pTabFrame ) : - SwAccessibleContext( pInitMap, AccessibleRole::TABLE, pTabFrame ), - mpTableData( nullptr ) + SwAccessibleContext( pInitMap, AccessibleRole::TABLE, pTabFrame ) { const SwFrameFormat *pFrameFormat = pTabFrame->GetFormat(); const_cast< SwFrameFormat * >( pFrameFormat )->Add( this ); diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx index b7ce109db39d..b8544b891f78 100644 --- a/sw/source/core/access/parachangetrackinginfo.cxx +++ b/sw/source/core/access/parachangetrackinginfo.cxx @@ -144,9 +144,6 @@ namespace { SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTextFrame& rTextFrame ) : mrTextFrame( rTextFrame ) - , mpChangeTrackInsertionTextMarkupList( nullptr ) - , mpChangeTrackDeletionTextMarkupList( nullptr ) - , mpChangeTrackFormatChangeTextMarkupList( nullptr ) { } diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 93bb22a3f31a..73d0a5050f93 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -1367,7 +1367,6 @@ bool SwCalc::IsValidVarName( const OUString& rStr, OUString* pValidName ) SwHash::SwHash(const OUString& rStr) : aStr(rStr) - , pNext(nullptr) { } diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index 616270305c58..98ebcdf632fc 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -255,7 +255,6 @@ namespace sw { namespace mark DdeBookmark::DdeBookmark(const SwPaM& aPaM) : MarkBase(aPaM, MarkBase::GenerateNewName("__DdeLink__")) - , m_aRefObj(nullptr) { } void DdeBookmark::SetRefObject(SwServerObject* pObj) diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 6e588b0dfd14..be6be7f0d868 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -247,9 +247,7 @@ SwSelPaintRects::SwSelPaintRects( const SwCursorShell& rCSh ) : SwRects() , m_pCursorShell( &rCSh ) #if HAVE_FEATURE_DESKTOP - , m_pCursorOverlay(nullptr) , m_bShowTextInputFieldOverlay(true) - , m_pTextInputFieldOverlay(nullptr) #endif { } diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx b/sw/source/core/doc/DocumentChartDataProviderManager.cxx index 4ef6ce2c7861..363bc2a2a0e6 100644 --- a/sw/source/core/doc/DocumentChartDataProviderManager.cxx +++ b/sw/source/core/doc/DocumentChartDataProviderManager.cxx @@ -35,8 +35,7 @@ using namespace com::sun::star::uno; namespace sw { DocumentChartDataProviderManager::DocumentChartDataProviderManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), - maChartDataProviderImplRef(), - mpChartControllerHelper( nullptr ) + maChartDataProviderImplRef() { } diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index af478731a553..ae4083e59820 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -53,7 +53,7 @@ class SwWait; namespace sw { -DocumentDeviceManager::DocumentDeviceManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), mpPrt(nullptr), mpVirDev(nullptr), mpPrtData(nullptr) {} +DocumentDeviceManager::DocumentDeviceManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), mpPrt(nullptr), mpVirDev(nullptr) {} SfxPrinter* DocumentDeviceManager::getPrinter(/*[in]*/ bool bCreate ) const { diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx index a449c2707591..e6da069859fd 100644 --- a/sw/source/core/doc/DocumentDrawModelManager.cxx +++ b/sw/source/core/doc/DocumentDrawModelManager.cxx @@ -56,7 +56,6 @@ namespace sw DocumentDrawModelManager::DocumentDrawModelManager(SwDoc& i_rSwdoc) : m_rDoc(i_rSwdoc) - , mpDrawModel(nullptr) , mnHeaven(0) , mnHell(0) , mnControls(0) diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx index 220e5e804ff6..41af5c59c46e 100644 --- a/sw/source/core/doc/DocumentLayoutManager.cxx +++ b/sw/source/core/doc/DocumentLayoutManager.cxx @@ -49,8 +49,7 @@ namespace sw DocumentLayoutManager::DocumentLayoutManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), - mpCurrentView( nullptr ), - mpLayouter( nullptr ) + mpCurrentView( nullptr ) { } diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index d489d6065d49..abd41645fac5 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -612,7 +612,6 @@ DocumentRedlineManager::DocumentRedlineManager(SwDoc& i_rSwdoc) , meRedlineFlags(RedlineFlags::ShowInsert | RedlineFlags::ShowDelete) , mpRedlineTable(new SwRedlineTable) , mpExtraRedlineTable(new SwExtraRedlineTable) - , mpAutoFormatRedlnComment(nullptr) , mbIsRedlineMove(false) , mbReadlineChecked(false) , mnAutoFormatRedlnCommentNo(0) diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index f8c4f55e9a64..f632b7713708 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -101,7 +101,7 @@ private: public: CompareData(SwDoc& rD, bool bRecordDiff) - : rDoc( rD ), pIndex( nullptr ), pChangedFlag( nullptr ) + : rDoc( rD ) , m_bRecordDiff(bRecordDiff) { } @@ -745,7 +745,7 @@ void Compare::CheckDiscard( sal_uLong nLen, sal_Char* pDiscard ) } Compare::MovedData::MovedData( CompareData& rData, const sal_Char* pDiscard ) - : pIndex( nullptr ), pLineNum( nullptr ), nCount( 0 ) + : nCount( 0 ) { sal_uLong nLen = rData.GetLineCount(); sal_uLong n; diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 7a42082b81b6..855c9aadc9cf 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -252,15 +252,9 @@ SwDoc::SwDoc() mpLineNumberInfo( new SwLineNumberInfo ), mpFootnoteIdxs( new SwFootnoteIdxs ), mpDocShell( nullptr ), - mpACEWord( nullptr ), - mpURLStateChgd( nullptr ), - mpNumberFormatter( nullptr ), mpNumRuleTable( new SwNumRuleTable ), mpExtInputRing( nullptr ), - mpStyleAccess( nullptr ), - mpLayoutCache( nullptr ), mpGrammarContact(createGrammarContact()), - m_pTableStyles(nullptr), mpCellStyles(new SwCellStyleTable), m_pXmlIdRegistry(), mReferenceCount(0), diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 5c36d8be9b1c..39dbe9c78de5 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -741,7 +741,7 @@ bool SwRedlineExtraData::operator == ( const SwRedlineExtraData& ) const SwRedlineExtraData_FormatColl::SwRedlineExtraData_FormatColl( const OUString& rColl, sal_uInt16 nPoolFormatId, const SfxItemSet* pItemSet ) - : sFormatNm(rColl), pSet(nullptr), nPoolId(nPoolFormatId) + : sFormatNm(rColl), nPoolId(nPoolFormatId) { if( pItemSet && pItemSet->Count() ) pSet.reset( new SfxItemSet( *pItemSet ) ); diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 03e64caca488..9afc28f24a87 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -115,7 +115,6 @@ SwHTMLTableLayoutColumn::SwHTMLTableLayoutColumn( sal_uInt16 nWidth, SwHTMLTableLayoutConstraints::SwHTMLTableLayoutConstraints( sal_uLong nMin, sal_uLong nMax, sal_uInt16 nRw, sal_uInt16 nColumn, sal_uInt16 nColSp ): nRow( nRw ), nCol( nColumn ), nColSpan( nColSp ), - pNext( nullptr ), nMinNoAlign( nMin ), nMaxNoAlign( nMax ) {} diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 72ba7126e3dd..acdeba686d99 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1123,8 +1123,7 @@ namespace numfunc msFontname( OUString("OpenSymbol") ), mbUserDefinedFontname( false ), meFontWeight( WEIGHT_DONTKNOW ), - meFontItalic( ITALIC_NONE ), - mpFont( nullptr ) + meFontItalic( ITALIC_NONE ) { SetToDefault(); LoadConfig(); diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 4cca119a6729..ab4df0030aeb 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -1210,7 +1210,7 @@ std::unique_ptr<SwTableAutoFormat> SwTableAutoFormatTable::ReleaseAutoFormat(siz std::unique_ptr<SwTableAutoFormat> SwTableAutoFormatTable::ReleaseAutoFormat(const OUString& rName) { - std::unique_ptr<SwTableAutoFormat> pRet(nullptr); + std::unique_ptr<SwTableAutoFormat> pRet; for (auto iter = m_pImpl->m_AutoFormats.begin(); iter != m_pImpl->m_AutoFormats.end(); ++iter) { diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index f0c88197c758..537ab6f08cb6 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -229,9 +229,7 @@ FinalThreadManager::FinalThreadManager(css::uno::Reference< css::uno::XComponent : m_xContext(context), maMutex(), maThreads(), - mpCancelJobsThread( nullptr ), mpTerminateOfficeThread( nullptr ), - mpPauseThreadStarting( nullptr ), mbRegisteredAtDesktop( false ) { diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx index 8d033dad4734..8ba28c5ab868 100644 --- a/sw/source/core/docnode/ndnotxt.cxx +++ b/sw/source/core/docnode/ndnotxt.cxx @@ -41,7 +41,6 @@ SwNoTextNode::SwNoTextNode( const SwNodeIndex & rWhere, SwGrfFormatColl *pGrfColl, SwAttrSet const * pAutoAttr ) : SwContentNode( rWhere, nNdType, pGrfColl ), - m_pContour( nullptr ), m_bAutomaticContour( false ), m_bContourMapModeValid( true ), m_bPixelContour( false ) diff --git a/sw/source/core/docnode/threadmanager.hxx b/sw/source/core/docnode/threadmanager.hxx index 78af453fabef..52db422c1f49 100644 --- a/sw/source/core/docnode/threadmanager.hxx +++ b/sw/source/core/docnode/threadmanager.hxx @@ -103,7 +103,6 @@ class ThreadManager final tThreadData() : nThreadID( 0 ), - pThread( nullptr ), aJob() {} }; diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index cfedb393d854..5ead2c022ca4 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star::frame; SwDPage::SwDPage(SwDrawModel& rNewModel, bool bMasterPage) : FmFormPage(rNewModel, bMasterPage), - pGridLst( nullptr ), pDoc(&rNewModel.GetDoc()) { } diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index b5c8f083dc70..99255a6a77d6 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1747,7 +1747,6 @@ SwPostItField::SwPostItField( SwPostItFieldType* pT, , m_sInitials( rInitials ) , m_sName( rName ) , m_aDateTime( rDateTime ) - , mpText( nullptr ) { m_nPostItId = nPostItId == 0 ? m_nLastPostItId++ : nPostItId; } diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index ead2aadfdac1..3c49ab5a205a 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -68,7 +68,6 @@ SwGrfNode::SwGrfNode( SwAttrSet const * pAutoAttr ) : SwNoTextNode( rWhere, SwNodeType::Grf, pGrfColl, pAutoAttr ), maGrfObj(), - mpReplacementGraphic(nullptr), // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( false ) @@ -85,7 +84,6 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, SwAttrSet const * pAutoAttr ) : SwNoTextNode( rWhere, SwNodeType::Grf, pGrfColl, pAutoAttr ), maGrfObj(rGrfObj), - mpReplacementGraphic(nullptr), // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( false ) @@ -107,7 +105,6 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, SwAttrSet const * pAutoAttr ) : SwNoTextNode( rWhere, SwNodeType::Grf, pGrfColl, pAutoAttr ), maGrfObj(), - mpReplacementGraphic(nullptr), // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( false ) diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index 5cfcdb88425d..321aec766901 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -35,8 +35,7 @@ class SwDontExpandItem std::unique_ptr<SfxItemSet> pDontExpItems; public: - SwDontExpandItem() : - pDontExpItems(nullptr){} + SwDontExpandItem() {} ~SwDontExpandItem(); void SaveDontExpandItems( const SwPosition& rPos ); diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 4af1cd4f2319..f994cf553427 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -1723,7 +1723,6 @@ void SwFormatAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const // Partially implemented inline in hxx SwFormatURL::SwFormatURL() : SfxPoolItem( RES_URL ), - m_pMap( nullptr ), m_bIsServerMap( false ) { } @@ -2841,7 +2840,6 @@ void SwFrameFormats::dumpAsXml(xmlTextWriterPtr pWriter, const char* pName) cons SwFlyFrameFormat::SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrame ) : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FLYFRMFMT ) - , m_pContact(nullptr) {} SwFlyFrameFormat::~SwFlyFrameFormat() diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 613bd5d6a73f..b99e56c53c7a 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -262,7 +262,7 @@ void SwProtocol::Stop() } SwImplProtocol::SwImplProtocol() - : pStream( nullptr ), pFrameIds( nullptr ), nTypes( FRM_ALL ), + : nTypes( FRM_ALL ), nLineCount( 0 ), nMaxLines( USHRT_MAX ), nTestMode( 0 ) { NewStream(); diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index cc1c3513657a..3923725ee9a2 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -251,7 +251,6 @@ SwLayAction::SwLayAction( SwRootFrame *pRt, SwViewShellImp *pI ) : m_pRoot( pRt ), m_pImp( pI ), m_pOptTab( nullptr ), - m_pWait( nullptr ), m_nPreInvaPage( USHRT_MAX ), m_nStartTicks( std::clock() ), m_nInputType( VclInputFlags::NONE ), diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index 10eba9979057..62e04cace373 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -201,12 +201,6 @@ void SwLooping::Control( SwPageFrame* pPage ) } SwLayouter::SwLayouter() - : mpEndnoter( nullptr ), - mpLooping( nullptr ), - // #i28701# - mpMovedFwdFrames( nullptr ), - // #i35911# - mpObjsTmpConsiderWrapInfl( nullptr ) { } diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 2df6ffe2739e..203300c28632 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -360,9 +360,7 @@ SwRootFrame::SwRootFrame( SwFrameFormat *pFormat, SwViewShell * pSh ) : mpLastPage( nullptr ), mpCurrShell( pSh ), mpWaitingCurrShell( nullptr ), - mpCurrShells(nullptr), mpDrawPage( nullptr ), - mpDestroy( nullptr ), mnPhyPageNums( 0 ), mnAccessibleShells( 0 ) { diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index e4b6115fd0ec..ea6c8a19cdf2 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -765,8 +765,7 @@ SwOLEObj::SwOLEObj( const svt::EmbeddedObjectRef& xObj ) : m_pOLENode( nullptr ), m_xOLERef( xObj ), m_aPrimitive2DSequence(), - m_aRange(), - m_pDeflateData(nullptr) + m_aRange() { m_xOLERef.Lock(); if ( xObj.is() ) @@ -780,8 +779,7 @@ SwOLEObj::SwOLEObj( const OUString &rString, sal_Int64 nAspect ) : m_pOLENode( nullptr ), m_aName( rString ), m_aPrimitive2DSequence(), - m_aRange(), - m_pDeflateData(nullptr) + m_aRange() { m_xOLERef.Lock(); m_xOLERef.SetViewAspect( nAspect ); diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index 70d8c037c4fc..3d65575cdcf7 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -232,7 +232,7 @@ bool SwImpBlocks::PutMuchEntries( bool ) } SwTextBlocks::SwTextBlocks( const OUString& rFile ) - : pImp( nullptr ), nErr( 0 ) + : nErr( 0 ) { INetURLObject aObj(rFile); const OUString sFileName = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 4d2adf502528..36524b04c771 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -97,7 +97,6 @@ SwExtraPainter::SwExtraPainter( const SwTextFrame *pFrame, SwViewShell *pVwSh, , aRect( rRct ) , pTextFrame( pFrame ) , pSh( pVwSh ) - , pFnt( nullptr ) , rLineInf( rLnInf ) , nX(0) , nRedX(0) diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx index ee558d460dcc..d23e5ce2d4d6 100644 --- a/sw/source/core/text/guess.hxx +++ b/sw/source/core/text/guess.hxx @@ -38,8 +38,8 @@ class SwTextGuess // a field in the text has been expanded sal_uInt16 nBreakWidth; // width of the broken portion public: - SwTextGuess(): pHanging( nullptr ), nCutPos(0), nBreakStart(0), - nBreakPos(0), nFieldDiff(0), nBreakWidth(0) + SwTextGuess(): nCutPos(0), nBreakStart(0), + nBreakPos(0), nFieldDiff(0), nBreakWidth(0) { } // true, if current portion still fits to current line diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 38f78f19ff8d..2c52ed892944 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -87,8 +87,7 @@ using namespace ::com::sun::star::beans; #define DRAW_SPECIAL_OPTIONS_ROTATE 2 SwLineInfo::SwLineInfo() - : pRuler( nullptr ), - pSpace( nullptr ), + : pSpace( nullptr ), nVertAlign( SvxParaVertAlignItem::Align::Automatic ), nDefTabStop( 0 ), bListTabStopIncluded( false ), diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx index 648ed03f4c38..f2e20517261d 100644 --- a/sw/source/core/text/pordrop.hxx +++ b/sw/source/core/text/pordrop.hxx @@ -42,7 +42,7 @@ class SwDropPortionPart public: SwDropPortionPart( SwFont& rFont, const TextFrameIndex nL ) - : pFollow( nullptr ), pFnt( &rFont ), nLen( nL ), nWidth( 0 ), m_bJoinBorderWithNext(false), m_bJoinBorderWithPrev(false) {}; + : pFnt( &rFont ), nLen( nL ), nWidth( 0 ), m_bJoinBorderWithNext(false), m_bJoinBorderWithPrev(false) {}; ~SwDropPortionPart(); SwDropPortionPart* GetFollow() const { return pFollow.get(); }; diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 61e6aecb9d77..28c69bb6960c 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -661,7 +661,7 @@ void SwLineLayout::ResetFlags() } SwLineLayout::SwLineLayout() - : m_pNext( nullptr ), m_pLLSpaceAdd( nullptr ), m_pKanaComp( nullptr ), m_nRealHeight( 0 ), + : m_pNext( nullptr ), m_nRealHeight( 0 ), m_bUnderscore( false ) { ResetFlags(); diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 700d3e0817db..aaebf66392be 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -242,7 +242,6 @@ TextFrameIndex SwBidiPortion::GetSpaceCnt(const SwTextSizeInfo &rInf) const SwDoubleLinePortion::SwDoubleLinePortion( SwDoubleLinePortion& rDouble, TextFrameIndex const nEnd) : SwMultiPortion(nEnd) - , pBracket(nullptr) , nLineDiff(0) , nBlank1(0) , nBlank2(0) diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 9b8ddf411e39..043f3eb5e376 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -104,8 +104,7 @@ SwDropPortion::SwDropPortion( const sal_uInt16 nLineCnt, const sal_uInt16 nDrpHeight, const sal_uInt16 nDrpDescent, const sal_uInt16 nDist ) - : pPart( nullptr ), - nLines( nLineCnt ), + : nLines( nLineCnt ), nDropHeight(nDrpHeight), nDropDescent(nDrpDescent), nDistance(nDist), diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index fca78fe32c25..62ba00132d7c 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -314,7 +314,6 @@ SwTextFly::SwTextFly() , mpCurrAnchoredObj(nullptr) , m_pCurrFrame(nullptr) , m_pMaster(nullptr) - , mpAnchoredObjList(nullptr) , nMinBottom(0) , nNextTop(0) , m_nCurrFrameNodeIndex(0) diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 07ce11d2765f..b67daa422b65 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -1231,7 +1231,6 @@ SwFootnoteSave::SwFootnoteSave( const SwTextSizeInfo &rInf, const SwFontScript nGivenScriptType ) : pInf( &const_cast<SwTextSizeInfo&>(rInf) ) , pFnt( nullptr ) - , pOld( nullptr ) { if( pTextFootnote && rInf.GetTextFrame() ) { diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index 9fa8366f1375..07349b199dab 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -59,7 +59,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; }; -SwGrammarContact::SwGrammarContact() : mpProxyList(nullptr), mbFinished( false ) +SwGrammarContact::SwGrammarContact() : mbFinished( false ) { aTimer.SetTimeout( 2000 ); // Repaint of grammar check after 'setChecked' aTimer.SetInvokeHandler( LINK(this, SwGrammarContact, TimerRepaint) ); diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 94ec40766b00..060ae4cf3995 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -48,7 +48,6 @@ SwFormatField::SwFormatField( sal_uInt16 nWhich ) : SfxPoolItem( nWhich ) , SwModify(nullptr) , SfxBroadcaster() - , mpField( nullptr ) , mpTextField( nullptr ) { } @@ -86,7 +85,6 @@ SwFormatField::SwFormatField( const SwFormatField& rAttr ) : SfxPoolItem( rAttr ) , SwModify(nullptr) , SfxBroadcaster() - , mpField( nullptr ) , mpTextField( nullptr ) { if ( rAttr.mpField ) diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 3f980f8b34c2..826119d84ccd 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -156,7 +156,6 @@ SwFormatINetFormat::SwFormatINetFormat() , msINetFormatName() , msVisitedFormatName() , msHyperlinkName() - , mpMacroTable( nullptr ) , mpTextAttr( nullptr ) , mnINetFormatId( 0 ) , mnVisitedFormatId( 0 ) @@ -169,7 +168,6 @@ SwFormatINetFormat::SwFormatINetFormat( const OUString& rURL, const OUString& rT , msINetFormatName() , msVisitedFormatName() , msHyperlinkName() - , mpMacroTable( nullptr ) , mpTextAttr( nullptr ) , mnINetFormatId( RES_POOLCHR_INET_NORMAL ) , mnVisitedFormatId( RES_POOLCHR_INET_VISIT ) diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 7e942b427ecb..ec88086b7739 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -98,8 +98,6 @@ SwUndoDelete::SwUndoDelete( bool bCalledByTableCpy ) : SwUndo(SwUndoId::DELETE, rPam.GetDoc()), SwUndRng( rPam ), - m_pMvStt( nullptr ), - m_pRedlSaveData(nullptr), m_nNode(0), m_nNdDiff(0), m_nSectDiff(0), diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 74b2f7c7bb27..88fe2c9d1cae 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -690,7 +690,6 @@ SwRewriter SwUndo::GetRewriter() const } SwUndoSaveContent::SwUndoSaveContent() - : pHistory( nullptr ) {} SwUndoSaveContent::~SwUndoSaveContent() COVERITY_NOEXCEPT_FALSE @@ -1182,7 +1181,7 @@ void SwUndoSaveContent::DelContentIndex( const SwPosition& rMark, // save a complete section into UndoNodes array SwUndoSaveSection::SwUndoSaveSection() - : pRedlSaveData( nullptr ), nMvLen( 0 ), nStartPos( ULONG_MAX ) + : nMvLen( 0 ), nStartPos( ULONG_MAX ) { } diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index b87a0e30c3a6..1c1b6d2e7714 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -108,7 +108,7 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt, sal_Int32 nL, const SwInsertFlags nInsertFlags, bool bWDelim ) - : SwUndo(SwUndoId::TYPING, rNd.GetNode().GetDoc()), pRedlData( nullptr ), + : SwUndo(SwUndoId::TYPING, rNd.GetNode().GetDoc()), nNode( rNd.GetIndex() ), nContent(nCnt), nLen(nL), bIsWordDelim( bWDelim ), bIsAppend( false ) , m_bWithRsid(false) @@ -119,7 +119,7 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt, SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd ) : SwUndo(SwUndoId::SPLITNODE, rNd.GetNode().GetDoc()), - pRedlData( nullptr ), nNode( rNd.GetIndex() ), nContent(0), nLen(1), + nNode( rNd.GetIndex() ), nContent(0), nLen(1), bIsWordDelim( false ), bIsAppend( true ) , m_bWithRsid(false) , m_nInsertFlags(SwInsertFlags::EMPTYEXPAND) diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index d680785d387d..309c37803c98 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -33,23 +33,22 @@ SwUndoInsNum::SwUndoInsNum( const SwNumRule& rOldRule, const SwDoc* pDoc, SwUndoId nUndoId) : SwUndo( nUndoId, pDoc ), - aNumRule( rNewRule ), pHistory( nullptr ), + aNumRule( rNewRule ), pOldNumRule( new SwNumRule( rOldRule )), nLRSavePos( 0 ) { } SwUndoInsNum::SwUndoInsNum( const SwPaM& rPam, const SwNumRule& rRule ) : SwUndo( SwUndoId::INSNUM, rPam.GetDoc() ), SwUndRng( rPam ), - aNumRule( rRule ), pHistory( nullptr ), - pOldNumRule( nullptr ), nLRSavePos( 0 ) + aNumRule( rRule ), + nLRSavePos( 0 ) { } SwUndoInsNum::SwUndoInsNum( const SwPosition& rPos, const SwNumRule& rRule, const OUString& rReplaceRule ) : SwUndo( SwUndoId::INSNUM, rPos.nNode.GetNode().GetDoc() ), - aNumRule( rRule ), pHistory( nullptr ), - pOldNumRule( nullptr ), + aNumRule( rRule ), sReplaceRule( rReplaceRule ), nLRSavePos( 0 ) { // No selection! diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx index e2fb76a19f63..ff5904f4bb27 100644 --- a/sw/source/core/undo/unovwr.cxx +++ b/sw/source/core/undo/unovwr.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::uno; SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos, sal_Unicode cIns ) : SwUndo(SwUndoId::OVERWRITE, pDoc), - pRedlSaveData( nullptr ), bGroup( false ) + bGroup( false ) { if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) { diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx index 5a7334beb7ac..147f9d5c731f 100644 --- a/sw/source/core/undo/unredln.cxx +++ b/sw/source/core/undo/unredln.cxx @@ -36,7 +36,7 @@ SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM& rRange ) : SwUndo( SwUndoId::REDLINE, rRange.GetDoc() ), SwUndRng( rRange ), - mpRedlData( nullptr ), mpRedlSaveData( nullptr ), mnUserId( nUsrId ), + mnUserId( nUsrId ), mbHiddenRedlines( false ) { // consider Redline @@ -371,8 +371,8 @@ void SwUndoRejectRedline::RepeatImpl(::sw::RepeatContext & rContext) } SwUndoCompDoc::SwUndoCompDoc( const SwPaM& rRg, bool bIns ) - : SwUndo( SwUndoId::COMPAREDOC, rRg.GetDoc() ), SwUndRng( rRg ), pRedlData( nullptr ), - pUnDel( nullptr ), pUnDel2( nullptr ), pRedlSaveData( nullptr ), bInsert( bIns ) + : SwUndo( SwUndoId::COMPAREDOC, rRg.GetDoc() ), SwUndRng( rRg ), + bInsert( bIns ) { SwDoc* pDoc = rRg.GetDoc(); if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ) @@ -384,8 +384,7 @@ SwUndoCompDoc::SwUndoCompDoc( const SwPaM& rRg, bool bIns ) } SwUndoCompDoc::SwUndoCompDoc( const SwRangeRedline& rRedl ) - : SwUndo( SwUndoId::COMPAREDOC, rRedl.GetDoc() ), SwUndRng( rRedl ), pRedlData( nullptr ), - pUnDel( nullptr ), pUnDel2( nullptr ), pRedlSaveData( nullptr ), + : SwUndo( SwUndoId::COMPAREDOC, rRedl.GetDoc() ), SwUndRng( rRedl ), // for MergeDoc the corresponding inverse is needed bInsert( nsRedlineType_t::REDLINE_DELETE == rRedl.GetType() ) { diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx index 2b2bc5b407f8..965d534e97cf 100644 --- a/sw/source/core/undo/unsort.cxx +++ b/sw/source/core/undo/unsort.cxx @@ -45,7 +45,6 @@ SwSortUndoElement::~SwSortUndoElement() SwUndoSort::SwUndoSort(const SwPaM& rRg, const SwSortOptions& rOpt) : SwUndo(SwUndoId::SORT_TXT, rRg.GetDoc()) , SwUndRng(rRg) - , pUndoTableAttr(nullptr) , nTableNd(0) { pSortOpt.reset( new SwSortOptions(rOpt) ); @@ -53,7 +52,7 @@ SwUndoSort::SwUndoSort(const SwPaM& rRg, const SwSortOptions& rOpt) SwUndoSort::SwUndoSort( sal_uLong nStt, sal_uLong nEnd, const SwTableNode& rTableNd, const SwSortOptions& rOpt, bool bSaveTable ) - : SwUndo(SwUndoId::SORT_TBL, rTableNd.GetDoc()), pUndoTableAttr( nullptr ) + : SwUndo(SwUndoId::SORT_TBL, rTableNd.GetDoc()) { nSttNode = nStt; nEndNode = nEnd; diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx index 27d73ebd8ee7..8edbc9910c2c 100644 --- a/sw/source/core/undo/unspnd.cxx +++ b/sw/source/core/undo/unspnd.cxx @@ -37,7 +37,7 @@ SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, bool bChkTable ) - : SwUndo( SwUndoId::SPLITNODE, pDoc ), pRedlData( nullptr ), nNode( rPos.nNode.GetIndex() ), + : SwUndo( SwUndoId::SPLITNODE, pDoc ), nNode( rPos.nNode.GetIndex() ), nContent( rPos.nContent.GetIndex() ), bTableFlag( false ), bChkTableStt( bChkTable ) { diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index fb15b3d90016..b7bf849e15ac 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -221,7 +221,7 @@ SwUndoInsTable::SwUndoInsTable( const SwPosition& rPos, sal_uInt16 nCl, sal_uInt const std::vector<sal_uInt16> *pColArr, const OUString & rName) : SwUndo( SwUndoId::INSTABLE, rPos.GetDoc() ), - aInsTableOpts( rInsTableOpts ), pDDEFieldType( nullptr ), pColWidth( nullptr ), pRedlData( nullptr ), pAutoFormat( nullptr ), + aInsTableOpts( rInsTableOpts ), nSttNode( rPos.nNode.GetIndex() ), nRows( nRw ), nCols( nCl ), nAdjust( nAdj ) { if( pColArr ) @@ -353,7 +353,7 @@ SwRewriter SwUndoInsTable::GetRewriter() const } SwTableToTextSave::SwTableToTextSave( SwDoc& rDoc, sal_uLong nNd, sal_uLong nEndIdx, sal_Int32 nCnt ) - : m_nSttNd( nNd ), m_nEndNd( nEndIdx), m_nContent( nCnt ), m_pHstry( nullptr ) + : m_nSttNd( nNd ), m_nEndNd( nEndIdx), m_nContent( nCnt ) { // keep attributes of the joined node SwTextNode* pNd = rDoc.GetNodes()[ nNd ]->GetTextNode(); @@ -395,7 +395,7 @@ SwTableToTextSave::SwTableToTextSave( SwDoc& rDoc, sal_uLong nNd, sal_uLong nEnd SwUndoTableToText::SwUndoTableToText( const SwTable& rTable, sal_Unicode cCh ) : SwUndo( SwUndoId::TABLETOTEXT, rTable.GetFrameFormat()->GetDoc() ), - sTableNm( rTable.GetFrameFormat()->GetName() ), pHistory( nullptr ), + sTableNm( rTable.GetFrameFormat()->GetName() ), nSttNd( 0 ), nEndNd( 0 ), cTrenner( cCh ), nHdlnRpt( rTable.GetRowsToRepeat() ) { @@ -2803,7 +2803,7 @@ bool SwUndoTableCpyTable::IsEmpty() const } SwUndoCpyTable::SwUndoCpyTable(const SwDoc* pDoc) - : SwUndo( SwUndoId::CPYTBL, pDoc ), pDel( nullptr ), nTableNode( 0 ) + : SwUndo( SwUndoId::CPYTBL, pDoc ), nTableNode( 0 ) { } diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx index a419e7399280..65107e295e2f 100644 --- a/sw/source/core/undo/untblk.cxx +++ b/sw/source/core/undo/untblk.cxx @@ -34,7 +34,7 @@ SwUndoInserts::SwUndoInserts( SwUndoId nUndoId, const SwPaM& rPam ) : SwUndo( nUndoId, rPam.GetDoc() ), SwUndRng( rPam ), - pTextFormatColl( nullptr ), pLastNdColl(nullptr), pFrameFormats( nullptr ), pRedlData( nullptr ), + pTextFormatColl( nullptr ), pLastNdColl(nullptr), bSttWasTextNd( true ), nNdDiff( 0 ), nSetPos( 0 ) { pHistory.reset( new SwHistory ); diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 03e0fedc064c..05d70e6d5807 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -1103,7 +1103,6 @@ struct SwFieldProperties_Impl SwFieldProperties_Impl(): aDate( Date::EMPTY ), fDouble(0.), - pDateTime(nullptr), nSubType(0), nFormat(0), nUSHORT1(0), diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index d8f7f1ac7053..a2c43e2824aa 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -3367,7 +3367,6 @@ uno::Reference<container::XNameReplace> SAL_CALL SwXTextEmbeddedObject::SwXTextEmbeddedObject( SwDoc *pDoc ) : SwXTextEmbeddedObjectBaseClass(FLYCNTTYPE_OLE, aSwMapProvider.GetPropertySet(PROPERTY_MAP_EMBEDDED_OBJECT), pDoc) - , m_xOLEListener(nullptr) { } diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index a81f553cc00b..e58c1f01e535 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1305,7 +1305,6 @@ SwXStyle::SwXStyle(SfxStyleSheetBasePool* pPool, SfxStyleFamily eFamily, SwDoc* , m_bIsDescriptor(false) , m_bIsConditional(lcl_InitConditional(pPool, eFamily, rStyleName)) , m_pBasePool(pPool) - , m_pPropertiesImpl(nullptr) { } SwXStyle::~SwXStyle() @@ -1468,7 +1467,6 @@ public: : m_rDoc(rSwDoc) , m_pOldPageDesc(nullptr) , m_pItemSet(nullptr) - , m_pMyItemSet(nullptr) , m_rStyleName(rName) , m_pParentStyle(pParentStyle) { } @@ -4279,7 +4277,7 @@ uno::Sequence< beans::PropertyValue > SwXAutoStyle::getProperties() } SwXTextTableStyle::SwXTextTableStyle(SwDocShell* pDocShell, SwTableAutoFormat* pTableAutoFormat) : - m_pDocShell(pDocShell), m_pTableAutoFormat(pTableAutoFormat), m_pTableAutoFormat_Impl(nullptr), m_bPhysical(true) + m_pDocShell(pDocShell), m_pTableAutoFormat(pTableAutoFormat), m_bPhysical(true) { UpdateCellStylesMapping(); } @@ -4634,7 +4632,6 @@ css::uno::Sequence<OUString> SAL_CALL SwXTextTableStyle::getSupportedServiceName SwXTextCellStyle::SwXTextCellStyle(SwDocShell* pDocShell, SwBoxAutoFormat* pBoxAutoFormat, const OUString& sParentStyle) : m_pDocShell(pDocShell), m_pBoxAutoFormat(pBoxAutoFormat), - m_pBoxAutoFormat_Impl(nullptr), m_sParentStyle(sParentStyle), m_bPhysical(true) { } diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 4788190c5cda..7379d879b6c2 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -89,18 +89,15 @@ void SwViewShellImp::Init( const SwViewOption *pNewOpt ) /// CTor for the core internals SwViewShellImp::SwViewShellImp( SwViewShell *pParent ) : m_pShell( pParent ), - m_pDrawView( nullptr ), m_pSdrPageView( nullptr ), m_pFirstVisiblePage( nullptr ), m_pLayAction( nullptr ), m_pIdleAct( nullptr ), - m_pAccessibleMap( nullptr ), m_bFirstPageInvalid( true ), m_bResetHdlHiddenPaint( false ), m_bSmoothUpdate( false ), m_bStopSmooth( false ), - m_nRestoreActions( 0 ), - m_pPagePreviewLayout( nullptr ) + m_nRestoreActions( 0 ) { } diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 92899880beef..3397127ac23c 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -152,7 +152,6 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window *pWindow, : pWindow ? static_cast<OutputDevice*>(pWindow) : static_cast<OutputDevice*>(rDocument.getIDocumentDeviceAccess().getPrinter( true ))), mpTmpRef( nullptr ), - mpOpt( nullptr ), mpAccOptions( new SwAccessibilityOptions ), mbShowHeaderSeparator( false ), mbShowFooterSeparator( false ), @@ -224,7 +223,6 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window *pWindow, : pWindow ? static_cast<OutputDevice*>(pWindow) : static_cast<OutputDevice*>(rShell.GetDoc()->getIDocumentDeviceAccess().getPrinter( true ))), mpTmpRef( nullptr ), - mpOpt( nullptr ), mpAccOptions( new SwAccessibilityOptions ), mbShowHeaderSeparator( false ), mbShowFooterSeparator( false ), diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 90587f8c3cff..96cd25a1e979 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -226,7 +226,6 @@ SwHTMLFormatInfo::SwHTMLFormatInfo( const SwFormat *pF, SwDoc *pDoc, SwDoc *pTem LanguageType eDfltLang, sal_uInt16 nCSS1Script ) : pFormat(pF) - , pItemSet(nullptr) , nLeftMargin(0) , nRightMargin(0) , nFirstLineIndent(0) diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 074ca6e2ebd8..c329361ee3e7 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -62,7 +62,6 @@ class HTMLAttrContext_SaveDoc public: HTMLAttrContext_SaveDoc() : - pPos( nullptr ), nContextStMin( SIZE_MAX ), nContextStAttrMin( SIZE_MAX ), bStripTrailingPara( false ), bKeepNumRules( false ), bFixHeaderDist( false ), bFixFooterDist( false ) @@ -118,7 +117,6 @@ HTMLAttrContext_SaveDoc *HTMLAttrContext::GetSaveDocContext( bool bCreate ) HTMLAttrContext::HTMLAttrContext( HtmlTokenId nTokn, sal_uInt16 nPoolId, const OUString& rClass, bool bDfltColl ) : m_aClass( rClass ), - m_pSaveDocContext( nullptr ), m_nToken( nTokn ), m_nTextFormatColl( nPoolId ), m_nLeftMargin( 0 ), @@ -140,7 +138,6 @@ HTMLAttrContext::HTMLAttrContext( HtmlTokenId nTokn, sal_uInt16 nPoolId, const O {} HTMLAttrContext::HTMLAttrContext( HtmlTokenId nTokn ) : - m_pSaveDocContext( nullptr ), m_nToken( nTokn ), m_nTextFormatColl( 0 ), m_nLeftMargin( 0 ), diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 916db2f2aad0..66833ff3a72a 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2871,7 +2871,6 @@ CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTabl bool bHd, bool bReadOpt ) : SectionSaveStruct( rParser ), m_pCurrCnts( nullptr ), - m_pNoBreakEndNodeIndex( nullptr ), m_nValue( 0.0 ), m_nNumFormat( 0 ), m_nRowSpan( 1 ), diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index f153c4999b82..10799d0c0887 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -708,7 +708,6 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sal_uInt16 *pWhichIds, sal_uInt16 nWhichIds ) : CSS1Parser(), sBaseURL( rBaseURL ), - pSheetItemSet(nullptr), pItemSet(nullptr), pPropInfo( nullptr ), nMinFixLineSpace( MM50/2 ), diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 21fda9474e88..70c9d7cb99c4 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -258,8 +258,6 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn, m_aPathToFile( rPath ), m_sBaseURL( rBaseURL ), m_xAttrTab(new HTMLAttrTable), - m_pAppletImpl( nullptr ), - m_pCSS1Parser( nullptr ), m_pNumRuleInfo( new SwHTMLNumRuleInfo ), m_pPendStack( nullptr ), m_xDoc( pD ), @@ -268,8 +266,6 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn, m_pFormImpl( nullptr ), m_pMarquee( nullptr ), m_pImageMap( nullptr ), - m_pImageMaps(nullptr), - m_pFootEndNoteImpl( nullptr ), m_nBaseFontStMin( 0 ), m_nFontStMin( 0 ), m_nDefListDeep( 0 ), diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 53b57fc4ce33..3805a41a2329 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -90,12 +90,9 @@ static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL ) - : m_pHTMLPosFlyFrames(nullptr) - , m_pNumRuleInfo(new SwHTMLNumRuleInfo) - , m_pNextNumRuleInfo(nullptr) + : m_pNumRuleInfo(new SwHTMLNumRuleInfo) , m_nHTMLMode(0) , m_eCSS1Unit(FUNIT_NONE) - , m_pFootEndNotes(nullptr) , mxFormComps() , m_pStartNdIdx(nullptr) , m_pCurrPageDesc(nullptr) @@ -1491,8 +1488,6 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt, : rWrt(rWriter) , pOldPam(rWrt.m_pCurrentPam) , pOldEnd(rWrt.GetEndPaM()) - , pOldNumRuleInfo(nullptr) - , pOldNextNumRuleInfo(nullptr) , nOldDefListLvl(rWrt.m_nDefListLvl) , nOldDirection(rWrt.m_nDirection) , bOldOutHeader(rWrt.m_bOutHeader) diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index ff58b49b901a..d34ae94c5681 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -227,7 +227,6 @@ struct SwHTMLFormatInfo // ctor for a dummy to search explicit SwHTMLFormatInfo( const SwFormat *pF ) : pFormat( pF ), - pItemSet( nullptr ), nLeftMargin( 0 ), nRightMargin( 0 ), nFirstLineIndent(0), diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index f7a0603bf011..5410759ee570 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -1555,15 +1555,11 @@ void DocxExport::SetFS( ::sax_fastparser::FSHelperPtr const & pFS ) DocxExport::DocxExport( DocxExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM *pOriginalPam, bool bDocm ) : MSWordExportBase( pDocument, pCurrentPam, pOriginalPam ), m_pFilter( pFilter ), - m_pAttrOutput( nullptr ), - m_pSections( nullptr ), m_nHeaders( 0 ), m_nFooters( 0 ), m_nOLEObjects( 0 ), m_nActiveXControls( 0 ), m_nHeadersFootersInSection(0), - m_pVMLExport( nullptr ), - m_pSdrExport( nullptr ), m_bDocm(bDocm) { // Write the document properties diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 5b6fda114083..5d9e55758b93 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1014,7 +1014,6 @@ MSWordSections::MSWordSections( MSWordExportBase& rExport ) WW8_WrPlcSepx::WW8_WrPlcSepx( MSWordExportBase& rExport ) : MSWordSections( rExport ) , m_bHeaderFooterWritten( false ) - , pTextPos( nullptr ) { // to be in sync with the AppendSection() call in the MSWordSections // constructor @@ -1925,7 +1924,6 @@ void MSWordExportBase::WriteHeaderFooterText( const SwFormat& rFormat, bool bHea // WW8_WrPlcFootnoteEdn is the class for Footnotes and Endnotes WW8_WrPlcSubDoc::WW8_WrPlcSubDoc() - : pTextPos( nullptr ) { } diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 158c0bc15a27..67d1fdf2eeed 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3572,12 +3572,9 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM : m_aMainStg(sMainStream) , m_pISet(nullptr) , m_pPiece(nullptr) - , m_pUsedNumTable(nullptr) , m_pTopNodeOfHdFtPage(nullptr) , m_pBkmks(nullptr) , m_pRedlAuthors(nullptr) - , m_pOLEExp(nullptr) - , m_pOCXExp(nullptr) , m_pTableInfo(new ww8::WW8TableInfo()) , m_nCharFormatStart(0) , m_nFormatCollStart(0) @@ -3593,7 +3590,6 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM , m_pChpIter(nullptr) , m_pStyles(nullptr) , m_pAtn(nullptr) - , m_pFactoids(nullptr) , m_pTextBxs(nullptr) , m_pHFTextBxs(nullptr) , m_pParentFrame(nullptr) @@ -3665,11 +3661,6 @@ WW8Export::WW8Export( SwWW8Writer *pWriter, , pO(nullptr) , pTableStrm(nullptr) , pDataStrm(nullptr) - , pFib(nullptr) - , pDop(nullptr) - , pFootnote(nullptr) - , pEdn(nullptr) - , pSepx(nullptr) , m_bDot(bDot) , m_pWriter(pWriter) , m_pAttrOutput(new WW8AttributeOutput(*this)) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 79c7ef20b885..d7f24bff5596 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4182,7 +4182,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage, , m_pFormatOfJustInsertedApo(nullptr) , m_pPreviousNumPaM(nullptr) , m_pPrevNumRule(nullptr) - , m_pPostProcessAttrsInfo(nullptr) , m_aTextNodesHavingFirstLineOfstSet() , m_aTextNodesHavingLeftIndentSet() , m_pCurrentColl(nullptr) @@ -4191,7 +4190,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage, , m_pDrawModel(nullptr) , m_pDrawPg(nullptr) , m_pNumFieldType(nullptr) - , m_pAtnNames(nullptr) , m_sBaseURL(rBaseURL) , m_nIniFlags(0) , m_nIniFlags1(0) @@ -4263,7 +4261,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage, , m_bLoadingTOXCache(false) , m_nEmbeddedTOXLevel(0) , m_bLoadingTOXHyperlink(false) - , m_pPosAfterTOC(nullptr) , m_pPreviousNode(nullptr) , m_bCareFirstParaEndInToc(false) , m_bCareLastParaEndInToc(false) diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 38bdcaa078c6..af64878ddc14 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -261,7 +261,6 @@ public: m_eRTLFontSrcCharSet(0), m_eCJKFontSrcCharSet(0), m_pFormat( nullptr ), - m_xWWFly( nullptr ), m_pOutlineNumrule( nullptr ), m_nFilePos( 0 ), m_nBase( 0 ), diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 7844ef2a07e9..51547066ef96 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1821,7 +1821,6 @@ eSurround(( rWW.nSp37 > 1 ) ? css::text::WrapTextMode_DYNAMIC : css::text::WrapT nXBind(( rWW.nSp29 & 0xc0 ) >> 6), nYBind(( rWW.nSp29 & 0x30 ) >> 4), nNewNetWidth(MINFLY), -xMainTextPos(nullptr), nLineSpace(0), bAutoWidth(false), bToggelPos(false) diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 19a7618fe706..b8181307d82d 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1734,9 +1734,7 @@ std::unique_ptr<WW8PLCFpcd> WW8ScannerBase::OpenPieceTable( SvStream* pStr, cons WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt, WW8Fib* pWwFib ) - : m_pWw8Fib(pWwFib), m_pMainFdoa(nullptr), m_pHdFtFdoa(nullptr), m_pMainTxbx(nullptr), - m_pMainTxbxBkd(nullptr), m_pHdFtTxbx(nullptr), m_pHdFtTxbxBkd(nullptr), m_pMagicTables(nullptr), - m_pSubdocs(nullptr), m_pExtendedAtrds(nullptr) + : m_pWw8Fib(pWwFib) { m_pPiecePLCF = OpenPieceTable( pTableSt, m_pWw8Fib ); // Complex if( m_pPiecePLCF ) @@ -2254,7 +2252,7 @@ bool WW8PLCFspecial::GetData(long nInIdx, WW8_CP& rPos, void*& rpValue) const // Ctor for *others* than Fkps // With nStartPos < 0, the first element of PLCFs will be taken WW8PLCF::WW8PLCF(SvStream& rSt, WW8_FC nFilePos, sal_Int32 nPLCF, int nStruct, - WW8_CP nStartPos) : pPLCF_PosArray(nullptr), nIdx(0), nStru(nStruct) + WW8_CP nStartPos) : nIdx(0), nStru(nStruct) { if (nPLCF < 0) { @@ -2276,7 +2274,7 @@ WW8PLCF::WW8PLCF(SvStream& rSt, WW8_FC nFilePos, sal_Int32 nPLCF, int nStruct, // lack of resources and for WordPad (W95). // With nStartPos < 0, the first element of the PLCFs is taken. WW8PLCF::WW8PLCF(SvStream& rSt, WW8_FC nFilePos, sal_Int32 nPLCF, int nStruct, - WW8_CP nStartPos, sal_Int32 nPN, sal_Int32 ncpN): pPLCF_PosArray(nullptr), nIdx(0), + WW8_CP nStartPos, sal_Int32 nPN, sal_Int32 ncpN): nIdx(0), nStru(nStruct) { if (nPLCF < 0) @@ -3111,7 +3109,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp() WW8PLCFx_Fc_FKP::WW8PLCFx_Fc_FKP(SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt, const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL) : WW8PLCFx(rFib, true), pFKPStrm(pSt), pDataStrm(pDataSt) - , pFkp(nullptr), ePLCF(ePl), pPCDAttrs(nullptr) + , pFkp(nullptr), ePLCF(ePl) { SetStartFc(nStartFcL); long nLenStruct = (8 > rFib.m_nVersion) ? 2 : 4; @@ -3862,7 +3860,7 @@ SprmResult WW8PLCFx_SEPX::HasSprm( sal_uInt16 nId, sal_uInt8 n2nd ) const WW8PLCFx_SubDoc::WW8PLCFx_SubDoc(SvStream* pSt, const WW8Fib& rFib, WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcText, long nLenText, long nStruct) - : WW8PLCFx(rFib, true), pRef(nullptr), pText(nullptr) + : WW8PLCFx(rFib, true) { if( nLenRef && nLenText ) { @@ -3966,7 +3964,7 @@ void WW8PLCFx_SubDoc::advance() // fields WW8PLCFx_FLD::WW8PLCFx_FLD( SvStream* pSt, const WW8Fib& rMyFib, short nType) - : WW8PLCFx(rMyFib, true), pPLCF(nullptr), rFib(rMyFib) + : WW8PLCFx(rMyFib, true), rFib(rMyFib) { long nFc, nLen; diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index bd74fa06acb2..b13d36bbe7b1 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -783,7 +783,6 @@ bool PlfMcd::Read(SvStream &rS) PlfAcd::PlfAcd() : iMac(0) -,rgacd(nullptr) { } @@ -819,7 +818,6 @@ bool PlfAcd::Read( SvStream &rS) PlfKme::PlfKme() : iMac( 0 ) -,rgkme( nullptr ) { } @@ -865,7 +863,6 @@ bool TcgSttbf::Read( SvStream &rS) TcgSttbfCore::TcgSttbfCore() : fExtend( 0 ) ,cData( 0 ) ,cbExtra( 0 ) -,dataItems( nullptr ) { } @@ -895,7 +892,6 @@ bool TcgSttbfCore::Read( SvStream& rS ) MacroNames::MacroNames() : iMac( 0 ) -,rgNames( nullptr ) { } diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 604b4ac2cdc7..c521b38189dd 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -99,9 +99,7 @@ public: bool IsValid(); }; -XTextRangeOrNodeIndexPosition::XTextRangeOrNodeIndexPosition() : - xRange(nullptr), - pIndex(nullptr) +XTextRangeOrNodeIndexPosition::XTextRangeOrNodeIndexPosition() { } diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 1f86cd989b28..c983e8f93ac8 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -87,8 +87,6 @@ SwXMLExport::SwXMLExport( OUString const & implementationName, SvXMLExportFlags nExportFlags) : SvXMLExport( util::MeasureUnit::INCH, rContext, implementationName, XML_TEXT, nExportFlags ), - m_pTableItemMapper( nullptr ), - m_pTableLines( nullptr ), m_bBlock( false ), m_bShowProgress( true ), m_bSavedShowChanges( false ), diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 0693e565aa6b..1388d3b5a557 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -355,8 +355,7 @@ SwXMLTextStyleContext_Impl::SwXMLTextStyleContext_Impl( SwXMLImport& rImport, const uno::Reference< xml::sax::XAttributeList > & xAttrList, sal_uInt16 nFamily, SvXMLStylesContext& rStyles ) : - XMLTextStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily ), - pConditions( nullptr ) + XMLTextStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily ) { } @@ -523,7 +522,6 @@ SwXMLItemSetStyleContext_Impl::SwXMLItemSetStyleContext_Impl( SwXMLImport& rImpo SvXMLStylesContext& rStylesC, sal_uInt16 nFamily ) : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, nFamily ), - pItemSet( nullptr ), pTextStyle( nullptr ), rStyles( rStylesC ), bHasMasterPageName( false ), diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 982cc2ae9295..dd419b586119 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -416,10 +416,6 @@ SwXMLImport::SwXMLImport( const uno::Reference< uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlags) : SvXMLImport( rContext, implementationName, nImportFlags ), - m_pTableItemMapper( nullptr ), - m_pDocElemTokenMap( nullptr ), - m_pTableElemTokenMap( nullptr ), - m_pTableCellAttrTokenMap( nullptr ), m_nStyleFamilyMask( SfxStyleFamily::All ), m_bLoadDoc( true ), m_bInsert( false ), diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 22e2c35b9a22..e0d1aabbc463 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1249,7 +1249,6 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList ) : XMLTextTableContext( rImport, nPrfx, rLName ), - m_pColumnDefaultCellStyleNames( nullptr ), m_pRows( new SwXMLTableRows_Impl ), m_pTableNode( nullptr ), m_pBox1( nullptr ), @@ -1257,7 +1256,6 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport, m_pSttNd1( nullptr ), m_pBoxFormat( nullptr ), m_pLineFormat( nullptr ), - m_pSharedBoxFormats(nullptr), m_bFirstSection( true ), m_bRelWidth( true ), m_bHasSubTables( false ), @@ -1390,7 +1388,6 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport, const OUString& rLName, SwXMLTableContext *pTable ) : XMLTextTableContext( rImport, nPrfx, rLName ), - m_pColumnDefaultCellStyleNames( nullptr ), m_pRows( new SwXMLTableRows_Impl ), m_pTableNode( pTable->m_pTableNode ), m_pBox1( nullptr ), @@ -1398,7 +1395,6 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport, m_pSttNd1( nullptr ), m_pBoxFormat( nullptr ), m_pLineFormat( nullptr ), - m_pSharedBoxFormats(nullptr), m_xParentTable( pTable ), m_bFirstSection( false ), m_bRelWidth( true ), 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<const SwEnvItem&>( 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")) diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 00b0fecade8e..be850b70611c 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -333,12 +333,10 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) // Ctor with SfxCreateMode ????? SwDocShell::SwDocShell( SfxObjectCreateMode const eMode ) : SfxObjectShell(eMode) - , m_pFontList(nullptr) , m_IsInUpdateFontList(false) , m_pStyleManager(new svx::CommonStyleManager(*this)) , m_pView(nullptr) , m_pWrtShell(nullptr) - , m_pOLEChildList(nullptr) , m_nUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG) , m_IsATemplate(false) , m_IsRemovedInvisibleContent(false) @@ -349,12 +347,10 @@ SwDocShell::SwDocShell( SfxObjectCreateMode const eMode ) // Ctor / Dtor SwDocShell::SwDocShell( const SfxModelFlags i_nSfxCreationFlags ) : SfxObjectShell ( i_nSfxCreationFlags ) - , m_pFontList(nullptr) , m_IsInUpdateFontList(false) , m_pStyleManager(new svx::CommonStyleManager(*this)) , m_pView(nullptr) , m_pWrtShell(nullptr) - , m_pOLEChildList(nullptr) , m_nUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG) , m_IsATemplate(false) , m_IsRemovedInvisibleContent(false) @@ -366,12 +362,10 @@ SwDocShell::SwDocShell( const SfxModelFlags i_nSfxCreationFlags ) SwDocShell::SwDocShell( SwDoc *const pD, SfxObjectCreateMode const eMode ) : SfxObjectShell(eMode) , m_xDoc(pD) - , m_pFontList(nullptr) , m_IsInUpdateFontList(false) , m_pStyleManager(new svx::CommonStyleManager(*this)) , m_pView(nullptr) , m_pWrtShell(nullptr) - , m_pOLEChildList(nullptr) , m_nUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG) , m_IsATemplate(false) , m_IsRemovedInvisibleContent(false) diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 4f32741b7cfd..fc4fec6896a8 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -102,7 +102,6 @@ public: }; SwImplShellAction::SwImplShellAction( SwDoc& rDoc ) - : pCurrSh( nullptr ) { if( rDoc.GetDocShell() ) pSh = rDoc.GetDocShell()->GetWrtShell(); diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 853d98c26999..7157f3fb5f47 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -583,8 +583,6 @@ const Sequence<OUString>& SwInsertConfig::GetPropertyNames() SwInsertConfig::SwInsertConfig(bool bWeb) : ConfigItem(bWeb ? OUString("Office.WriterWeb/Insert") : OUString("Office.Writer/Insert"), ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), - m_pCapOptions(nullptr), - m_pOLEMiscOpt(nullptr), m_bInsWithCaption( false ), m_bCaptionOrderNumberingFirst( false ), m_aInsTableOpts(SwInsertTableFlags::NONE,0), diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 14ad312e916d..6586129f8f1a 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1264,7 +1264,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, rMergeDescriptor.pMailMergeConfigItem->GetTargetView() : nullptr; SwWrtShell* pTargetShell = nullptr; SwDoc* pTargetDoc = nullptr; - SfxObjectShellRef xTargetDocShell = nullptr; + SfxObjectShellRef xTargetDocShell; std::unique_ptr< utl::TempFile > aTempFile; sal_uInt16 nStartingPageNo = 0; diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index acdef0ed9dbf..20a658499103 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -101,7 +101,6 @@ struct SpellState m_bOtherSpelled(false), m_bStartedInOther(false), m_bStartedInSelection(false), - pOtherCursor(nullptr), m_bDrawingsSpelled(false), m_pStartDrawing(nullptr), m_bRestartDrawing(false), diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index c58f3f0d27b9..f18c68f4c436 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -614,8 +614,7 @@ SwGlossaryHdl::SwGlossaryHdl(SfxViewFrame* pVwFrame, SwWrtShell *pSh) : rStatGlossaries( *::GetGlossaries() ), aCurGrp( SwGlossaries::GetDefName() ), pViewFrame( pVwFrame ), - pWrtShell( pSh ), - pCurGrp( nullptr ) + pWrtShell( pSh ) { } diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 83ebb8ddab80..702ea43077cc 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -202,13 +202,7 @@ public: SwTransferable::SwTransferable( SwWrtShell& rSh ) : m_pWrtShell( &rSh ), m_pCreatorView( nullptr ), - m_pClpDocFac( nullptr ), - m_pClpGraphic( nullptr ), - m_pClpBitmap( nullptr ), m_pOrigGraphic( nullptr ), - m_pBookmark( nullptr ), - m_pImageMap( nullptr ), - m_pTargetURL( nullptr ), m_eBufferType( TransferBufferType::NONE ) { rSh.GetView().AddTransferable(*this); diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index f779c63e503c..77f6ebf3961b 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -70,14 +70,11 @@ SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin, , mrMgr(aMgr) , mrView(rEditWin.GetView()) , mnEventId(nullptr) - , mpOutlinerView(nullptr) - , mpOutliner(nullptr) , mpSidebarTextControl(nullptr) , mpVScrollbar(nullptr) , mpMetadataAuthor(nullptr) , mpMetadataDate(nullptr) , mpMenuButton(nullptr) - , mpTextRangeOverlay(nullptr) , mColorAnchor() , mColorDark() , mColorLight() diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 0dcd8a9399ec..3a7805640ad8 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -202,7 +202,6 @@ SwPostItMgr::SwPostItMgr(SwView* pView) , mbDeleteNote(true) , mpAnswer(nullptr) , mbIsShowAnchor( false ) - , mpFrameSidebarWinContainer( nullptr ) { if(!mpView->GetDrawView() ) mpView->GetWrtShell().MakeDrawView(); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index b14bad0a80d8..393b3af5c4ad 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -4954,11 +4954,7 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView): DragSourceHelper( this ), m_eBufferLanguage(LANGUAGE_DONTKNOW), - m_pApplyTempl(nullptr), - m_pAnchorMarker( nullptr ), - m_pUserMarker( nullptr ), m_pUserMarkerObj( nullptr ), - m_pShadCursor( nullptr ), m_rView( rMyView ), diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index f38d0b287546..dcf094fe22fb 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -236,8 +236,6 @@ private: SwSrcEditWindow::SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView ) : Window( pParent, WB_BORDER|WB_CLIPCHILDREN ), - m_pTextEngine(nullptr), - m_pOutWin(nullptr), m_pHScrollbar(nullptr), m_pVScrollbar(nullptr), diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index 5a31e58e4ad1..53028e9486fa 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -499,7 +499,6 @@ void SwColumnOnlyExample::Resize() } SwPageGridExample::SwPageGridExample() - : pGridItem(nullptr) { } diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx index d75bb100f429..e665b4d63f3d 100644 --- a/sw/source/uibase/inc/toxmgr.hxx +++ b/sw/source/uibase/inc/toxmgr.hxx @@ -73,7 +73,6 @@ public: // single argument ctors shall be explicit. explicit SwTOXDescription(TOXTypes eType) : m_eTOXType(eType), - m_pForm(nullptr), m_nContent(SwTOXElement::Mark | SwTOXElement::OutlineLevel), m_nIndexOptions(SwTOIOptions::SameEntry|SwTOIOptions::FF|SwTOIOptions::CaseSensitive), m_nOLEOptions(SwTOOElements::NONE), diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 5765a20bee11..4a6c2a61f650 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -97,7 +97,6 @@ SwHHCWrapper::SwHHCWrapper( , m_pView( pSwView ) , m_pWin( &pSwView->GetEditWin() ) , m_rWrtShell( pSwView->GetWrtShell() ) - , m_pConvArgs( nullptr ) , m_nLastPos( 0 ) , m_nUnitOffset( 0 ) , m_nPageCount( 0 ) diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx index 9eb0a9d3f9ac..aafc47876851 100644 --- a/sw/source/uibase/lingu/sdrhhcwrap.cxx +++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx @@ -56,7 +56,6 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, OutlinerMode::TextObject ), pView( pVw ), pTextObj( nullptr ), - pOutlView( nullptr ), nOptions( nConvOptions ), nDocIndex( 0 ), nSourceLang( nSourceLanguage ), diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 79bbd8572939..b928fc570788 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -64,7 +64,6 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher const * pDispat : ToolBox(pParent, WB_3DLOOK|WB_BORDER) , aPos(VclPtr<Edit>::Create(this, WB_3DLOOK|WB_CENTER|WB_BORDER|WB_READONLY)) , aEdit(VclPtr<InputEdit>::Create(this, WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION)) - , pMgr(nullptr) , pWrtShell(nullptr) , pView(nullptr) , aCurrentTableName(aEmptyOUStr) diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 7160f1ec66cb..a2b0383922ff 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -211,7 +211,6 @@ static OUString lcl_ConvertTabsToSpaces( const OUString& sLine ) SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, SfxViewShell*) : SfxViewShell( pViewFrame, SWSRCVIEWFLAGS ), aEditWin( VclPtr<SwSrcEditWindow>::Create( &pViewFrame->GetWindow(), this ) ), - pSearchItem(nullptr), bSourceSaved(false), eLoadEncoding(RTL_TEXTENCODING_DONTKNOW) { diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx index e36cbc5c963d..69ee63b9daa4 100644 --- a/sw/source/uibase/uiview/uivwimp.cxx +++ b/sw/source/uibase/uiview/uivwimp.cxx @@ -53,8 +53,6 @@ SwView_Impl::SwView_Impl(SwView* pShell) : mxXTextView() , pView(pShell) , eShellMode(ShellMode::Text) - , m_pDocInserter(nullptr) - , m_pRequest(nullptr) , m_nParam(0) , m_bSelectObject(false) , m_bEditingPositionSet(false) diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 57feae4cbda3..0138ba9242e7 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -719,7 +719,6 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) m_nOldPageNum(0), m_pNumRuleNodeFromDoc(nullptr), m_pEditWin( VclPtr<SwEditWin>::Create( &_pFrame->GetWindow(), *this ) ), - m_pWrtShell(nullptr), m_pShell(nullptr), m_pFormShell(nullptr), m_pHScrollbar(nullptr), @@ -731,11 +730,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) GetViewFrame()->GetBindings(), WB_VSCROLL | WB_EXTRAFIELD | WB_BORDER )), m_pTogglePageBtn(nullptr), - m_pGlosHdl(nullptr), - m_pDrawActual(nullptr), m_pLastTableFormat(nullptr), m_pFormatClipboard(new SwFormatClipboard()), - m_pPostItMgr(nullptr), m_nSelectionType( SelectionType::All ), m_nPageCnt(0), m_nDrawSfxId( USHRT_MAX ), diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index ff5ff9a0fd5c..259c9728acce 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -519,7 +519,6 @@ Sequence< OUString > SwXPrintSettings::getSupportedServiceNames() SwXViewSettings::SwXViewSettings(SwView* pVw) : ChainablePropertySet( lcl_createViewSettingsInfo (), &Application::GetSolarMutex() ) , pView(pVw) - , mpViewOption(nullptr) , mpConstViewOption(nullptr) , bObjectValid(true) , mbApplyZoom(false) diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 56ca22fe98d0..369df2b014ed 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -444,8 +444,6 @@ SwXTextDocument::SwXTextDocument(SwDocShell* pShell) mxLinkTargetSupplier(), mxXRedlines(), m_pHiddenViewFrame(nullptr), - m_pPrintUIOptions( nullptr ), - m_pRenderData( nullptr ), // #i117783# bApplyPagePrintSettingsFromXPagePrintable( false ) { diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 3d1aca115923..2e15c8a083d3 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -270,7 +270,6 @@ namespace SwContentType::SwContentType(SwWrtShell* pShell, ContentTypeId nType, sal_uInt8 nLevel) : SwTypeNumber(CTYPE_CTT), pWrtShell(pShell), - pMember(nullptr), sContentTypeName(SwResId(STR_CONTENT_TYPE_ARY[static_cast<int>(nType)])), sSingleContentTypeName(SwResId(STR_CONTENT_TYPE_SINGLE_ARY[static_cast<int>(nType)])), nMemberCount(0), diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx index af3fd53daa89..356e08be6feb 100644 --- a/sw/source/uibase/utlui/initui.cxx +++ b/sw/source/uibase/utlui/initui.cxx @@ -214,7 +214,6 @@ ShellResource::ShellResource() aTOXCitationName( SwResId(STR_TOX_CITATION)), aLinkCtrlClick(SwResId(STR_LINK_CTRL_CLICK)), aLinkClick(SwResId(STR_LINK_CLICK)), - pAutoFormatNameLst(nullptr), sPageDescFirstName( SwResId(STR_PAGEDESC_FIRSTNAME)), sPageDescFollowName( SwResId(STR_PAGEDESC_FOLLOWNAME)), sPageDescName( SwResId(STR_PAGEDESC_NAME)) diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 7f265fda712e..e7e79bb5e510 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -598,7 +598,6 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings, vcl::Window* pParent) : PanelLayout(pParent, "NavigatorPanel", "modules/swriter/ui/navigatorpanel.ui", nullptr) , SfxControllerItem(SID_DOCFULLNAME, *_pBindings) - , m_pxObjectShell(nullptr) , m_pContentView(nullptr) , m_pContentWrtShell(nullptr) , m_pActContView(nullptr) diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 364527fb3b0c..f97a0daf62ad 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -113,7 +113,6 @@ using namespace com::sun::star; m_fnKillSel(&SwWrtShell::Ignore),\ m_pModeStack(nullptr), \ m_ePageMove(MV_NO),\ - m_pCursorStack(nullptr), \ m_rView(rShell),\ m_aNavigationMgr(*this), \ m_bDestOnStack(false) |