diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-05-26 13:56:20 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-26 14:11:12 +0100 |
commit | d2275c825d2300f3f176105058ac70b762bcc115 (patch) | |
tree | f8d373a15f7ec3d2e37fb33999d059b5592e3b76 /sw/source/filter | |
parent | 8790303b4c220d0c5dcf78a4c438a385ffe3f030 (diff) |
cppcheck: noExplicitConstructor
Change-Id: I955b04396d27e88ce228f180275955071da83ec6
Diffstat (limited to 'sw/source/filter')
38 files changed, 75 insertions, 75 deletions
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 1f5dd09da113..d3bd58c9cf5d 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -198,7 +198,7 @@ class SwHTMLForm_Impl std::vector<sal_uInt16> aSelectedList; public: - SwHTMLForm_Impl( SwDocShell *pDSh ) : + explicit SwHTMLForm_Impl( SwDocShell *pDSh ) : pDocSh( pDSh ), pHeaderAttrs( pDSh ? pDSh->GetHeaderAttributes() : 0 ) { diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx index 5b7d861a8c19..13121c943218 100644 --- a/sw/source/filter/html/htmlnum.hxx +++ b/sw/source/filter/html/htmlnum.hxx @@ -60,7 +60,7 @@ public: memcpy( &aNumStarts, &rInf.aNumStarts, sizeof( aNumStarts ) ); } - SwHTMLNumRuleInfo( const SwTextNode& rTextNd ) { Set( rTextNd ); } + explicit SwHTMLNumRuleInfo( const SwTextNode& rTextNd ) { Set( rTextNd ); } inline SwHTMLNumRuleInfo& operator=( const SwHTMLNumRuleInfo& rInf ); inline void Clear(); diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index d7444f36c85b..659f5f4a8092 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -172,8 +172,8 @@ class HTMLTableCnts public: - HTMLTableCnts( const SwStartNode* pStNd ); - HTMLTableCnts( HTMLTable* pTab ); + explicit HTMLTableCnts( const SwStartNode* pStNd ); + explicit HTMLTableCnts( HTMLTable* pTab ); ~HTMLTableCnts(); // only allowed in ~HTMLTableCell @@ -284,7 +284,7 @@ public: bool bBottomBorder; // Is there a line after the row? - HTMLTableRow( sal_uInt16 nCells=0 ); // cells of the row are empty + explicit HTMLTableRow( sal_uInt16 nCells=0 ); // cells of the row are empty ~HTMLTableRow(); @@ -2991,7 +2991,7 @@ public: HTMLTable *pTable; - _SectionSaveStruct( SwHTMLParser& rParser ); + explicit _SectionSaveStruct( SwHTMLParser& rParser ); virtual ~_SectionSaveStruct(); #if OSL_DEBUG_LEVEL > 0 @@ -4963,7 +4963,7 @@ class _TableSaveStruct : public SwPendingStackData public: HTMLTable *m_pCurrentTable; - _TableSaveStruct( HTMLTable *pCurTable ) : + explicit _TableSaveStruct( HTMLTable *pCurTable ) : m_pCurrentTable( pCurTable ) {} diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 9b1158257ffe..fbd39e2263fa 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -86,7 +86,7 @@ public: SwHTMLWrtTable( const SwTableLines& rLines, long nWidth, sal_uInt32 nBWidth, bool bRel, sal_uInt16 nLeftSub=0, sal_uInt16 nRightSub=0, sal_uInt16 nNumOfRowsToRepeat = 0 ); - SwHTMLWrtTable( const SwHTMLTableLayout *pLayoutInfo ); + explicit SwHTMLWrtTable( const SwHTMLTableLayout *pLayoutInfo ); void Write( SwHTMLWriter& rWrt, sal_Int16 eAlign=text::HoriOrientation::NONE, bool bTHead=false, const SwFrameFormat *pFrameFormat=0, diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx index a8f1363fc028..0642261e0def 100644 --- a/sw/source/filter/html/htmlvsh.hxx +++ b/sw/source/filter/html/htmlvsh.hxx @@ -30,7 +30,7 @@ protected: public: - SwHTMLViewShellClient( SwViewShell *pVSh ); + explicit SwHTMLViewShellClient( SwViewShell *pVSh ); virtual ~SwHTMLViewShellClient(); diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index cc7efaedb844..8c9f9c1453ad 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -253,7 +253,7 @@ public: bRestartListing( false ) {} - _HTMLAttrContext( sal_uInt16 nTokn ) : + explicit _HTMLAttrContext( sal_uInt16 nTokn ) : pSaveDocContext( 0 ), pFrmItemSet( 0 ), nToken( nTokn ), diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 3cc109c49e4e..53955f544bed 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -230,7 +230,7 @@ struct SwHTMLFormatInfo bool bScriptDependent; // Konstruktor fuer einen Dummy zum Suchen - SwHTMLFormatInfo( const SwFormat *pF ) : + explicit SwHTMLFormatInfo( const SwFormat *pF ) : pFormat( pF ), pRefFormat(0), pItemSet( 0 ), @@ -407,7 +407,7 @@ public: bool bParaDotLeaders : 1; // for TOC dot leaders // 25 - SwHTMLWriter( const OUString& rBaseURL ); + explicit SwHTMLWriter( const OUString& rBaseURL ); virtual ~SwHTMLWriter(); void Out_SwDoc( SwPaM* ); // schreibe den makierten Bereich diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 069e6b6ec1d6..8c9dc5d87755 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -184,7 +184,7 @@ namespace sw //I hate these things stupid pImpl things, but its warranted here ParaMapper *mpImpl; public: - ParaStyleMapper(SwDoc &rDoc); + explicit ParaStyleMapper(SwDoc &rDoc); ~ParaStyleMapper(); /** StyleResult @@ -244,7 +244,7 @@ namespace sw //I hate these things stupid pImpl things, but its warranted here CharMapper *mpImpl; public: - CharStyleMapper(SwDoc &rDoc); + explicit CharStyleMapper(SwDoc &rDoc); ~CharStyleMapper(); /** StyleResult @@ -290,13 +290,13 @@ namespace sw public: OUString msPrimary; OUString msSecondary; - FontMapExport(const OUString &rFontDescription); + explicit FontMapExport(const OUString &rFontDescription); }; class InsertedTableClient : public SwClient { public: - InsertedTableClient(SwTableNode & rNode); + explicit InsertedTableClient(SwTableNode & rNode); SwTableNode * GetTableNode(); }; @@ -326,7 +326,7 @@ namespace sw typedef TableMap::iterator TableMapIter; void DelAndMakeTableFrms(); void InsertTable(SwTableNode &rTableNode, SwPaM &rPaM); - InsertedTablesManager(const SwDoc &rDoc); + explicit InsertedTablesManager(const SwDoc &rDoc); private: bool mbHasRoot; TableMap maTables; diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index 8a3013a3738d..38e55b579eae 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -68,7 +68,7 @@ class WW8TableNodeInfoInner public: typedef boost::shared_ptr<WW8TableNodeInfoInner> Pointer_t; - WW8TableNodeInfoInner(WW8TableNodeInfo * pParent); + explicit WW8TableNodeInfoInner(WW8TableNodeInfo * pParent); ~WW8TableNodeInfoInner(); void setDepth(sal_uInt32 nDepth); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 430025a42bbd..360b087c271e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -158,7 +158,7 @@ class FFDataWriterHelper m_pSerializer->endElementNS( XML_w, XML_ffData ); } public: - FFDataWriterHelper( const ::sax_fastparser::FSHelperPtr& rSerializer ) : m_pSerializer( rSerializer ){} + explicit FFDataWriterHelper( const ::sax_fastparser::FSHelperPtr& rSerializer ) : m_pSerializer( rSerializer ){} void WriteFormCheckbox( const OUString& rName, const OUString& rDefault, bool bChecked ) { writeCommonStart( rName ); @@ -198,7 +198,7 @@ class FieldMarkParamsHelper { const sw::mark::IFieldmark& mrFieldmark; public: - FieldMarkParamsHelper( const sw::mark::IFieldmark& rFieldmark ) : mrFieldmark( rFieldmark ) {} + explicit FieldMarkParamsHelper( const sw::mark::IFieldmark& rFieldmark ) : mrFieldmark( rFieldmark ) {} OUString getName() { return mrFieldmark.GetName(); } template < typename T > bool extractParam( const OUString& rKey, T& rResult ) diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx index 64f190ebf256..b688f5c33718 100644 --- a/sw/source/filter/ww8/docxexportfilter.hxx +++ b/sw/source/filter/ww8/docxexportfilter.hxx @@ -30,7 +30,7 @@ class DocxExportFilter : public oox::core::XmlFilterBase { public: - DocxExportFilter( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + explicit DocxExportFilter( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); // FIXME these should not even exist for the export-only filter! // For now, let's just do empty implementations of those. diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index d58b2caeb70a..50be429fb349 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -600,7 +600,7 @@ private: OUString m_sURL; public: - RtfAttributeOutput(RtfExport& rExport); + explicit RtfAttributeOutput(RtfExport& rExport); virtual ~RtfAttributeOutput(); diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx index 7c31d34e07e7..e41e86ff91f5 100644 --- a/sw/source/filter/ww8/rtfexportfilter.hxx +++ b/sw/source/filter/ww8/rtfexportfilter.hxx @@ -44,7 +44,7 @@ protected: css::uno::Reference<css::uno::XComponentContext> m_xCtx; css::uno::Reference<css::lang::XComponent> m_xSrcDoc; public: - RtfExportFilter(const css::uno::Reference<css::uno::XComponentContext>& xCtx); + explicit RtfExportFilter(const css::uno::Reference<css::uno::XComponentContext>& xCtx); virtual ~RtfExportFilter(); // XFilter diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx index 0f12cb0c9259..139bc9cd0b42 100644 --- a/sw/source/filter/ww8/rtfsdrexport.hxx +++ b/sw/source/filter/ww8/rtfsdrexport.hxx @@ -58,7 +58,7 @@ class RtfSdrExport : public EscherEx std::set<const SwFrameFormat*> m_aTextBoxes; public: - RtfSdrExport(RtfExport& rExport); + explicit RtfSdrExport(RtfExport& rExport); virtual ~RtfSdrExport(); /// Export the sdr object as Sdr. diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 9a0846612ba0..f6b0b08af8e2 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -149,7 +149,7 @@ namespace private: sal_uLong mnNode; public: - anchoredto(sal_uLong nNode) : mnNode(nNode) {} + explicit anchoredto(sal_uLong nNode) : mnNode(nNode) {} bool operator()(const sw::Frame &rFrame) const { return (mnNode == rFrame.GetPosition().nNode.GetNode().GetIndex()); @@ -702,7 +702,7 @@ namespace sw private: RedlineType_t meType; public: - SameOpenRedlineType(RedlineType_t eType) : meType(eType) {} + explicit SameOpenRedlineType(RedlineType_t eType) : meType(eType) {} bool operator()(const SwFltStackEntry *pEntry) const { const SwFltRedline *pTest = static_cast<const SwFltRedline *> diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index dbd033e42ab5..cdefebc386cb 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -786,7 +786,7 @@ namespace sw The Writer document whose drawing layers we will be inserting objects into */ - SetLayer(const SwDoc &rDoc); + explicit SetLayer(const SwDoc &rDoc); SetLayer(const SetLayer &rOther) throw(); SetLayer& operator=(const SetLayer &rOther) throw(); diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 0fa3905c3174..c82f6f958d67 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -244,7 +244,7 @@ namespace myImplHelpers C* MakeNonCollidingStyle(const OUString& rName); public: typedef std::pair<C*, bool> StyleResult; - StyleMapperImpl(SwDoc &rDoc) : maHelper(rDoc) {} + explicit StyleMapperImpl(SwDoc &rDoc) : maHelper(rDoc) {} StyleResult GetStyle(const OUString& rName, ww::sti eSti); }; @@ -327,7 +327,7 @@ namespace myImplHelpers private: sal_Int32 mnStart; public: - IfBeforeStart(sal_Int32 nStart) : mnStart(nStart) {} + explicit IfBeforeStart(sal_Int32 nStart) : mnStart(nStart) {} bool operator()(const sw::util::CharRunEntry &rEntry) const { return rEntry.mnEndPos < mnStart; diff --git a/sw/source/filter/ww8/writerwordglue.hxx b/sw/source/filter/ww8/writerwordglue.hxx index 8d4debcb1727..4e09a0a2bfc2 100644 --- a/sw/source/filter/ww8/writerwordglue.hxx +++ b/sw/source/filter/ww8/writerwordglue.hxx @@ -128,7 +128,7 @@ namespace sw sal_uInt16 dyaHdrBottom; sal_uInt16 dyaTop; sal_uInt16 dyaBottom; - HdFtDistanceGlue(const SfxItemSet &rPage); + explicit HdFtDistanceGlue(const SfxItemSet &rPage); bool HasHeader() const { return mbHasHeader; } bool HasFooter() const { return mbHasFooter; } diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index b2b601d7e733..7464d10f29be 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -333,7 +333,7 @@ namespace const WW8Export& wrt; public: - CompareDrawObjs(const WW8Export& rWrt) : wrt(rWrt) {}; + explicit CompareDrawObjs(const WW8Export& rWrt) : wrt(rWrt) {}; bool operator()(DrawObj *a, DrawObj *b) const { sal_uLong aSort = lcl_getSdrOrderNumber(wrt, a); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index cee294a2b4dd..237a9a9681b8 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -107,7 +107,7 @@ private: sal_uLong nOfs; public: - WW8_WrPlc0( sal_uLong nOffset ); + explicit WW8_WrPlc0( sal_uLong nOffset ); sal_uInt16 Count() const { return aPos.size(); } void Append( sal_uLong nStartCpOrFc ); void Write( SvStream& rStrm ); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 2b7cdff248a6..31b123229032 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -198,7 +198,7 @@ protected: MSWordSections( const MSWordSections& ); MSWordSections& operator=( const MSWordSections& ); public: - MSWordSections( MSWordExportBase& rExport ); + explicit MSWordSections( MSWordExportBase& rExport ); virtual ~MSWordSections(); virtual bool HeaderFooterWritten(); @@ -245,7 +245,7 @@ class WW8_WrPlcSepx : public MSWordSections WW8_WrPlcSepx& operator=( const WW8_WrPlcSepx& ) SAL_DELETED_FUNCTION; public: - WW8_WrPlcSepx( MSWordExportBase& rExport ); + explicit WW8_WrPlcSepx( MSWordExportBase& rExport ); virtual ~WW8_WrPlcSepx(); virtual bool HeaderFooterWritten() SAL_OVERRIDE; // override @@ -1217,7 +1217,7 @@ private: WW8_WrPlcFootnoteEdn(const WW8_WrPlcFootnoteEdn&) SAL_DELETED_FUNCTION; WW8_WrPlcFootnoteEdn& operator=(WW8_WrPlcFootnoteEdn &) SAL_DELETED_FUNCTION; public: - WW8_WrPlcFootnoteEdn( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {} + explicit WW8_WrPlcFootnoteEdn( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {} bool WriteText( WW8Export& rWrt ); void WritePlc( WW8Export& rWrt ) const; @@ -1234,7 +1234,7 @@ struct WW8_Annotation DateTime maDateTime; WW8_CP m_nRangeStart, m_nRangeEnd; WW8_Annotation(const SwPostItField* pPostIt, WW8_CP nRangeStart, WW8_CP nRangeEnd); - WW8_Annotation(const SwRedlineData* pRedline); + explicit WW8_Annotation(const SwRedlineData* pRedline); }; class WW8_WrPlcAnnotations : public WW8_WrPlcSubDoc // double Plc for Postits @@ -1267,7 +1267,7 @@ private: WW8_WrPlcTextBoxes(const WW8_WrPlcTextBoxes&) SAL_DELETED_FUNCTION; WW8_WrPlcTextBoxes& operator=(WW8_WrPlcTextBoxes&) SAL_DELETED_FUNCTION; public: - WW8_WrPlcTextBoxes( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {} + explicit WW8_WrPlcTextBoxes( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {} bool WriteText( WW8Export& rWrt ); void WritePlc( WW8Export& rWrt ) const; @@ -1320,7 +1320,7 @@ protected: void Write( SvStream& rStrm ); WW8_CP Prev() const; public: - WW8_WrPlc1( sal_uInt16 nStructSz ); + explicit WW8_WrPlc1( sal_uInt16 nStructSz ); ~WW8_WrPlc1(); void Append( WW8_CP nCp, const void* pData ); void Finish( sal_uLong nLastCp, sal_uLong nStartCp ); @@ -1401,7 +1401,7 @@ private: SwWW8WrGrf(const SwWW8WrGrf&) SAL_DELETED_FUNCTION; SwWW8WrGrf& operator=(const SwWW8WrGrf&) SAL_DELETED_FUNCTION; public: - SwWW8WrGrf( WW8Export& rW ) : rWrt( rW ), mnIdx( 0 ) {} + explicit SwWW8WrGrf( WW8Export& rW ) : rWrt( rW ), mnIdx( 0 ) {} void Insert(const sw::Frame &rFly); void Write(); sal_uLong GetFPos() @@ -1420,7 +1420,7 @@ private: protected: MSWordExportBase& m_rExport; public: - MSWordAttrIter( MSWordExportBase& rExport ); + explicit MSWordAttrIter( MSWordExportBase& rExport ); virtual ~MSWordAttrIter(); virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const = 0; diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 903e6da50c47..ca280b980363 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -457,7 +457,7 @@ protected: bool mbOnTOXEnding; public: - WW8AttributeOutput( WW8Export &rWW8Export ) + explicit WW8AttributeOutput( WW8Export &rWW8Export ) : AttributeOutputBase() , m_rWW8Export(rWW8Export) , nPOPosStdLen1(0) diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index e06a210663b2..6df5b319d95c 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -299,7 +299,7 @@ struct WW8PicDesc sal_Int16 nCL, nCR, nCT, nCB; long nWidth, nHeight; - WW8PicDesc( const WW8_PIC& rPic ); + explicit WW8PicDesc( const WW8_PIC& rPic ); }; WW8PicDesc::WW8PicDesc( const WW8_PIC& rPic ) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index b4121b0897b3..318e5afe16c0 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -389,7 +389,7 @@ class BasicProjImportHelper SwDocShell& mrDocShell; uno::Reference< uno::XComponentContext > mxCtx; public: - BasicProjImportHelper( SwDocShell& rShell ) : mrDocShell( rShell ) + explicit BasicProjImportHelper( SwDocShell& rShell ) : mrDocShell( rShell ) { mxCtx = comphelper::getProcessComponentContext(); } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index cb27db4fca43..78be5eb3056d 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -438,7 +438,7 @@ public: SwNodeIndex maPtNode; sal_Int32 mnMkContent; sal_Int32 mnPtContent; - Position(const SwPaM &rPaM); + explicit Position(const SwPaM &rPaM); Position(const Position &rEntry); private: Position& operator=(const Position&) SAL_DELETED_FUNCTION; @@ -545,7 +545,7 @@ namespace sw SwNodeIndex maPtNode; sal_Int32 mnPtContent; public: - Position(const SwPosition &rPos); + explicit Position(const SwPosition &rPos); Position(const Position &rPos); operator SwPosition() const; SwNodeIndex GetPtNode() { return maPtNode; }; @@ -692,7 +692,7 @@ private: WW8FormulaCheckBox& operator=(const WW8FormulaCheckBox&) SAL_DELETED_FUNCTION; public: - WW8FormulaCheckBox(SwWW8ImplReader &rR); + explicit WW8FormulaCheckBox(SwWW8ImplReader &rR); virtual bool Import(const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory> &rServiceFactory, @@ -708,7 +708,7 @@ private: WW8FormulaListBox& operator=(const WW8FormulaListBox&) SAL_DELETED_FUNCTION; public: - WW8FormulaListBox(SwWW8ImplReader &rR); + explicit WW8FormulaListBox(SwWW8ImplReader &rR); virtual bool Import(const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory> &rServiceFactory, @@ -723,7 +723,7 @@ private: WW8FormulaEditBox(const WW8FormulaEditBox&) SAL_DELETED_FUNCTION; WW8FormulaEditBox& operator=(const WW8FormulaEditBox&) SAL_DELETED_FUNCTION; public: - WW8FormulaEditBox(SwWW8ImplReader &rR); + explicit WW8FormulaEditBox(SwWW8ImplReader &rR); //no real implementation, return false virtual bool Import(const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory> & /* rServiceFactory */, @@ -788,7 +788,7 @@ protected: class wwSection { public: - wwSection(const SwPosition &rPos); + explicit wwSection(const SwPosition &rPos); SEPr maSep; WW8_BRCVer9 brc[4]; SwNodeIndex maStart; @@ -887,8 +887,8 @@ private: wwSectionManager(const wwSectionManager&) SAL_DELETED_FUNCTION; wwSectionManager& operator=(const wwSectionManager&) SAL_DELETED_FUNCTION; public: - wwSectionManager(SwWW8ImplReader &rReader) : mrReader(rReader), mnDesc(0) - {}; + explicit wwSectionManager(SwWW8ImplReader &rReader) : mrReader(rReader), mnDesc(0) + {} void SetCurrentSectionHasFootnote(); bool CurrentSectionIsVertical() const; bool CurrentSectionIsProtected() const; @@ -927,7 +927,7 @@ private: std::vector<SwTextNode*> m_aTextNodes; SwDoc& m_rDoc; public: - wwExtraneousParas(SwDoc &rDoc) : m_rDoc(rDoc) {} + explicit wwExtraneousParas(SwDoc &rDoc) : m_rDoc(rDoc) {} ~wwExtraneousParas() { delete_all_from_doc(); } void push_back(SwTextNode *pTextNode) { m_aTextNodes.push_back(pTextNode); } void delete_all_from_doc(); diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index c87815cccbdd..f1ad71a739a7 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -435,7 +435,7 @@ struct WW8LFOInfo // unsortiert, d.h. Reihenfolge genau wie im WW8 Stream // oder beim Reader-Ende geloescht werden sollte bool bLSTbUIDSet :1;// Flag, ob bUsedInDoc in maLSTInfos gesetzt wurde, // und nicht nochmals gesetzt zu werden braucht - WW8LFOInfo(const WW8LFO& rLFO); + explicit WW8LFOInfo(const WW8LFO& rLFO); }; WW8LFOInfo::WW8LFOInfo(const WW8LFO& rLFO) diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 0446bfc69aea..4cdeafc4a371 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2823,7 +2823,7 @@ class SamePos : private: long mnPo; public: - SamePos(long nPo) : mnPo(nPo) {} + explicit SamePos(long nPo) : mnPo(nPo) {} bool operator()(const WW8PLCFx_Fc_FKP::WW8Fkp *pFkp) {return mnPo == pFkp->GetFilePos();} }; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 678482f85e9c..28cbc4761a37 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -112,7 +112,7 @@ private: public: //7- ids are very different to 8+ ones - wwSprmParser(ww::WordVersion eVersion); + explicit wwSprmParser(ww::WordVersion eVersion); /// Return the SPRM id at the beginning of this byte sequence sal_uInt16 GetSprmId(const sal_uInt8* pSp) const; diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index 3f125d3b1030..f108ee6b6178 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -110,7 +110,7 @@ protected: sal_uInt8 ch; public: - Tcg255SubStruct( bool bReadId ); + explicit Tcg255SubStruct( bool bReadId ); virtual ~Tcg255SubStruct(){} sal_uInt8 id() const { return ch; } bool Read(SvStream &rS) SAL_OVERRIDE; @@ -132,7 +132,7 @@ class Customization : public TBBase bool ImportMenu( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); public: - Customization( SwCTBWrapper* rapper ); + explicit Customization( SwCTBWrapper* rapper ); virtual ~Customization(); bool Read(SvStream &rS) SAL_OVERRIDE; bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& ); @@ -166,7 +166,7 @@ class SwCTBWrapper : public Tcg255SubStruct SwCTBWrapper& operator = ( const SwCTBWrapper&) SAL_DELETED_FUNCTION; public: - SwCTBWrapper( bool bReadId = true ); + explicit SwCTBWrapper( bool bReadId = true ); virtual ~SwCTBWrapper(); void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); } SwTBC* GetTBCAtOffset( sal_uInt32 nStreamOffset ); @@ -210,7 +210,7 @@ class PlfMcd : public Tcg255SubStruct PlfMcd& operator = ( const PlfMcd&) SAL_DELETED_FUNCTION; public: - PlfMcd( bool bReadId = true ); + explicit PlfMcd( bool bReadId = true ); bool Read(SvStream &rS) SAL_OVERRIDE; #if OSL_DEBUG_LEVEL > 1 virtual void Print( FILE* ) SAL_OVERRIDE; @@ -241,7 +241,7 @@ class PlfAcd: public Tcg255SubStruct PlfAcd& operator = ( const PlfAcd&) SAL_DELETED_FUNCTION; public: - PlfAcd( bool bReadId = true ); + explicit PlfAcd( bool bReadId = true ); virtual ~PlfAcd(); bool Read(SvStream &rS) SAL_OVERRIDE; #if OSL_DEBUG_LEVEL > 1 @@ -278,7 +278,7 @@ class PlfKme : public Tcg255SubStruct PlfKme& operator = ( const PlfKme&) SAL_DELETED_FUNCTION; public: - PlfKme( bool bReadId = true ); + explicit PlfKme( bool bReadId = true ); virtual ~PlfKme(); bool Read(SvStream &rS) SAL_OVERRIDE; #if OSL_DEBUG_LEVEL > 1 @@ -319,7 +319,7 @@ class TcgSttbf : public Tcg255SubStruct TcgSttbf& operator = ( const TcgSttbf&) SAL_DELETED_FUNCTION; public: - TcgSttbf( bool bReadId = true ); + explicit TcgSttbf( bool bReadId = true ); virtual ~TcgSttbf(){} bool Read(SvStream &rS) SAL_OVERRIDE; #if OSL_DEBUG_LEVEL > 1 @@ -369,7 +369,7 @@ class MacroNames : public Tcg255SubStruct MacroNames& operator = ( const MacroNames&) SAL_DELETED_FUNCTION; public: - MacroNames( bool bReadId = true ); + explicit MacroNames( bool bReadId = true ); virtual ~MacroNames(); bool Read(SvStream &rS) SAL_OVERRIDE; #if OSL_DEBUG_LEVEL > 1 diff --git a/sw/source/filter/xml/xmlbrshe.hxx b/sw/source/filter/xml/xmlbrshe.hxx index ab960ca8f9cb..c6c22a1419f5 100644 --- a/sw/source/filter/xml/xmlbrshe.hxx +++ b/sw/source/filter/xml/xmlbrshe.hxx @@ -35,7 +35,7 @@ protected: SwXMLExport& GetExport() { return rExport; } public: - SwXMLBrushItemExport( SwXMLExport& rExport ); + explicit SwXMLBrushItemExport( SwXMLExport& rExport ); ~SwXMLBrushItemExport(); // core API diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index 16205d5c2dd3..4ae4612d1dc1 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -66,7 +66,7 @@ protected: SvXmlExportFlags nFlags ); public: - SvXMLExportItemMapper( SvXMLItemMapEntriesRef rMapEntries ); + explicit SvXMLExportItemMapper( SvXMLItemMapEntriesRef rMapEntries ); virtual ~SvXMLExportItemMapper(); void exportXML( SvXMLExport& rExport, diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index f9281cf8117b..e44179e448d7 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -71,7 +71,7 @@ class SwXMLConditionParser_Impl public: - SwXMLConditionParser_Impl( const OUString& rInp ); + explicit SwXMLConditionParser_Impl( const OUString& rInp ); bool IsValid() const { return 0 != nCondition; } diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index b966c22a4d2a..e9f72cfe9cac 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -265,7 +265,7 @@ protected: ) const SAL_OVERRIDE; public: - SwXMLAutoStylePoolP( SvXMLExport& rExport ); + explicit SwXMLAutoStylePoolP( SvXMLExport& rExport ); virtual ~SwXMLAutoStylePoolP(); }; diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index a9d264554f8d..3d875551087f 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -932,7 +932,7 @@ class SvTextShapeImportHelper : public XMLTextShapeImportHelper Reference<drawing::XDrawPage> xPage; public: - SvTextShapeImportHelper(SvXMLImport& rImp); + explicit SvTextShapeImportHelper(SvXMLImport& rImp); virtual ~SvTextShapeImportHelper(); }; diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 7774d194de86..abf17cf56265 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -228,7 +228,7 @@ struct BoxHolder : private boost::noncopyable SvxBorderLine* pLeft; SvxBorderLine* pRight; - BoxHolder(SvxBoxItem* pBox) + explicit BoxHolder(SvxBoxItem* pBox) { pTop = pBox->GetTop() == NULL ? NULL : new SvxBorderLine( *pBox->GetTop() ); diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index fe6d09dffbb1..ec7f0351f054 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -62,7 +62,7 @@ class SwXMLImportTableItemMapper_Impl: public SvXMLImportItemMapper public: - SwXMLImportTableItemMapper_Impl( SvXMLItemMapEntriesRef rMapEntries ); + explicit SwXMLImportTableItemMapper_Impl(SvXMLItemMapEntriesRef rMapEntries); virtual ~SwXMLImportTableItemMapper_Impl(); virtual bool handleSpecialItem( const SvXMLItemMapEntry& rEntry, diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx index 3a3ab7614733..080af7076184 100644 --- a/sw/source/filter/xml/xmlitmap.hxx +++ b/sw/source/filter/xml/xmlitmap.hxx @@ -61,7 +61,7 @@ protected: SvXMLItemMapEntries_impl* mpImpl; public: - SvXMLItemMapEntries( SvXMLItemMapEntry* pEntrys ); + explicit SvXMLItemMapEntries(SvXMLItemMapEntry* pEntrys); virtual ~SvXMLItemMapEntries(); SvXMLItemMapEntry* getByName( sal_uInt16 nNameSpace, diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index d9dd57abe32d..bae4b6c27155 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -69,9 +69,9 @@ class SwXMLTableColumn_Impl : public SwWriteTableCol public: - SwXMLTableColumn_Impl( sal_uInt32 nPosition ) : - SwWriteTableCol( nPosition ), - nRelWidth( 0UL ) + explicit SwXMLTableColumn_Impl(sal_uInt32 nPosition) + : SwWriteTableCol(nPosition) + , nRelWidth(0UL) {}; void SetStyleName( const OUString& rName ) { sStyleName = rName; } @@ -107,7 +107,7 @@ class SwXMLTableLines_Impl public: - SwXMLTableLines_Impl( const SwTableLines& rLines ); + explicit SwXMLTableLines_Impl( const SwTableLines& rLines ); ~SwXMLTableLines_Impl() {} |