diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-08 14:52:40 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-08 19:28:19 +0200 |
commit | 8dc6c96a8036f80c3ba016ea347ce2f83daa9726 (patch) | |
tree | 0e53fb33114b21b5f1942fee3b727efea79bb65d /filter | |
parent | 9212fadc4d421148e1a3f8b668d82a93f65cc2c3 (diff) |
loplugin:simplifyconstruct in filter..framework
Change-Id: Ida4307a92dfb1dbd14da5a30b6ee1f0fd6a9455e
Reviewed-on: https://gerrit.libreoffice.org/60194
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/flash/swfexporter.cxx | 1 | ||||
-rw-r--r-- | filter/source/flash/swfwriter.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/egif/giflzwc.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/eps/eps.cxx | 1 | ||||
-rw-r--r-- | filter/source/graphicfilter/etiff/etiff.cxx | 1 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/bundles.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/cgm.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/idxf/dxfentrd.cxx | 3 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipsd/ipsd.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/itga/itga.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/itiff/ccidecom.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 1 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 9 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 8 | ||||
-rw-r--r-- | filter/source/msfilter/viscache.hxx | 1 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 4 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertestdialog.cxx | 1 |
17 files changed, 3 insertions, 43 deletions
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 643871e90608..344ea5214849 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -79,7 +79,6 @@ FlashExporter::FlashExporter( , mxSelectedDrawPage(rxSelectedDrawPage) , mbExportSelection(false) - , mpWriter(nullptr) , mnDocWidth(0) , mnDocHeight(0) , mnJPEGcompressMode(nJPEGCompressMode) diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index 04b47a640e25..e2478ffd6b96 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -44,8 +44,6 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int mnDocXScale( static_cast<double>(nTWIPWidthOutput) / mnDocWidth ), mnDocYScale( static_cast<double>(nTWIPHeightOutput) / mnDocHeight ), mpClipPolyPolygon( nullptr ), - mpTag( nullptr ), - mpSprite( nullptr ), mnNextId( 1 ), mnFrames( 0 ), mnGlobalTransparency(0), diff --git a/filter/source/graphicfilter/egif/giflzwc.cxx b/filter/source/graphicfilter/egif/giflzwc.cxx index 5a4601d38c9e..8b1950e526a2 100644 --- a/filter/source/graphicfilter/egif/giflzwc.cxx +++ b/filter/source/graphicfilter/egif/giflzwc.cxx @@ -111,7 +111,7 @@ struct GIFLZWCTreeNode GIFLZWCompressor::GIFLZWCompressor() - : pIDOS(nullptr), pTable(nullptr), pPrefix(nullptr), nDataSize(0), nClearCode(0), + : pPrefix(nullptr), nDataSize(0), nClearCode(0), nEOICode(0), nTableSize(0), nCodeSize(0) { } diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 09815fd2d043..f3ef15a9d06c 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -265,7 +265,6 @@ PSWriter::PSWriter() , maFont() , maLastFont() , nNextChrSetId(0) - , pTable(nullptr) , pPrefix(nullptr) , nDataSize(0) , nClearCode(0) diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 17b99eefd52b..dc3349f82791 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -130,7 +130,6 @@ TIFFWriter::TIFFWriter(SvStream &rStream) , mnPalPos(0) , mnBitmapPos(0) , mnStripByteCountPos(0) - , pTable(nullptr) , pPrefix(nullptr) , nDataSize(0) , nClearCode(0) diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx index c083229216fa..8cce817c3800 100644 --- a/filter/source/graphicfilter/icgm/bundles.cxx +++ b/filter/source/graphicfilter/icgm/bundles.cxx @@ -29,9 +29,7 @@ void Bundle::SetColor( sal_uInt32 nColor ) } FontEntry::FontEntry() : - pFontName ( nullptr ), eCharSetType ( CST_CCOMPLETE ), - pCharSetValue ( nullptr ), nFontType ( 0 ) { } diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 600946a2c1a7..eef992866844 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -53,8 +53,6 @@ CGM::CGM(uno::Reference< frame::XModel > const & rModel) , mbFirstOutPut(false) , mbInDefaultReplacement(false) , mnAct4PostReset(0) - , mpBitmapInUse(nullptr) - , mpChart(nullptr) , mpOutAct(new CGMImpressOutAct(*this, rModel)) , mpSource(nullptr) , mpEndValidSource(nullptr) diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx b/filter/source/graphicfilter/idxf/dxfentrd.cxx index bcb698994831..a2949dd6578a 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.cxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx @@ -655,8 +655,7 @@ DXFHatchEntity::DXFHatchEntity() : nHatchDoubleFlag( 0 ), nHatchPatternDefinitionLines( 0 ), fPixelSize( 1.0 ), - nNumberOfSeedPoints( 0 ), - pBoundaryPathData( nullptr ) + nNumberOfSeedPoints( 0 ) { } diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 527604e5b173..7ffe0e4a765a 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -85,14 +85,12 @@ public: PSDReader::PSDReader(SvStream &rStream) : m_rPSD(rStream) - , mpFileHeader(nullptr) , mnXResFixed(0) , mnYResFixed(0) , mbStatus(true) , mbTransparent(false) , mnDestBitDepth(0) , mbCompression(false) - , mpPalette(nullptr) { } diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 000237069556..a1e46681c7a3 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -113,10 +113,6 @@ public: TGAReader::TGAReader(SvStream &rTGA) : m_rTGA(rTGA) - , mpFileHeader(nullptr) - , mpFileFooter(nullptr) - , mpExtension(nullptr) - , mpColorMap(nullptr) , mbStatus(true) , mnTGAVersion(1) , mnDestBitDepth(8) diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx index 00d39b866e18..d648ce00ad9d 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.cxx +++ b/filter/source/graphicfilter/itiff/ccidecom.cxx @@ -567,7 +567,6 @@ const CCIHuffmanTableEntry CCIUncompTableSave[CCIUncompTableSize]={ CCIDecompressor::CCIDecompressor( sal_uLong nOpts, sal_uInt32 nImageWidth ) : bTableBad ( false ), bStatus ( false ), - pByteSwap ( nullptr ), pIStream ( nullptr ), nEOLCount ( 0 ), nWidth ( nImageWidth ), @@ -575,7 +574,6 @@ CCIDecompressor::CCIDecompressor( sal_uLong nOpts, sal_uInt32 nImageWidth ) : bFirstEOL ( false ), nInputBitsBuf( 0 ), nInputBitsBufSize( 0 ), - pLastLine ( nullptr ), nLastLineSize( 0 ) { if ( nOpts & CCI_OPTION_INVERSEBITORDER ) diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index a994c47543cc..a28d7357bf68 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -72,7 +72,6 @@ ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx ) , mpHostAppData(nullptr) , mbIsTitlePossible(false) , mpSdrPage( nullptr ) - , mpSolverContainer( nullptr ) { } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 0938905edb52..4b650c272c70 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -216,7 +216,6 @@ void Impl_OlePres::Write( SvStream & rStm ) DffPropertyReader::DffPropertyReader( const SvxMSDffManager& rMan ) : rManager(rMan) - , pDefaultPropSet(nullptr) , mnFix16Angle(0) , mbRotateGranientFillWithAngle(false) { @@ -2893,8 +2892,7 @@ void DffPropertyReader::ImportGradientColor( SfxItemSet& aSet,MSO_FillType eMSO_ DffRecordList::DffRecordList( DffRecordList* pList ) : nCount ( 0 ), nCurrent ( 0 ), - pPrev ( pList ), - pNext ( nullptr ) + pPrev ( pList ) { if ( pList ) pList->pNext.reset( this ); @@ -5696,7 +5694,6 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_, pStData2( pStData2_ ), nSvxMSDffSettings( 0 ), nSvxMSDffOLEConvFlags( 0 ), - pSecPropSet( nullptr ), mnDefaultColor( mnDefaultColor_), mbSkipImages (bSkipImages) { @@ -5739,7 +5736,6 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const OUString& rBaseURL ) pStData2( nullptr ), nSvxMSDffSettings( 0 ), nSvxMSDffOLEConvFlags( 0 ), - pSecPropSet( nullptr ), mnDefaultColor( COL_DEFAULT ), mbSkipImages(false) { @@ -7405,10 +7401,7 @@ bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Reference< SvxMSDffImportRec::SvxMSDffImportRec() : pObj( nullptr ), - pWrapPolygon(nullptr), - pClientAnchorBuffer( nullptr ), nClientAnchorLen( 0 ), - pClientDataBuffer( nullptr ), nClientDataLen( 0 ), nXAlign( 0 ), // position n cm from left nYAlign( 0 ), // position n cm below diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index dee401a652da..6d891d6ad06c 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -504,7 +504,6 @@ PptSlidePersistEntry::PptSlidePersistEntry() : nSlidePersistEndOffset ( 0 ), nBackgroundOffset ( 0 ), nDrawingDgId ( 0xffffffff ), - pPresentationObjects ( nullptr ), pBObj ( nullptr ), ePageKind ( PPT_MASTERPAGE ), bNotesMaster ( false ), @@ -520,7 +519,6 @@ PptSlidePersistEntry::~PptSlidePersistEntry() SdrEscherImport::SdrEscherImport( PowerPointImportParam& rParam, const OUString& rBaseURL ) : SvxMSDffManager ( rParam.rDocStream, rBaseURL ), - m_pFonts ( nullptr ), nStreamLen ( 0 ), rImportParam ( rParam ) { @@ -1319,12 +1317,8 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const OUString& rBaseURL ) : SdrEscherImport ( rParam, rBaseURL ), bOk ( rStCtrl.GetErrorCode() == ERRCODE_NONE ), - pPersistPtr ( nullptr ), nPersistPtrCnt ( 0 ), pDefaultSheet ( nullptr ), - m_pMasterPages ( nullptr ), - m_pSlidePages ( nullptr ), - m_pNotePages ( nullptr ), nCurrentPageNum ( 0 ), nDocStreamPos ( 0 ), nPageColorsNum ( 0xFFFF ), @@ -4449,7 +4443,6 @@ PPTParaPropSet& PPTParaPropSet::operator=( const PPTParaPropSet& rParaPropSet ) PPTCharPropSet::PPTCharPropSet(sal_uInt32 nParagraph) : mnOriginalTextPos(0) , mnParagraph(nParagraph) - , mpFieldItem(nullptr) , mpImplPPTCharPropSet() { mnHylinkOrigColor = 0; @@ -4529,7 +4522,6 @@ void PPTCharPropSet::SetColor( sal_uInt32 nColor ) PPTRuler::PPTRuler() : nFlags(0) , nDefaultTab(0x240) - , pTab(nullptr) , nTabCount(0) { memset(nTextOfs, 0, sizeof(nTextOfs)); diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx index 24efe43bf42e..e33536c7be61 100644 --- a/filter/source/msfilter/viscache.hxx +++ b/filter/source/msfilter/viscache.hxx @@ -39,7 +39,6 @@ public: explicit Impl_OlePres() : nFormat( SotClipboardFormatId::GDIMETAFILE ) , nAspect( ASPECT_CONTENT ) - , pMtf( nullptr ) , nAdvFlags( 0x2 ) // found in document {} void SetMtf( const GDIMetaFile & rMtf ) diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 5ab6193637e1..a1cff2e99346 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -130,7 +130,6 @@ SVGAttributeWriter::SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFont : mrExport( rExport ) , mrFontExport( rFontExport ) , mrCurrentState( rCurState ) - , mpElemFont( nullptr ) { } @@ -455,9 +454,6 @@ SVGTextWriter::SVGTextWriter( SVGExport& rExport, SVGAttributeWriter& rAttribut mrCurrentTextPortion(), mpTextEmbeddedBitmapMtf( nullptr ), mpTargetMapMode( nullptr ), - mpTextShapeElem( nullptr ), - mpTextParagraphElem( nullptr ), - mpTextPositionElem( nullptr ), mnLeftTextPortionLength( 0 ), maTextPos(0,0), mnTextWidth(0), diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index c4c08e86f64b..c245ad4c0c31 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -134,7 +134,6 @@ XMLFilterTestDialog::XMLFilterTestDialog(weld::Window* pParent, const Reference<XComponentContext>& rxContext) : GenericDialogController(pParent, "filter/ui/testxmlfilter.ui", "TestXMLFilterDialog") , mxContext(rxContext) - , m_xFilterInfo(nullptr) , m_xExport(m_xBuilder->weld_widget("export")) , m_xFTExportXSLTFile(m_xBuilder->weld_label("exportxsltfile")) , m_xPBExportBrowse(m_xBuilder->weld_button("exportbrowse")) |