diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-09 19:42:03 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-10 08:48:08 +0200 |
commit | a6a5064c371017676f606a7a2823214146003572 (patch) | |
tree | 6b0f71af7a1fc636f113b87d2a11b6eb01e5bb5c | |
parent | efe119aaa50e9f532b3fac1ef153469c80f24b80 (diff) |
loplugin:simplifyconstruct in sc
Change-Id: I1f67cef740eb946fea9097e6f62085d25b1e891b
Reviewed-on: https://gerrit.libreoffice.org/60225
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
93 files changed, 49 insertions, 378 deletions
diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index 2cd86278231d..9cbcb7a26f06 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -54,8 +54,7 @@ private: public: ScChangeViewSettings() - : pCommentSearcher(nullptr) - , aFirstDateTime(DateTime::EMPTY) + : aFirstDateTime(DateTime::EMPTY) , aLastDateTime(DateTime::EMPTY) , eDateMode(SvxRedlinDateMode::BEFORE) , bShowIt(false) diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index d4d14d735156..276392fbe6be 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -163,7 +163,7 @@ private: std::vector<double> mSortedValues; public: - ScDPAggData() : fVal(0.0), fAux(0.0), nCount(SC_DPAGG_EMPTY), pChild(nullptr) {} + ScDPAggData() : fVal(0.0), fAux(0.0), nCount(SC_DPAGG_EMPTY) {} void Update( const ScDPValue& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); void Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index d3337bd09a7c..a537eb4e0250 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -377,18 +377,12 @@ void ScProtectionAttr::SetHidePrint( bool bHPrint) * ScPageHFItem - Dates from the Head and Foot lines */ ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP ) - : SfxPoolItem ( nWhichP ), - pLeftArea ( nullptr ), - pCenterArea ( nullptr ), - pRightArea ( nullptr ) + : SfxPoolItem ( nWhichP ) { } ScPageHFItem::ScPageHFItem( const ScPageHFItem& rItem ) - : SfxPoolItem ( rItem ), - pLeftArea ( nullptr ), - pCenterArea ( nullptr ), - pRightArea ( nullptr ) + : SfxPoolItem ( rItem ) { if ( rItem.pLeftArea ) pLeftArea = rItem.pLeftArea->Clone(); diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index b74fb95aaa46..7f778c9a1327 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -639,7 +639,6 @@ ScBroadcastAreaSlotMachine::TableSlots::~TableSlots() ScBroadcastAreaSlotMachine::ScBroadcastAreaSlotMachine( ScDocument* pDocument ) : - pBCAlways( nullptr ), pDoc( pDocument ), pUpdateChain( nullptr ), pEOUpdateChain( nullptr ), diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 5b24a30d08b0..a63cc1193254 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -89,7 +89,6 @@ ScColumn::ScColumn() : maBroadcasters(MAXROWCOUNT), maCellsEvent(this), maCells(maCellsEvent), - pAttrArray( nullptr ), mnBlkCountFormula(0), nCol( 0 ), nTab( 0 ) diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index a7ef20a468d1..546953c0dfd8 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -186,12 +186,8 @@ ScConditionEntry::ScConditionEntry( const ScConditionEntry& r ) : eTempGrammar2(r.eTempGrammar2), bIsStr1(r.bIsStr1), bIsStr2(r.bIsStr2), - pFormula1(nullptr), - pFormula2(nullptr), aSrcPos(r.aSrcPos), aSrcString(r.aSrcString), - pFCell1(nullptr), - pFCell2(nullptr), bRelRef1(r.bRelRef1), bRelRef2(r.bRelRef2), bFirstRun(true), @@ -222,12 +218,8 @@ ScConditionEntry::ScConditionEntry( ScDocument* pDocument, const ScConditionEntr eTempGrammar2(r.eTempGrammar2), bIsStr1(r.bIsStr1), bIsStr2(r.bIsStr2), - pFormula1(nullptr), - pFormula2(nullptr), aSrcPos(r.aSrcPos), aSrcString(r.aSrcString), - pFCell1(nullptr), - pFCell2(nullptr), bRelRef1(r.bRelRef1), bRelRef2(r.bRelRef2), bFirstRun(true), @@ -259,11 +251,7 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, eTempGrammar2(eGrammar2), bIsStr1(false), bIsStr2(false), - pFormula1(nullptr), - pFormula2(nullptr), aSrcPos(rPos), - pFCell1(nullptr), - pFCell2(nullptr), bRelRef1(false), bRelRef2(false), bFirstRun(true), @@ -287,11 +275,7 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, eTempGrammar2(FormulaGrammar::GRAM_DEFAULT), bIsStr1(false), bIsStr2(false), - pFormula1(nullptr), - pFormula2(nullptr), aSrcPos(rPos), - pFCell1(nullptr), - pFCell2(nullptr), bRelRef1(false), bRelRef2(false), bFirstRun(true), diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 30c1e4015889..653c0d81c931 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -123,40 +123,17 @@ struct ScLookupCacheMapImpl ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : mpCellStringPool(new svl::SharedStringPool(*ScGlobal::pCharClass)), mpDocLinkMgr(new sc::DocumentLinkManager(pDocShell)), - mpFormulaGroupCxt(nullptr), mbFormulaGroupCxtBlockDiscard(false), maCalcConfig( ScInterpreter::GetGlobalConfig()), mpUndoManager( nullptr ), - mpEditEngine( nullptr ), - mpNoteEngine( nullptr ), mpShell( pDocShell ), mpPrinter( nullptr ), mpVirtualDevice_100th_mm( nullptr ), - mpDrawLayer( nullptr ), - pValidationList( nullptr ), pFormatExchangeList( nullptr ), - pRangeName(nullptr), - pDPCollection( nullptr ), pFormulaTree( nullptr ), pEOFormulaTree( nullptr ), pFormulaTrack( nullptr ), pEOFormulaTrack( nullptr ), - pClipData( nullptr ), - pDetOpList(nullptr), - pChangeTrack( nullptr ), - pUnoBroadcaster( nullptr ), - pUnoListenerCalls( nullptr ), - pUnoRefUndoList( nullptr ), - pChangeViewSettings( nullptr ), - pScriptTypeData( nullptr ), - mpAnonymousDBData( nullptr ), - pCacheFieldEditEngine( nullptr ), - pViewOptions( nullptr ), - pDocOptions( nullptr ), - pExtDocOptions( nullptr ), - pConsolidateDlgData( nullptr ), - pAutoNameCache( nullptr ), - pPreviewFont( nullptr ), pPreviewCellStyle( nullptr ), nUnoObjectId( 0 ), nRangeOverflowType( 0 ), diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 6432ca91531e..068d06b24392 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -309,12 +309,7 @@ bool ScDPServiceDesc::operator== ( const ScDPServiceDesc& rOther ) const ScDPObject::ScDPObject( ScDocument* pD ) : pDoc( pD ), - pSaveData( nullptr ), - pSheetDesc( nullptr ), - pImpDesc( nullptr ), - pServDesc( nullptr ), mpTableData(static_cast<ScDPTableData*>(nullptr)), - pOutput( nullptr ), nHeaderRows( 0 ), mbHeaderLayout(false), bAllowMove(false), @@ -325,15 +320,10 @@ ScDPObject::ScDPObject( ScDocument* pD ) : ScDPObject::ScDPObject(const ScDPObject& r) : pDoc( r.pDoc ), - pSaveData( nullptr ), aTableName( r.aTableName ), aTableTag( r.aTableTag ), aOutRange( r.aOutRange ), - pSheetDesc( nullptr ), - pImpDesc( nullptr ), - pServDesc( nullptr ), mpTableData(static_cast<ScDPTableData*>(nullptr)), - pOutput( nullptr ), nHeaderRows( r.nHeaderRows ), mbHeaderLayout( r.mbHeaderLayout ), bAllowMove(false), @@ -2817,7 +2807,7 @@ std::vector<OUString> ScDPObject::GetRegisteredSources() uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPServiceDesc& rDesc ) { OUString aImplName = rDesc.aServiceName; - uno::Reference<sheet::XDimensionsSupplier> xRet = nullptr; + uno::Reference<sheet::XDimensionsSupplier> xRet; uno::Reference<lang::XMultiServiceFactory> xManager = comphelper::getProcessServiceFactory(); uno::Reference<container::XContentEnumerationAccess> xEnAc(xManager, uno::UNO_QUERY); diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index bcf1559c58bd..8c2d529cdf6c 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -510,8 +510,6 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS pDoc( pD ), xSource( xSrc ), aStartPos( rPos ), - pColNumFmt( nullptr ), - pRowNumFmt( nullptr ), nColFmtCount( 0 ), nRowFmtCount( 0 ), nSingleNumFmt( 0 ), diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index aa6feb90c8fe..d086f76d32c0 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -192,11 +192,7 @@ ScDPSaveDimension::ScDPSaveDimension(const OUString& rName, bool bDataLayout) : nUsedHierarchy( -1 ), nShowEmptyMode( SC_DPSAVEMODE_DONTKNOW ), bRepeatItemLabels( false ), - bSubTotalDefault( true ), - pReferenceValue( nullptr ), - pSortInfo( nullptr ), - pAutoShowInfo( nullptr ), - pLayoutInfo( nullptr ) + bSubTotalDefault( true ) { } @@ -723,7 +719,6 @@ void ScDPSaveDimension::Dump(int nIndent) const #endif ScDPSaveData::ScDPSaveData() : - pDimensionData( nullptr ), nColumnGrandMode( SC_DPSAVEMODE_DONTKNOW ), nRowGrandMode( SC_DPSAVEMODE_DONTKNOW ), nIgnoreEmptyMode( SC_DPSAVEMODE_DONTKNOW ), @@ -742,8 +737,7 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) : bFilterButton( r.bFilterButton ), bDrillDown( r.bDrillDown ), mbDimensionMembersBuilt(r.mbDimensionMembersBuilt), - mpGrandTotalName(r.mpGrandTotalName), - mpDimOrder(nullptr) + mpGrandTotalName(r.mpGrandTotalName) { if ( r.pDimensionData ) pDimensionData.reset( new ScDPDimensionSaveData( *r.pDimensionData ) ); diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 2e9e71df17ef..2d5952d1c461 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -942,8 +942,6 @@ ScDPResultMember::ScDPResultMember( const ScDPResultData* pData, const ScDPParentDimData& rParentDimData ) : pResultData( pData ), aParentDimData( rParentDimData ), - pChildDimension( nullptr ), - pDataRoot( nullptr ), bHasElements( false ), bForceSubTotal( false ), bHasHiddenDetails( false ), @@ -957,8 +955,6 @@ ScDPResultMember::ScDPResultMember( ScDPResultMember::ScDPResultMember( const ScDPResultData* pData, bool bForceSub ) : pResultData( pData ), - pChildDimension( nullptr ), - pDataRoot( nullptr ), bHasElements( false ), bForceSubTotal( bForceSub ), bHasHiddenDetails( false ), @@ -1832,8 +1828,7 @@ void ScDPResultMember::FillVisibilityData(ScDPResultVisibilityData& rData) const ScDPDataMember::ScDPDataMember( const ScDPResultData* pData, const ScDPResultMember* pRes ) : pResultData( pData ), - pResultMember( pRes ), - pChildDimension( nullptr ) + pResultMember( pRes ) { // pResultMember is 0 for root members } diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 595979e07879..4d52907cae35 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1181,8 +1181,7 @@ void ScDPSource::DumpResults() const SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPSource ) ScDPDimensions::ScDPDimensions( ScDPSource* pSrc ) : - pSource( pSrc ), - ppDims( nullptr ) + pSource( pSrc ) { //TODO: hold pSource @@ -1298,7 +1297,6 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) : nFunction( ScGeneralFunction::SUM ), // sum is default nSourceDim( -1 ), bHasSelectedPage( false ), - pSelectedData( nullptr ), mbHasHiddenMember(false) { //TODO: hold pSource @@ -1633,8 +1631,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPDimension ) ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) : pSource( pSrc ), - nDim( nD ), - ppHiers( nullptr ) + nDim( nD ) { //TODO: hold pSource } @@ -1777,8 +1774,7 @@ void SAL_CALL ScDPHierarchy::setName( const OUString& /* rNewName */ ) ScDPLevels::ScDPLevels( ScDPSource* pSrc, long nD, long nH ) : pSource( pSrc ), nDim( nD ), - nHier( nH ), - ppLevs( nullptr ) + nHier( nH ) { //TODO: hold pSource diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index cf0bd92371da..8cb867ace6bb 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -96,7 +96,7 @@ std::atomic<CollatorWrapper*> ScGlobal::pCollator(nullptr); std::atomic<CollatorWrapper*> ScGlobal::pCaseCollator(nullptr); std::atomic<::utl::TransliterationWrapper*> ScGlobal::pTransliteration(nullptr); std::atomic<::utl::TransliterationWrapper*> ScGlobal::pCaseTransliteration(nullptr); -css::uno::Reference< css::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix = nullptr; +css::uno::Reference< css::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix; sal_Unicode ScGlobal::cListDelimiter = ','; OUString* ScGlobal::pEmptyOUString = nullptr; OUString* ScGlobal::pStrClipDocName = nullptr; diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index a1d6d92e3480..d398ffd456fe 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -26,8 +26,7 @@ ScMarkArray::ScMarkArray() : nCount( 0 ), - nLimit( 0 ), - pData( nullptr ) + nLimit( 0 ) { // special case "no marks" with pData = NULL } diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index 9fd434b05385..f29268d7bc72 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -28,8 +28,7 @@ #include <stlpool.hxx> ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc ) -:pFormTable(nullptr) -,pEditPool(nullptr) +:pEditPool(nullptr) ,pEnginePool(nullptr) ,m_pSourceDoc(pSourceDoc) { diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index e111149a3404..c8727f55bd05 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -817,7 +817,7 @@ std::shared_ptr< SdrCaptionObj > ScNoteUtil::CreateTempCaption( { OUStringBuffer aBuffer( rUserText ); // add plain text of invisible (!) cell note (no formatting etc.) - std::shared_ptr< SdrCaptionObj > pNoteCaption = nullptr; + std::shared_ptr< SdrCaptionObj > pNoteCaption; const ScPostIt* pNote = rDoc.GetNote( rPos ); if( pNote && !pNote->IsCaptionShown() ) { diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx index 5531473bb9bb..f885d6cac530 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -62,8 +62,7 @@ sal_Int32 ScSheetEvents::GetVbaDocumentEventId(ScSheetEventId nEvent) return (nSheetEventId != NO_EVENT) ? (nSheetEventId + USERDEFINED_START) : NO_EVENT; } -ScSheetEvents::ScSheetEvents() : - mpScriptNames(nullptr) +ScSheetEvents::ScSheetEvents() { } @@ -77,8 +76,7 @@ void ScSheetEvents::Clear() mpScriptNames.reset(); } -ScSheetEvents::ScSheetEvents(const ScSheetEvents& rOther) : - mpScriptNames(nullptr) +ScSheetEvents::ScSheetEvents(const ScSheetEvents& rOther) { *this = rOther; } diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 21155a434e99..4c5be3efcda9 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -248,30 +248,20 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName, nRepeatEndX( SCCOL_REPEAT_NONE ), nRepeatStartY( SCROW_REPEAT_NONE ), nRepeatEndY( SCROW_REPEAT_NONE ), - pTabProtection( nullptr ), mpRowHeights( static_cast<ScFlatUInt16RowSegments*>(nullptr) ), - pRowFlags( nullptr ), mpHiddenCols(new ScFlatBoolColSegments), mpHiddenRows(new ScFlatBoolRowSegments), mpFilteredCols(new ScFlatBoolColSegments), mpFilteredRows(new ScFlatBoolRowSegments), - pOutlineTable( nullptr ), - pSheetEvents( nullptr ), nTableAreaX( 0 ), nTableAreaY( 0 ), nTab( nNewTab ), pDocument( pDoc ), - pSearchText ( nullptr ), pSortCollator( nullptr ), - pRepeatColRange( nullptr ), - pRepeatRowRange( nullptr ), nLockCount( 0 ), - pScenarioRanges( nullptr ), aScenarioColor( COL_LIGHTGRAY ), aTabBgColor( COL_AUTO ), nScenarioFlags(ScScenarioFlags::NONE), - pDBDataNoName(nullptr), - mpRangeName(nullptr), mpCondFormatList( new ScConditionalFormatList() ), bScenario(false), bLayoutRTL(false), diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index fdf1d27dffb9..948d4c12ade0 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -223,10 +223,6 @@ void ScUnoAddInFuncData::SetCallerPos( long nNewPos ) ScUnoAddInCollection::ScUnoAddInCollection() : nFuncCount( 0 ), - ppFuncData( nullptr ), - pExactHashMap( nullptr ), - pNameHashMap( nullptr ), - pLocalHashMap( nullptr ), bInitialized( false ) { } diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index ca5b9c210b86..93624110eb0e 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -36,12 +36,12 @@ using namespace com::sun::star::uno; // ScAppOptions - Application Options -ScAppOptions::ScAppOptions() : pLRUList( nullptr ) +ScAppOptions::ScAppOptions() { SetDefaults(); } -ScAppOptions::ScAppOptions( const ScAppOptions& rCpy ) : pLRUList( nullptr ) +ScAppOptions::ScAppOptions( const ScAppOptions& rCpy ) { *this = rCpy; } diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 780862264a73..69a38fbaa377 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -94,7 +94,6 @@ void ScChartListener::ExternalRefListener::removeFileId(sal_uInt16 nFileId) ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, const ScRangeListRef& rRangeList ) : SvtListener(), - mpExtRefListener(nullptr), mpTokens(new vector<ScTokenRef>), maName(rName), mpDoc( pDocP ), @@ -106,7 +105,6 @@ ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, std::unique_ptr<vector<ScTokenRef>> pTokens ) : SvtListener(), - mpExtRefListener(nullptr), mpTokens(std::move(pTokens)), maName(rName), mpDoc( pDocP ), @@ -117,7 +115,6 @@ ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, std: ScChartListener::ScChartListener( const ScChartListener& r ) : SvtListener(), - mpExtRefListener(nullptr), mpTokens(new vector<ScTokenRef>(*r.mpTokens)), maName(r.maName), mpDoc( r.mpDoc ), diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index fb78be869573..7c463fd5dd17 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -44,7 +44,6 @@ namespace ScChartPositioner::ScChartPositioner( ScDocument* pDoc, SCTAB nTab, SCCOL nStartColP, SCROW nStartRowP, SCCOL nEndColP, SCROW nEndRowP) : pDocument( pDoc ), - pPositionMap( nullptr ), eGlue( ScChartGlue::NA ), nStartCol(0), nStartRow(0), @@ -59,7 +58,6 @@ ScChartPositioner::ScChartPositioner( ScDocument* pDoc, SCTAB nTab, ScChartPositioner::ScChartPositioner( ScDocument* pDoc, const ScRangeListRef& rRangeList ) : aRangeListRef( rRangeList ), pDocument( pDoc ), - pPositionMap( nullptr ), eGlue( ScChartGlue::NA ), nStartCol(0), nStartRow(0), @@ -74,7 +72,6 @@ ScChartPositioner::ScChartPositioner( ScDocument* pDoc, const ScRangeListRef& rR ScChartPositioner::ScChartPositioner( const ScChartPositioner& rPositioner ) : aRangeListRef( rPositioner.aRangeListRef ), pDocument(rPositioner.pDocument), - pPositionMap( nullptr ), eGlue(rPositioner.eGlue), nStartCol(rPositioner.nStartCol), nStartRow(rPositioner.nStartRow), diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx index da19c886aa6b..65c0afa18ef4 100644 --- a/sc/source/core/tool/chgviset.cxx +++ b/sc/source/core/tool/chgviset.cxx @@ -29,7 +29,6 @@ ScChangeViewSettings::~ScChangeViewSettings() } ScChangeViewSettings::ScChangeViewSettings( const ScChangeViewSettings& r ): - pCommentSearcher(nullptr), aFirstDateTime( DateTime::EMPTY ), aLastDateTime( DateTime::EMPTY ) { diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 579434fdc8db..78c46e5f76cc 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -372,7 +372,6 @@ tools::Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, bool bF ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) : pEngine( pEng ), - pEditAttrs( nullptr ), bNeedsObject( false ), bNeedsCellAttr( false ) { diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 127387525a5b..7f5b5a81d490 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3771,7 +3771,6 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc, ScInterpre , mpLinkManager(pDok->GetLinkManager()) , mrStrPool(pDoc->GetSharedStringPool()) , pJumpMatrix(nullptr) - , pTokenMatrixMap(nullptr) , pMyFormulaCell(pCell) , pFormatter(rContext.GetFormatTable()) , pCur(nullptr) diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index 02ebcae8d8ee..70e44ce83994 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -130,10 +130,6 @@ public: ScETSForecastCalculation::ScETSForecastCalculation( SCSIZE nSize, SvNumberFormatter* pFormatter ) : mpFormatter(pFormatter) - , mpBase(nullptr) - , mpTrend(nullptr) - , mpPerIdx(nullptr) - , mpForecast(nullptr) , mnSmplInPrd(0) , mfStepSize(0.0) , mfAlpha(0.0) diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index 2cd38278ef28..bfae0949a487 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -116,7 +116,6 @@ ScProgress::ScProgress(SfxObjectShell* pObjSh, const OUString& rText, ScProgress::ScProgress() : bEnabled(true) - , pProgress(nullptr) { // DummyInterpret } diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index f08783927fc8..ecc912b34c4a 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -40,8 +40,6 @@ ScQueryEntry::ScQueryEntry() : nField(0), eOp(SC_EQUAL), eConnect(SC_AND), - pSearchParam(nullptr), - pSearchText(nullptr), maQueryItems(1) { } @@ -51,8 +49,6 @@ ScQueryEntry::ScQueryEntry(const ScQueryEntry& r) : nField(r.nField), eOp(r.eOp), eConnect(r.eConnect), - pSearchParam(nullptr), - pSearchText(nullptr), maQueryItems(r.maQueryItems) { } diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 5e1c90a3ece7..c8a4da19cc23 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -52,7 +52,6 @@ ScRangeData::ScRangeData( ScDocument* pDok, const FormulaGrammar::Grammar eGrammar ) : aName ( rName ), aUpperName ( ScGlobal::pCharClass->uppercase( rName ) ), - pCode ( nullptr ), aPos ( rAddress ), eType ( nType ), pDoc ( pDok ), diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index d5c1bfd8970b..d66c2d9e8fce 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -573,8 +573,7 @@ XclExpAutofilterinfo::XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nS ExcFilterCondition::ExcFilterCondition() : nType( EXC_AFTYPE_NOTUSED ), nOper( EXC_AFOPER_EQUAL ), - fVal( 0.0 ), - pText( nullptr ) + fVal( 0.0 ) { } diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index a2ce68c04669..c94145737fc9 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2365,7 +2365,7 @@ XclExpRow& XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool bRowAlwaysE if( !bFound || bFoundHigher ) { size_t nFrom = 0; - RowRef pPrevEntry = nullptr; + RowRef pPrevEntry; if( itr != maRowMap.begin() ) { --itr; diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index dd32e55468ae..b5e0b7ecbb99 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -338,8 +338,7 @@ const ScMatrix& XclImpExtName::MOper::GetCache() const } XclImpExtName::XclImpExtName( XclImpSupbook& rSupbook, XclImpStream& rStrm, XclSupbookType eSubType, ExcelToSc* pFormulaConv ) - : mpMOper(nullptr) - , mnStorageId(0) + : mnStorageId(0) { sal_uInt16 nFlags(0); sal_uInt8 nLen(0); diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 64dcfdfdfdc6..bc60c1e18252 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -39,8 +39,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : mnXclTab( EXC_NAME_GLOBAL ), mnNameIndex( nXclNameIdx ), mbVBName( false ), - mbMacro( false ), - mpTokensData( nullptr ) + mbMacro( false ) { ExcelToSc& rFmlaConv = GetOldFmlaConverter(); diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 09d042e1b18e..eaed6bff3893 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -202,7 +202,6 @@ ScHTMLLayoutParser::ScHTMLLayoutParser( aPageSize( aPageSizeP ), aBaseURL( rBaseURL ), xLockedList( new ScRangeList ), - pTables( nullptr ), pLocalColOffset( new ScHTMLColOffset ), nFirstTableCell(0), nTableLevel(0), diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 557e63b7a4d7..2a74350756dc 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -327,8 +327,7 @@ private: virtual void SaveCont( XclExpStream& rStrm ) override; public: - XclExpChTrTabId( sal_uInt16 nCount ) : - pBuffer( nullptr ), nTabCount( nCount ) {} + XclExpChTrTabId( sal_uInt16 nCount ) : nTabCount( nCount ) {} XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer ); virtual ~XclExpChTrTabId() override; diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index 1a890d915d41..ebf2e06e9955 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -78,8 +78,7 @@ void ExtCfRuleContext::onStartElement( const AttributeList& rAttribs ) } ExtConditionalFormattingContext::ExtConditionalFormattingContext(WorksheetContextBase& rFragment): - WorksheetContextBase(rFragment), - mpCurrentRule(nullptr) + WorksheetContextBase(rFragment) { } diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx index 14fe09f5f670..d5461f1d6909 100644 --- a/sc/source/filter/rtf/expbase.cxx +++ b/sc/source/filter/rtf/expbase.cxx @@ -27,8 +27,7 @@ ScExportBase::ScExportBase( SvStream& rStrmP, ScDocument* pDocP, rStrm( rStrmP ), aRange( rRangeP ), pDoc( pDocP ), - pFormatter( pDocP->GetFormatTable() ), - pEditEngine( nullptr ) + pFormatter( pDocP->GetFormatTable() ) { } diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index e98f645a9ed5..feddc3cbee27 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -653,7 +653,6 @@ XclExpChTrAction::XclExpChTrAction( const XclExpChTrAction& rCopy ) : sUsername( rCopy.sUsername ), aDateTime( rCopy.aDateTime ), nIndex( 0 ), - pAddAction( nullptr ), bAccepted( rCopy.bAccepted ), rTabInfo( rCopy.rTabInfo ), rIdBuffer( rCopy.rIdBuffer ), @@ -671,7 +670,6 @@ XclExpChTrAction::XclExpChTrAction( sUsername( rAction.GetUser() ), aDateTime( rAction.GetDateTime() ), nIndex( 0 ), - pAddAction( nullptr ), bAccepted( rAction.IsAccepted() ), rTabInfo( rRoot.GetTabInfo() ), rIdBuffer( rTabIdBuffer ), @@ -748,7 +746,6 @@ std::size_t XclExpChTrAction::GetLen() const } XclExpChTrData::XclExpChTrData() : - pString( nullptr ), mpFormulaCell( nullptr ), fValue( 0.0 ), nRKValue( 0 ), @@ -827,8 +824,6 @@ XclExpChTrCellContent::XclExpChTrCellContent( const XclExpChTrTabIdBuffer& rTabIdBuffer ) : XclExpChTrAction( rAction, rRoot, rTabIdBuffer, EXC_CHTR_OP_CELL ), XclExpRoot( rRoot ), - pOldData( nullptr ), - pNewData( nullptr ), aPosition( rAction.GetBigRange().MakeRange().aStart ) { sal_uInt32 nDummy32; diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 668359d0e355..f212b231c6dd 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -37,8 +37,6 @@ XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStrea XclImpRoot( rRoot ), aRecHeader(), sOldUsername(), - pChangeTrack( nullptr ), - pStrm( nullptr ), nTabIdCount( 0 ), bGlobExit( false ), eNestedMode( nmBase ) diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 4ef21e1b6317..83cd1746eb32 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -97,7 +97,6 @@ XclEscherEx::XclEscherEx( const XclExpRoot& rRoot, XclExpObjectManager& rObjMgr, XclExpRoot( rRoot ), mrObjMgr( rObjMgr ), pCurrXclObj( nullptr ), - pCurrAppData( nullptr ), pTheClientData( new XclEscherClientData ), pAdditionalText( nullptr ), nAdditionalText( 0 ), diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 232f0da21566..6e40a5e56340 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -45,8 +45,7 @@ using namespace xmloff::token; ScChangeTrackingExportHelper::ScChangeTrackingExportHelper(ScXMLExport& rTempExport) : rExport(rTempExport), pChangeTrack(nullptr), - pEditTextObj(nullptr), - pDependings(nullptr) + pEditTextObj(nullptr) { pChangeTrack = rExport.GetDocument() ? rExport.GetDocument()->GetChangeTrack() : nullptr; pDependings.reset( new ScChangeActionMap ); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index a29c78c6a476..c9844926688f 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -106,7 +106,6 @@ ScMyInsAction::~ScMyInsAction() ScMyDelAction::ScMyDelAction(const ScChangeActionType nActionTypeP) : ScMyBaseAction(nActionTypeP), aGeneratedList(), - pInsCutOff(nullptr), aMoveCutOffs(), nD(0) { @@ -118,8 +117,7 @@ ScMyDelAction::~ScMyDelAction() ScMyMoveAction::ScMyMoveAction() : ScMyBaseAction(SC_CAT_MOVE), - aGeneratedList(), - pMoveRanges(nullptr) + aGeneratedList() { } @@ -128,8 +126,7 @@ ScMyMoveAction::~ScMyMoveAction() } ScMyContentAction::ScMyContentAction() - : ScMyBaseAction(SC_CAT_CONTENT), - pCellInfo(nullptr) + : ScMyBaseAction(SC_CAT_CONTENT) { } @@ -150,7 +147,6 @@ ScXMLChangeTrackingImportHelper::ScXMLChangeTrackingImportHelper() : aActions(), pDoc(nullptr), pTrack(nullptr), - pCurrentAction(nullptr), nMultiSpanned(0), nMultiSpannedSlaveCount(0) { diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx index b5fa9cbb1e3c..44e0e874610a 100644 --- a/sc/source/filter/xml/XMLExportSharedData.cxx +++ b/sc/source/filter/xml/XMLExportSharedData.cxx @@ -26,11 +26,7 @@ using namespace com::sun::star; ScMySharedData::ScMySharedData(const sal_Int32 nTempTableCount) : nLastColumns(nTempTableCount, 0), nLastRows(nTempTableCount, 0), - pTableShapes(nullptr), - pDrawPages(nullptr), - pShapesContainer(nullptr), pDetectiveObjContainer(new ScMyDetectiveObjContainer()), - pNoteShapes(nullptr), nTableCount(nTempTableCount) { } diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 1dbceb61943d..c4739ad68138 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -40,8 +40,7 @@ sal_Int32 ScMyStyleNumberFormats::GetStyleNumberFormat(const OUString& rStyleNam return aItr->nNumberFormat; } -ScMyStyleRanges::ScMyStyleRanges() : - pCurrencyList(nullptr) +ScMyStyleRanges::ScMyStyleRanges() { } diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 1a426bf4fba0..a43614c5e774 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -691,7 +691,6 @@ ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport, sLName(rLName), sText(), pChangeCellContext(pTempChangeCellContext), - pTextPContext(nullptr), nPrefix(nPrfx) { // here are no attributes diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index f7e87a940206..9df714e244f5 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -46,8 +46,7 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLAnnotationData& rAnnotationData) : ScXMLImportContext( rImport, nPrfx, rLName ), - mrAnnotationData( rAnnotationData ), - pShapeContext(nullptr) + mrAnnotationData( rAnnotationData ) { uno::Reference<drawing::XShapes> xLocalShapes (GetScImport().GetTables().GetCurrentXShapes()); if (xLocalShapes.is()) diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index f1c1e96bf309..49e0a638e51f 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -97,7 +97,6 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, ScXMLImportContext( rImport ), pDoc(GetScImport().GetDocument()), pDPSave(new ScDPSaveData()), - pDPDimSaveData(nullptr), sDataPilotTableName(), sApplicationData(), nSourceType(SQL), diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 59f4b9bbb572..27e8a2ec499e 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -342,20 +342,9 @@ ScXMLExport::ScXMLExport( rContext, implementationName, XML_SPREADSHEET, nExportFlag ), pDoc(nullptr), nSourceStreamPos(0), - pNumberFormatAttributesExportHelper(nullptr), pSharedData(nullptr), - pColumnStyles(nullptr), - pRowStyles(nullptr), - pCellStyles(nullptr), - pRowFormatRanges(nullptr), aTableStyles(), - pGroupColumns (nullptr), - pGroupRows (nullptr), - pDefaults(nullptr), pCurrentCell(nullptr), - pMergedRangesContainer(nullptr), - pValidationsContainer(nullptr), - pChangeTrackingExportHelper(nullptr), nOpenRow(-1), nProgressCount(0), nCurrentTable(0), diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 0dc6d755d84f..3d321ca29382 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -664,30 +664,11 @@ ScXMLImport::ScXMLImport( OUString const & implementationName, SvXMLImportFlags nImportFlag) : SvXMLImport( rContext, implementationName, nImportFlag ), pDoc( nullptr ), - pChangeTrackingImportHelper(nullptr), - pStylesImportHelper(nullptr), sNumberFormat(SC_UNONAME_NUMFMT), sLocale(SC_LOCALE), sCellStyle(SC_UNONAME_CELLSTYL), - pDocElemTokenMap( nullptr ), - pContentValidationElemTokenMap( nullptr ), - pContentValidationMessageElemTokenMap( nullptr ), - pTableElemTokenMap( nullptr ), - pTableRowsElemTokenMap( nullptr ), - pTableRowElemTokenMap( nullptr ), - pTableRowAttrTokenMap( nullptr ), - pTableRowCellElemTokenMap( nullptr ), - pTableRowCellAttrTokenMap( nullptr ), - pTableAnnotationAttrTokenMap( nullptr ), mpPostProcessData(nullptr), aTables(*this), - m_pMyNamedExpressions(nullptr), - pMyLabelRanges(nullptr), - pValidations(nullptr), - pDetectiveOpArray(nullptr), - pSolarMutexGuard(nullptr), - pNumberFormatAttributesExportHelper(nullptr), - pStyleNumberFormats(nullptr), sPrevStyleName(), sPrevCurrency(), nSolarMutexLocked(0), diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 7c1438d8792c..ace156f82e9a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1378,7 +1378,6 @@ ScAccessibleDocument::ScAccessibleDocument( : ScAccessibleDocumentBase(rxParent), mpViewShell(pViewShell), meSplitPos(eSplitPos), - mpChildrenShapes(nullptr), mpTempAccEdit(nullptr), mbCompleteSheetSelected(false) { @@ -1684,7 +1683,7 @@ void SAL_CALL ScAccessibleDocument::release() uno::Reference< XAccessible > SAL_CALL ScAccessibleDocument::getAccessibleAtPoint( const awt::Point& rPoint ) { - uno::Reference<XAccessible> xAccessible = nullptr; + uno::Reference<XAccessible> xAccessible; if (containsPoint(rPoint)) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 2c40ae3a7e06..84cdfe7df845 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1154,9 +1154,7 @@ ScPagePreviewCountData::ScPagePreviewCountData( const ScPreviewLocationData& rDa ScAccessibleDocumentPagePreview::ScAccessibleDocumentPagePreview( const uno::Reference<XAccessible>& rxParent, ScPreviewShell* pViewShell ) : ScAccessibleDocumentBase(rxParent), - mpViewShell(pViewShell), - mpNotesChildren(nullptr), - mpShapeChildren(nullptr) + mpViewShell(pViewShell) { if (pViewShell) pViewShell->AddAccessibilityObject(*this); diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 5af3996b14cc..8dcba0cae6b0 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -62,7 +62,6 @@ ScAccessibleEditObject::ScAccessibleEditObject( const OUString& rDescription, EditObjectType eObjectType) : ScAccessibleContextBase(rxParent, AccessibleRole::TEXT_FRAME), - mpTextHelper(nullptr), mpEditView(pEditView), mpWindow(pWin), meObjectType(eObjectType), diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index c1e3c919ea29..1109f8de7429 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -53,7 +53,6 @@ ScAccessiblePageHeaderArea::ScAccessiblePageHeaderArea( SvxAdjust eAdjust) : ScAccessibleContextBase(rxParent, AccessibleRole::TEXT), mpEditObj(pEditObj->Clone().release()), - mpTextHelper(nullptr), mpViewShell(pViewShell), mbHeader(bHeader), meAdjust(eAdjust) diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 864db6d539d3..b39fd0836e95 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -47,8 +47,7 @@ ScAccessiblePreviewCell::ScAccessiblePreviewCell( const css::uno::Reference<css: const ScAddress& rCellAddress, sal_Int32 nIndex ) : ScAccessibleCellBase( rxParent, ( pViewShell ? &pViewShell->GetDocument() : nullptr ), rCellAddress, nIndex ), - mpViewShell( pViewShell ), - mpTextHelper(nullptr) + mpViewShell( pViewShell ) { if (mpViewShell) mpViewShell->AddAccessibilityObject(*this); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index e1a8d942edff..c0537933d497 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -65,8 +65,7 @@ ScAccessiblePreviewHeaderCell::ScAccessiblePreviewHeaderCell( const css::uno::Re mnIndex( nIndex ), maCellPos( rCellPos ), mbColumnHeader( bIsColHdr ), - mbRowHeader( bIsRowHdr ), - mpTableInfo( nullptr ) + mbRowHeader( bIsRowHdr ) { if (mpViewShell) mpViewShell->AddAccessibilityObject(*this); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 2d211c748dfb..ceaee901f68e 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -50,8 +50,7 @@ ScAccessiblePreviewTable::ScAccessiblePreviewTable( const css::uno::Reference<cs ScPreviewShell* pViewShell, sal_Int32 nIndex ) : ScAccessibleContextBase( rxParent, AccessibleRole::TABLE ), mpViewShell( pViewShell ), - mnIndex( nIndex ), - mpTableInfo( nullptr ) + mnIndex( nIndex ) { if (mpViewShell) mpViewShell->AddAccessibilityObject(*this); diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 3f45c7f3de94..4260968c75c0 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -865,11 +865,8 @@ ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell) ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, vcl::Window* pWin, bool isClone) : - mpViewForwarder(nullptr), - mpEditViewForwarder(nullptr), mpEditView(pEditView), mpEditEngine(pEditView ? pEditView->GetEditEngine() : nullptr), - mpForwarder(nullptr), mpWindow(pWin) { // If the object is cloned, do NOT add notify hdl. @@ -1133,7 +1130,6 @@ void ScAccessibleEditLineTextData::EndEdit() ScAccessiblePreviewCellTextData::ScAccessiblePreviewCellTextData(ScPreviewShell* pViewShell, const ScAddress& rP) : ScAccessibleCellBaseTextData(GetDocShell(pViewShell), rP), - mpViewForwarder(nullptr), mpViewShell(pViewShell) { } @@ -1202,7 +1198,6 @@ ScDocShell* ScAccessiblePreviewCellTextData::GetDocShell(ScPreviewShell* pViewSh ScAccessiblePreviewHeaderCellTextData::ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell, const OUString& rText, const ScAddress& rP, bool bColHeader, bool bRowHeader) : ScAccessibleCellBaseTextData(GetDocShell(pViewShell), rP), - mpViewForwarder(nullptr), mpViewShell(pViewShell), maText(rText), mbColHeader(bColHeader), @@ -1303,8 +1298,6 @@ ScAccessibleHeaderTextData::ScAccessibleHeaderTextData(ScPreviewShell* pViewShel : mpViewForwarder(nullptr), mpViewShell(pViewShell), - mpEditEngine(nullptr), - mpForwarder(nullptr), mpDocSh(nullptr), mpEditObj(pEditObj), mbHeader(bHeader), @@ -1416,8 +1409,6 @@ ScAccessibleNoteTextData::ScAccessibleNoteTextData(ScPreviewShell* pViewShell, : mpViewForwarder(nullptr), mpViewShell(pViewShell), - mpEditEngine(nullptr), - mpForwarder(nullptr), mpDocSh(nullptr), msText(sText), maCellPos(aCellPos), diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 3cb2fefebf0b..759f3f9763f2 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -76,11 +76,9 @@ ScDrawTransferObj::ScDrawTransferObj( std::unique_ptr<SdrModel> pClipModel, ScDo const TransferableObjectDescriptor& rDesc ) : m_pModel( std::move(pClipModel) ), m_aObjDesc( rDesc ), - m_pBookmark( nullptr ), m_bGraphic( false ), m_bGrIsBit( false ), m_bOleObj( false ), - m_pDragSourceView( nullptr ), m_nDragSourceFlags( ScDragSrc::Undefined ), m_bDragWasInternal( false ), maShellID(SfxObjectShell::CreateShellID(pContainerShell)) diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 2d56ce5f075a..15a2d21a5d10 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -588,12 +588,8 @@ static sal_Int32 lcl_MatchParenthesis( const OUString& rStr, sal_Int32 nPos ) ScInputHandler::ScInputHandler() : pInputWin( nullptr ), - mpEditEngine( nullptr ), pTableView( nullptr ), pTopView( nullptr ), - pColumnData( nullptr ), - pFormulaData( nullptr ), - pFormulaDataPara( nullptr ), pTipVisibleParent( nullptr ), nTipVisible( nullptr ), pTipVisibleSecParent( nullptr ), @@ -623,10 +619,6 @@ ScInputHandler::ScInputHandler() aScaleY( 1,1 ), pRefViewSh( nullptr ), pLastPattern( nullptr ), - pEditDefaults( nullptr ), - pLastState( nullptr ), - pDelayTimer( nullptr ), - pRangeFindList( nullptr ), maFormulaChar() { // The InputHandler is constructed with the view, so SfxViewShell::Current @@ -4056,7 +4048,6 @@ ScInputHdlState::ScInputHdlState( const ScAddress& rCurPos, } ScInputHdlState::ScInputHdlState( const ScInputHdlState& rCpy ) - : pEditData ( nullptr ) { *this = rCpy; } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index a1fb0b3a6625..d116c9acc7c0 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1259,8 +1259,6 @@ void ScTextWnd::InitEditEngine() ScTextWnd::ScTextWnd(ScInputBarGroup* pParent, ScTabViewShell* pViewSh) : ScTextWndBase(pParent, WinBits(WB_HIDE | WB_BORDER)), DragSourceHelper(this), - mpEditEngine (nullptr), - mpEditView (nullptr), bIsInsertMode(true), bFormulaMode (false), bInputMode (false), diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 0390397b678e..b24f53f47564 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -144,21 +144,6 @@ ScModule::ScModule( SfxObjectFactory* pFact ) : m_pSelTransfer( nullptr ), m_pMessagePool( nullptr ), m_pRefInputHandler( nullptr ), - m_pViewCfg( nullptr ), - m_pDocCfg( nullptr ), - m_pAppCfg( nullptr ), - m_pDefaultsCfg( nullptr ), - m_pFormulaCfg( nullptr ), - m_pInputCfg( nullptr ), - m_pPrintCfg( nullptr ), - m_pNavipiCfg( nullptr ), - m_pAddInCfg( nullptr ), - m_pColorConfig( nullptr ), - m_pAccessOptions( nullptr ), - m_pCTLOptions( nullptr ), - m_pUserOptions( nullptr ), - m_pErrorHdl( nullptr ), - m_pFormEditData( nullptr ), m_nCurRefDlgId( 0 ), m_bIsWaterCan( false ), m_bIsInEditCommand( false ), diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index dd0f4eb27f79..bd938e9611c0 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -166,7 +166,6 @@ ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, ScViewData* ptrViewData, const ScQueryParam* pQueryData ) : SfxPoolItem ( nWhichP ), - mpQueryData(nullptr), pViewData ( ptrViewData ), bIsAdvanced ( false ) { @@ -179,7 +178,6 @@ ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, const ScQueryParam* pQueryData ) : SfxPoolItem ( nWhichP ), - mpQueryData(nullptr), pViewData ( nullptr ), bIsAdvanced ( false ) { @@ -287,8 +285,7 @@ bool ScSubTotalItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberUd */ * Transporter for the UserLIst dialog */ ScUserListItem::ScUserListItem( sal_uInt16 nWhichP ) - : SfxPoolItem ( nWhichP ), - pUserList ( nullptr ) + : SfxPoolItem ( nWhichP ) { } diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index aafbef46a7a1..9dcd5894baec 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -882,9 +882,6 @@ ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* p maBtnUnselectSingle(VclPtr<ImageButton>::Create(this, 0)), maBtnOk(VclPtr<OKButton>::Create(this)), maBtnCancel(VclPtr<CancelButton>::Create(this)), - mpExtendedData(nullptr), - mpOKAction(nullptr), - mpPopupEndAction(nullptr), maWndSize(), mePrevToggleAllState(TRISTATE_INDET), maTabStops(this) @@ -1610,7 +1607,7 @@ void ScTabStops::clear() } ScCheckListBox::ScCheckListBox( vcl::Window* pParent ) - : SvTreeListBox( pParent, 0 ), mpCheckButton( nullptr ), mbSeenMouseButtonDown( false ) + : SvTreeListBox( pParent, 0 ), mbSeenMouseButtonDown( false ) { Init(); set_id("check_list_box"); diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 8205ba0439b7..df1b94034214 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -77,7 +77,6 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::W pDoc ( static_cast<ScTabViewShell*>(SfxViewShell::Current())-> GetViewData().GetDocument() ), pRangeUtil ( new ScRangeUtil ), - pAreaData ( nullptr ), nAreaDataCount ( 0 ), nWhichCons ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ), bDlgLostFocus ( false ) diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index ab43130cfbcb..b239dc258250 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -60,7 +60,6 @@ ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : VclReferenceBase(), Control( &rParent, WB_TABSTOP | WB_NODIALOGCONTROL ), mrData( rParent.GetLayoutData() ), - mxAccessible( nullptr ), mbValidGfx( false ) { } @@ -68,7 +67,6 @@ ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : ScCsvControl::ScCsvControl( vcl::Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ) : Control( pParent, nBits ), mrData( rData ), - mxAccessible( nullptr ), mbValidGfx( false ) { } diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 943b5847d711..61b691040635 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -59,15 +59,12 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPar , aStrEmpty(ScResId(SCSTR_FILTER_EMPTY)) , aStrNotEmpty(ScResId(SCSTR_FILTER_NOTEMPTY)) , aStrColumn(ScResId(SCSTR_COLUMN)) - , pOptionsMgr(nullptr) , nWhichQuery(rArgSet.GetPool()->GetWhich(SID_QUERY)) , theQueryData(static_cast<const ScQueryItem&>(rArgSet.Get(nWhichQuery)).GetQueryData()) - , pOutItem(nullptr) , pViewData(nullptr) , pDoc(nullptr) , nSrcTab(0) , bRefInputMode(false) - , pTimer(nullptr) { get(pLbConnect1,"connect1"); get(pLbField1,"field1"); diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index cdd761e8fdc7..1aa225bbcd85 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -52,7 +52,6 @@ ScPivotFilterDlg::ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgS nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), theQueryData ( static_cast<const ScQueryItem&>( rArgSet.Get( nWhichQuery )).GetQueryData() ), - pOutItem ( nullptr ), pViewData ( nullptr ), pDoc ( nullptr ), nSrcTab ( nSourceTab ) // is not in QueryParam diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index fe4ae899fc47..e6774a9ea464 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -292,7 +292,6 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa mpDatStream ( pInStream ), mnStreamPos( pInStream ? pInStream->Tell() : 0 ), - mpRowPosArray( nullptr ), mnRowPosCount(0), aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ), diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 8a8cfc91ee9c..33010a009833 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -58,16 +58,13 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vc : ScAnyRefDlg ( pB, pCW, pParent, "AdvancedFilterDialog", "modules/scalc/ui/advancedfilterdialog.ui" ), aStrUndefined ( ScResId(SCSTR_UNDEFINED) ), - pOptionsMgr ( nullptr ), nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), theQueryData ( static_cast<const ScQueryItem&>( rArgSet.Get( nWhichQuery )).GetQueryData() ), - pOutItem ( nullptr ), pViewData ( nullptr ), pDoc ( nullptr ), pRefInputEdit ( nullptr ), - bRefInputMode ( false ), - pIdle ( nullptr ) + bRefInputMode ( false ) { get(pLbFilterArea,"lbfilterarea"); get(pEdFilterArea,"edfilterarea"); diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 08f882812d9e..dcae0094c8b0 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -280,7 +280,6 @@ DataStream::DataStream(ScDocShell *pShell, const OUString& rURL, const ScRange& mbRunning(false), mbValuesInLine(false), mbRefreshOnEmptyLine(false), - mpLines(nullptr), mnLinesCount(0), mnLinesSinceRefresh(0), mfLastRefreshTime(0.0), diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 63c3f3ac745d..b446ffc7995c 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2820,14 +2820,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : m_bUpdateEnabled ( true ), m_bUcalcTest(rShell.m_bUcalcTest), m_nDocumentLock ( 0 ), - m_nCanUpdate (css::document::UpdateDocMode::ACCORDING_TO_CONFIG), - m_pOldAutoDBRange ( nullptr ), - m_pAutoStyleList ( nullptr ), - m_pPaintLockData ( nullptr ), - m_pSolverSaveData ( nullptr ), - m_pSheetSaveData ( nullptr ), - m_pFormatSaveData( nullptr ), - m_pModificator ( nullptr ) + m_nCanUpdate (css::document::UpdateDocMode::ACCORDING_TO_CONFIG) { SetPool( &SC_MOD()->GetPool() ); @@ -2862,14 +2855,7 @@ ScDocShell::ScDocShell( const SfxModelFlags i_nSfxCreationFlags ) : m_bUpdateEnabled ( true ), m_bUcalcTest ( false ), m_nDocumentLock ( 0 ), - m_nCanUpdate (css::document::UpdateDocMode::ACCORDING_TO_CONFIG), - m_pOldAutoDBRange ( nullptr ), - m_pAutoStyleList ( nullptr ), - m_pPaintLockData ( nullptr ), - m_pSolverSaveData ( nullptr ), - m_pSheetSaveData ( nullptr ), - m_pFormatSaveData( nullptr ), - m_pModificator ( nullptr ) + m_nCanUpdate (css::document::UpdateDocMode::ACCORDING_TO_CONFIG) { SetPool( &SC_MOD()->GetPool() ); diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx index b1b66a9a8a8d..0edd199fbe1c 100644 --- a/sc/source/ui/docshell/documentlinkmgr.cxx +++ b/sc/source/ui/docshell/documentlinkmgr.cxx @@ -43,7 +43,7 @@ struct DocumentLinkManagerImpl const DocumentLinkManagerImpl& operator=(const DocumentLinkManagerImpl&) = delete; explicit DocumentLinkManagerImpl(SfxObjectShell* pShell) - : mpShell(pShell), mpDataStream(nullptr), mpLinkManager(nullptr) {} + : mpShell(pShell), mpLinkManager(nullptr) {} ~DocumentLinkManagerImpl() { diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 381722983bab..a749c71be2be 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -39,7 +39,6 @@ ScInsertTableDlg::ScInsertTableDlg(weld::Window* pParent, ScViewData& rData, SCT , rViewData(rData) , rDoc(*rData.GetDocument()) , pDocShTables(nullptr) - , pDocInserter(nullptr) , bMustClose(false) , nSelTabIndex(0) , nTableCount(nTabCount) diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 39e72d477e0b..2701cddda19d 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -458,7 +458,6 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, vcl::Window* pParent) , aStrDragMode(ScResId(SCSTR_DRAGMODE)) , aStrDisplay(ScResId(SCSTR_DISPLAY)) , aStrActiveWin(ScResId(SCSTR_ACTIVEWIN)) - , pMarkArea(nullptr) , pViewData(nullptr ) , eListMode(NAV_LMODE_NONE) , nDropMode(SC_DROPMODE_URL) diff --git a/sc/source/ui/undo/refundo.cxx b/sc/source/ui/undo/refundo.cxx index 178b34ea8ba9..1ece3ec5d62b 100644 --- a/sc/source/ui/undo/refundo.cxx +++ b/sc/source/ui/undo/refundo.cxx @@ -36,14 +36,7 @@ #include <o3tl/make_unique.hxx> ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) : - pDBCollection(nullptr), - pRangeName(nullptr), - pPrintRanges(pDoc->CreatePrintRangeSaver()), - pDPCollection(nullptr), - pDetOpList(nullptr), - pChartListenerCollection(nullptr), - pAreaLinks(nullptr), - pUnoRefs(nullptr) + pPrintRanges(pDoc->CreatePrintRangeSaver()) { const ScDBCollection* pOldDBColl = pDoc->GetDBCollection(); if (pOldDBColl && !pOldDBColl->empty()) diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index ce81044707a0..605cc701c9a1 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -78,8 +78,7 @@ ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell, pTabs( std::move(pNewTabs) ), pScenarios( std::move(pNewScenarios) ), eCmd( eNewCmd ), - bPartOfPaste( bNewPartOfPaste ), - pPasteUndo( nullptr ) + bPartOfPaste( bNewPartOfPaste ) { if (eCmd == INS_INSROWS_BEFORE || eCmd == INS_INSROWS_AFTER) // whole row? { @@ -910,7 +909,6 @@ ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell, const ScRangeList& rRanges, pRedoDoc( std::move(pNewRedoDoc) ), nFlags( nNewFlags ), pRefUndoData( std::move(pRefData) ), - pRefRedoData( nullptr ), bRedoFilled( bRedoIsFilled ) { if ( pRefUndoData ) @@ -2098,8 +2096,7 @@ ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& ScDocumentUniquePtr pNewUndoDoc, const sal_uInt16* pW ) : ScBlockUndo( pNewDocShell, lcl_GetMultiMarkRange(rMark), SC_UNDO_AUTOHEIGHT ), aMarkData( rMark ), - pUndoDoc( std::move(pNewUndoDoc) ), - pWhich( nullptr ) + pUndoDoc( std::move(pNewUndoDoc) ) { OSL_ENSURE( pW, "ScUndoClearItems: Which-Pointer is Null" ); diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 57dedac42731..bc7173aa15bb 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -72,7 +72,6 @@ ScUndoDeleteContents::ScUndoDeleteContents( aRange ( rRange ), aMarkData ( rMark ), pUndoDoc ( std::move(pNewUndoDoc) ), - pDrawUndo ( nullptr ), nFlags ( nNewFlags ), bMulti ( bNewMulti ) // unnecessary { diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index f43ba974a21f..1d0f6a3ee354 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -702,7 +702,6 @@ ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQuery const ScRange* pOld, bool bSize, const ScRange* pAdvSrc ) : ScDBFuncUndo( pNewDocShell, ScRange( rParam.nCol1, rParam.nRow1, nNewTab, rParam.nCol2, rParam.nRow2, nNewTab ) ), - pDrawUndo( nullptr ), nTab( nNewTab ), aQueryParam( rParam ), xUndoDoc( std::move(pNewUndoDoc) ), diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index bec64334f973..0cef12f8bd5e 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -65,7 +65,6 @@ ScUndoInsertTab::ScUndoInsertTab( ScDocShell* pNewDocShell, const OUString& rNewName) : ScSimpleUndo( pNewDocShell ), sNewName( rNewName ), - pDrawUndo( nullptr ), nTab( nTabNum ), bAppend( bApp ) { @@ -157,7 +156,6 @@ ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell, SCTAB nTabNum, const std::vector<OUString>& newNameList) : ScSimpleUndo( pNewDocShell ), - pDrawUndo( nullptr ), aNameList( newNameList ), nTab( nTabNum ) { @@ -573,8 +571,7 @@ ScUndoCopyTab::ScUndoCopyTab( ScSimpleUndo( pNewDocShell ), mpOldTabs(pOldTabs), mpNewTabs(pNewTabs), - mpNewNames(pNewNames), - pDrawUndo( nullptr ) + mpNewNames(pNewNames) { pDrawUndo = GetSdrUndoAction( &pDocShell->GetDocument() ); @@ -784,8 +781,7 @@ ScUndoMakeScenario::ScUndoMakeScenario( ScDocShell* pNewDocShell, aName( rN ), aComment( rC ), aColor( rCol ), - nFlags( nF ), - pDrawUndo( nullptr ) + nFlags( nF ) { pDrawUndo = GetSdrUndoAction( &pDocShell->GetDocument() ); } @@ -864,7 +860,6 @@ ScUndoImportTab::ScUndoImportTab(ScDocShell* pShell, : ScSimpleUndo(pShell) , nTab(nNewTab) , nCount(nNewCount) - , pDrawUndo(nullptr) { pDrawUndo = GetSdrUndoAction( &pDocShell->GetDocument() ); } diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 6b6985cdd5b4..bb877953a05c 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -1399,12 +1399,6 @@ static OUString lcl_GetInputString( ScDocument& rDoc, const ScAddress& rPos, boo ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR) : pPropSet(lcl_GetCellsPropertySet()), pDocShell( pDocSh ), - pValueListener( nullptr ), - pCurrentFlat( nullptr ), - pCurrentDeep( nullptr ), - pCurrentDataSet( nullptr ), - pNoDfltCurrentDataSet( nullptr ), - pMarkData( nullptr ), nObjectId( 0 ), bChartColAsHdr( false ), bChartRowAsHdr( false ), @@ -1436,12 +1430,6 @@ ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR) : ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRangeList& rR) : pPropSet(lcl_GetCellsPropertySet()), pDocShell( pDocSh ), - pValueListener( nullptr ), - pCurrentFlat( nullptr ), - pCurrentDeep( nullptr ), - pCurrentDataSet( nullptr ), - pNoDfltCurrentDataSet( nullptr ), - pMarkData( nullptr ), aRanges( rR ), nObjectId( 0 ), bChartColAsHdr( false ), @@ -8913,7 +8901,6 @@ sal_Bool SAL_CALL ScCellsObj::hasElements() ScCellsEnumeration::ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR) : pDocShell( pDocSh ), aRanges( rR ), - pMark( nullptr ), bAtEnd( false ) { ScDocument& rDoc = pDocShell->GetDocument(); @@ -9156,7 +9143,6 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFormatsObj::createEnumera ScCellFormatsEnumeration::ScCellFormatsEnumeration(ScDocShell* pDocSh, const ScRange& rRange) : pDocShell( pDocSh ), nTab( rRange.aStart.Tab() ), - pIter( nullptr ), bAtEnd( false ), bDirty( false ) { diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 0647d54c8d1e..74d79e7d7e04 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -458,7 +458,6 @@ public: Chart2Positioner(ScDocument* pDoc, const vector<ScTokenRef>& rRefTokens) : mrRefTokens(rRefTokens), - mpPositionMap(nullptr), meGlue(GLUETYPE_NA), mnStartCol(0), mnStartRow(0), @@ -2392,12 +2391,8 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, , m_nObjectId( 0 ) , m_pDocument( pDoc) , m_aTokens(std::move(rTokens)) - , m_pRangeIndices(nullptr) - , m_pExtRefListener(nullptr) , m_xDataProvider( xDP) , m_aPropSet(lcl_GetDataSequencePropertyMap()) - , m_pHiddenListener(nullptr) - , m_pValueListener( nullptr ) , m_bGotDataChangedHint(false) , m_bExtDataRebuildQueued(false) , mbTimeBased(false) diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 464e9b3fcf77..7918adcb5cc0 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -390,8 +390,6 @@ ScModelObj::ScModelObj( ScDocShell* pDocSh ) : SfxBaseModel( pDocSh ), aPropSet( lcl_GetDocOptPropertyMap() ), pDocShell( pDocSh ), - pPrintFuncCache( nullptr ), - pPrinterOptions( nullptr ), maChangesListeners( m_aMutex ) { // pDocShell may be NULL if this is the base of a ScDocOptionsObj diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index 86c44fc08b38..64e028070496 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -110,8 +110,6 @@ ScEditEngineDefaulter* ScCellEditSource::GetEditEngine() ScAnnotationEditSource::ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddress& rP) : pDocShell( pDocSh ), aCellPos( rP ), - pEditEngine( nullptr ), - pForwarder( nullptr ), bDataValid( false ) { if (pDocShell) diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index f6d33ce284aa..a1036dfa8dea 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -192,7 +192,6 @@ ScUnoEditEngine::ScUnoEditEngine(ScEditEngineDefaulter* pSource) , eMode(SC_UNO_COLLECT_NONE) , nFieldCount(0) , mnFieldType(text::textfield::Type::UNSPECIFIED) - , pFound(nullptr) , nFieldPar(0) , nFieldPos(0) , nFieldIndex(0) @@ -1066,7 +1065,7 @@ ScEditFieldObj::ScEditFieldObj( pPropSet(nullptr), mpEditSource(std::move(pEditSrc)), aSelection(rSel), - meType(eType), mpData(nullptr), mpContent(rContent), mnNumFormat(0), mbIsDate(false), mbIsFixed(false) + meType(eType), mpContent(rContent), mnNumFormat(0), mbIsDate(false), mbIsFixed(false) { switch (meType) { diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 59de6fc42165..12d15581ed9f 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -166,7 +166,6 @@ static bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, } ScFunctionAccess::ScFunctionAccess() : - pOptions( nullptr ), aPropertyMap( ScDocOptionsHelper::GetPropertyMap() ), mbArray( true ), // default according to behaviour of older Office versions mbValid( true ) diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 726ed85c508e..6f138bd2024e 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -863,9 +863,6 @@ std::unique_ptr<EditTextObject> ScEditEngineTextObj::CreateTextObject() ScCellTextData::ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP) : pDocShell( pDocSh ), aCellPos( rP ), - pEditEngine( nullptr ), - pForwarder( nullptr ), - pOriginalSource( nullptr ), bDataValid( false ), bInUpdate( false ), bDirty( false ), diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index bbe58cda31c9..f6538789b5d6 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -42,7 +42,6 @@ ScDrawView::ScDrawView( pDev( pOut ), pDoc( pData->GetDocument() ), nTab( pData->GetTabNo() ), - pDropMarker( nullptr ), pDropMarkObj( nullptr ), bInConstruct( true ) { diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 5f4b4d2e91d5..6e789537de82 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -48,7 +48,6 @@ ScNoteMarker::ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window* m_bLeft( bLeftEdge ), m_bByKeyboard( bKeyboard ), m_pDrawView ( pDrawViewP ), - m_pModel( nullptr ), m_bVisible( false ) { Size aSizePixel = m_pWindow->GetOutputSizePixel(); diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 3424d90f7c27..0d8b53edea74 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -174,9 +174,6 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, mbUseStyleColor( false ), mbForceAutoColor( SC_MOD()->GetAccessOptions().GetIsAutomaticFontColor() ), mbSyntaxMode( false ), - pValueColor( nullptr ), - pTextColor( nullptr ), - pFormulaColor( nullptr ), aGridColor( COL_BLACK ), mbShowNullValues( true ), mbShowFormulas( false ), diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 116615793c5f..d5c3e6e7f3d8 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -98,8 +98,6 @@ ScPreview::ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* nDisplayStart( 0 ), aDateTime( DateTime::SYSTEM ), nTotalPages( 0 ), - pLocationData( nullptr ), - pDrawView( nullptr ), pDocShell( pDocSh ), pViewShell( pViewSh ), bInGetState( false ), diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 7c58d2134cd3..6f6aea7aeb2d 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -60,9 +60,7 @@ struct ScPreviewLocationEntry ScPreviewTableInfo::ScPreviewTableInfo() : nTab(0), nCols(0), - nRows(0), - pColInfo(nullptr), - pRowInfo(nullptr) + nRows(0) { } diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 764aa050debf..49db8ee8e720 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -198,11 +198,8 @@ bool lcl_HasRowOutline( const ScViewData& rViewData ) ScTabView::ScTabView( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : pFrameWin( pParent ), aViewData( &rDocSh, pViewShell ), - pSelEngine( nullptr ), aFunctionSet( &aViewData ), - pHdrSelEng( nullptr ), aHdrFunc( &aViewData ), - pDrawView( nullptr ), aVScrollTop( VclPtr<ScrollBar>::Create( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ) ), aVScrollBottom( VclPtr<ScrollBar>::Create( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ) ), aHScrollLeft( VclPtr<ScrollBar>::Create( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ) ), @@ -211,9 +208,6 @@ ScTabView::ScTabView( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* aTopButton( VclPtr<ScCornerButton>::Create( pFrameWin, &aViewData, true ) ), aScrollBarBox( VclPtr<ScrollBarBox>::Create( pFrameWin, WB_SIZEABLE ) ), mxInputHintOO(), - pPageBreakData( nullptr ), - pBrushDocument( nullptr ), - pDrawBrushSet( nullptr ), pTimerWindow( nullptr ), aExtraEditViewManager( pViewShell, pGridWin ), nTipVisible( nullptr ), diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index ad67410443d0..f5057c247a65 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1626,26 +1626,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, ScDBFunc( &pViewFrame->GetWindow(), static_cast<ScDocShell&>(*pViewFrame->GetObjectShell()), this ), eCurOST(OST_NONE), nDrawSfxId(0), - pDrawShell(nullptr), - pDrawTextShell(nullptr), - pEditShell(nullptr), - pPivotShell(nullptr), - pAuditingShell(nullptr), - pDrawFormShell(nullptr), - pCellShell(nullptr), - pOleObjectShell(nullptr), - pChartShell(nullptr), - pGraphicShell(nullptr), - pMediaShell(nullptr), - pPageBreakShell(nullptr), - pExtrusionBarShell(nullptr), - pFontworkBarShell(nullptr), - pFormShell(nullptr), - mpInputHandler(nullptr), - pCurFrameLine(nullptr), aTarget(this), - pDialogDPObject(nullptr), - pNavSettings(nullptr), bActiveDrawSh(false), bActiveDrawTextSh(false), bActiveDrawFormSh(false), @@ -1661,7 +1642,6 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, bInPrepareClose(false), bInDispose(false), nCurRefDlgId(0), - pAccessibilityBroadcaster(nullptr), mbInSwitch(false) { const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions(); |