diff options
113 files changed, 185 insertions, 179 deletions
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 10fdea5d6356..8f805e537162 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -99,7 +99,7 @@ class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper< document::XCodeName SwDocShell* mpDocShell; OUString msThisDocumentCodeName; public: - SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {} + explicit SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {} // XCodeNameQuery OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE @@ -243,7 +243,7 @@ class SwVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper< container: { SwDocShell* mpDocShell; public: - SwVbaObjectForCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) + explicit SwVbaObjectForCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) { // #FIXME #TODO is the code name for ThisDocument read anywhere? } diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 7b0486537421..828bb206a12c 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -382,7 +382,7 @@ namespace protected: virtual ~SwXShapesEnumeration() {}; public: - SwXShapesEnumeration(SwXDrawPage* const pDrawPage); + explicit SwXShapesEnumeration(SwXDrawPage* const pDrawPage); //XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index fbc02fb2390b..852362495522 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2980,7 +2980,7 @@ public: uno::Sequence< uno::Reference<text::XTextField> > m_Items; sal_Int32 m_nNextIndex; ///< index of next element to be returned - Impl(SwDoc & rDoc) + explicit Impl(SwDoc & rDoc) : SwClient(rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_STANDARD)) , m_pDoc(& rDoc) , m_nNextIndex(0) diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index e50c423b1e7c..a476a4b9fc9e 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -195,7 +195,7 @@ private: virtual ~StyleAccess_Impl(); public: - StyleAccess_Impl(SwXDocumentIndex& rParentIdx); + explicit StyleAccess_Impl(SwXDocumentIndex& rParentIdx); // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -241,7 +241,7 @@ private: public: - TokenAccess_Impl(SwXDocumentIndex& rParentIdx); + explicit TokenAccess_Impl(SwXDocumentIndex& rParentIdx); // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -277,7 +277,7 @@ private: OUString m_sUserTOXTypeName; public: - SwDocIndexDescriptorProperties_Impl(SwTOXType const*const pType); + explicit SwDocIndexDescriptorProperties_Impl(SwTOXType const*const pType); SwTOXBase & GetTOXBase() { return *m_pTOXBase; } const OUString& GetTypeName() const { return m_sUserTOXTypeName; } diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index aa4ecaa4540b..468ffc6580e2 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -1509,7 +1509,7 @@ public: ::std::vector< uno::Reference< text::XTextRange > > m_Ranges; std::shared_ptr<SwUnoCrsr> m_pUnoCursor; - Impl(SwPaM *const pPaM) + explicit Impl(SwPaM *const pPaM) { if (pPaM) { @@ -1700,7 +1700,7 @@ public: FrameDependList_t m_Frames; ::std::shared_ptr<SwUnoCrsr> m_pUnoCursor; - Impl(SwPaM const & rPaM) + explicit Impl(SwPaM const & rPaM) : m_pUnoCursor(rPaM.GetDoc()->CreateUnoCrsr(*rPaM.GetPoint(), false)) { m_pUnoCursor->Add(this); diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index a7451104f147..d1c6e781ee8e 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -62,7 +62,7 @@ class SwParaSelection { SwCursor & m_rCursor; public: - SwParaSelection(SwCursor & rCursor); + explicit SwParaSelection(SwCursor & rCursor); ~SwParaSelection(); }; diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 5a25218b2ab8..b1e27b2c9fa9 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1033,7 +1033,7 @@ class SwStyleProperties_Impl sal_uInt32 nArrLen; public: - SwStyleProperties_Impl(const SfxItemPropertyMap& rMap); + explicit SwStyleProperties_Impl(const SfxItemPropertyMap& rMap); ~SwStyleProperties_Impl(); bool SetProperty(const OUString& rName, const uno::Any& rVal); diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 02c2af9a5f66..2055c09a42d7 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -897,7 +897,9 @@ bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove( struct PreviewPosInsidePagePred { const Point mnPreviewPos; - PreviewPosInsidePagePred( const Point& rPreviewPos ) : mnPreviewPos( rPreviewPos ) {}; + explicit PreviewPosInsidePagePred(const Point& rPreviewPos) + : mnPreviewPos( rPreviewPos ) + {} bool operator() ( const PreviewPage* _pPreviewPage ) { if ( _pPreviewPage->bVisible ) @@ -1307,7 +1309,9 @@ void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) struct EqualsPageNumPred { const sal_uInt16 mnPageNum; - EqualsPageNumPred( const sal_uInt16 _nPageNum ) : mnPageNum( _nPageNum ) {}; + explicit EqualsPageNumPred(const sal_uInt16 _nPageNum) + : mnPageNum( _nPageNum ) + {} bool operator() ( const PreviewPage* _pPreviewPage ) { return _pPreviewPage->pPage->GetPhyPageNum() == mnPageNum; diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index b674f9299127..87997be94d97 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -99,7 +99,7 @@ class SwDrawViewSave SdrView* pDV; bool bPrintControls; public: - SwDrawViewSave( SdrView* pSdrView ); + explicit SwDrawViewSave( SdrView* pSdrView ); ~SwDrawViewSave(); }; 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() {} diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 3c16c99f512e..5424a43c0d19 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -70,7 +70,7 @@ class SwTestAccountSettingsDialog : public SfxModalDialog DECL_LINK(StopHdl, void *); DECL_LINK(TestHdl, void*); public: - SwTestAccountSettingsDialog(SwMailConfigPage* pParent); + explicit SwTestAccountSettingsDialog(SwMailConfigPage* pParent); virtual ~SwTestAccountSettingsDialog(); virtual void dispose() SAL_OVERRIDE; }; diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index ddfed15db9cc..e036f32fe3dc 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -126,7 +126,7 @@ struct _DB_Column eColType = DB_SPLITPARA; } - _DB_Column( const OUString& rText ) + explicit _DB_Column( const OUString& rText ) { pColInfo = 0; DB_ColumnData.pText = new OUString( rText ); diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 249de7c41d3e..7bbe913a0a28 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -198,7 +198,7 @@ class SwCopyToDialog : public SfxModalDialog VclPtr<Edit> m_pBCCED; public: - SwCopyToDialog(vcl::Window* pParent) + explicit SwCopyToDialog(vcl::Window* pParent) : SfxModalDialog(pParent, "CCDialog", "modules/swriter/ui/ccdialog.ui") { diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 7819538d730c..b1140d1562ce 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -142,7 +142,7 @@ class SwMailDispatcherListener_Impl : public IMailDispatcherListener VclPtr<SwSendMailDialog> m_pSendMailDialog; public: - SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg); + explicit SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg); virtual ~SwMailDispatcherListener_Impl(); virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE; diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 8ff7d381390b..3198bed68ae2 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -50,7 +50,7 @@ class DropDownFieldDialog; protected: \ ScopedVclPtr<DialogClass> pDlg; \ public: \ - Class( DialogClass* p) \ + explicit Class( DialogClass* p) \ : pDlg(p) \ {} \ virtual ~Class(); \ diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 9959db71a6a0..34f205d89909 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -60,7 +60,7 @@ class SwLabPreview : public vcl::Window public: - SwLabPreview(vcl::Window* pParent); + explicit SwLabPreview(vcl::Window* pParent); void UpdateItem(const SwLabItem& rItem); }; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 8b68dddb984e..89d467374e04 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -90,7 +90,7 @@ class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper { SwMailMergeDlg& rParent; public: - SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg); + explicit SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg); virtual ~SwXSelChgLstnr_Impl(); virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) throw (RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 8af83aac7d3a..d7ce26318702 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -554,7 +554,7 @@ class SwNewUserIdxDlg : public ModalDialog DECL_LINK( ModifyHdl, Edit*); public: - SwNewUserIdxDlg(SwIndexMarkPane* pPane) + explicit SwNewUserIdxDlg(SwIndexMarkPane* pPane) : ModalDialog(&(pPane->GetDialog()), "NewUserIndexDialog", "modules/swriter/ui/newuserindexdialog.ui") , m_pDlg(pPane) diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 59749f98a7c2..975fcca4af75 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -70,7 +70,7 @@ class SwNumNamesDlg : public ModalDialog DECL_LINK(DoubleClickHdl, void *); public: - SwNumNamesDlg(vcl::Window *pParent); + explicit SwNumNamesDlg(vcl::Window *pParent); virtual ~SwNumNamesDlg(); virtual void dispose() SAL_OVERRIDE; void SetUserNames(const OUString *pList[]); diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index 6cd948cbab91..71a29a6121f2 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -36,7 +36,7 @@ typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ooo::vba::word::XAppli class SwVbaApplication : public SwVbaApplication_BASE { public: - SwVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext ); + explicit SwVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext ); virtual ~SwVbaApplication(); // XApplication diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index 305c12ff56c5..73c4acad139e 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -54,7 +54,7 @@ private: uno::Reference< container::XIndexAccess > mxIndexAccess; uno::Any cachePos; public: - BookmarkCollectionHelper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : mxIndexAccess( xIndexAccess ) + explicit BookmarkCollectionHelper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : mxIndexAccess( xIndexAccess ) { mxNameAccess.set( mxIndexAccess, uno::UNO_QUERY_THROW ); } diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 4571ee746a78..72f5ae6ad893 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -289,7 +289,7 @@ class RangeBorderEnumWrapper : public EnumerationHelper_BASE uno::Reference<container::XIndexAccess > m_xIndexAccess; sal_Int32 nIndex; public: - RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} + explicit RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index 710f30d6a4c6..fb672767973a 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -34,7 +34,7 @@ class CellsEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: - CellsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) + explicit CellsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 3b2394bdd47e..bb053e05dc2c 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -64,7 +64,7 @@ protected: uno::Reference< frame::XModel > m_xModel; uno::Reference<document::XDocumentProperties> m_xDocProps; public: - PropertGetSetHelper( const uno::Reference< frame::XModel >& xModel ):m_xModel( xModel ) + explicit PropertGetSetHelper( const uno::Reference< frame::XModel >& xModel ):m_xModel( xModel ) { uno::Reference<document::XDocumentPropertiesSupplier> const xDocPropSupp(m_xModel, uno::UNO_QUERY_THROW); @@ -84,7 +84,7 @@ public: class BuiltinPropertyGetSetHelper : public PropertGetSetHelper { public: - BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) + explicit BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) { } virtual uno::Any getPropertyValue( const OUString& rPropName ) SAL_OVERRIDE @@ -265,7 +265,7 @@ public: class CustomPropertyGetSetHelper : public BuiltinPropertyGetSetHelper { public: - CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel ) + explicit CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel ) { } virtual uno::Any getPropertyValue( const OUString& rPropName ) SAL_OVERRIDE @@ -284,7 +284,7 @@ class StatisticPropertyGetSetHelper : public PropertGetSetHelper SwDocShell* mpDocShell; uno::Reference< beans::XPropertySet > mxModelProps; public: - StatisticPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) , mpDocShell( NULL ) + explicit StatisticPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) , mpDocShell( NULL ) { mxModelProps.set( m_xModel, uno::UNO_QUERY_THROW ); mpDocShell = word::getDocShell( xModel ); @@ -399,7 +399,7 @@ class BuiltInIndexHelper MSOIndexToOODocPropInfo m_docPropInfoMap; public: - BuiltInIndexHelper( const uno::Reference< frame::XModel >& xModel ) + explicit BuiltInIndexHelper( const uno::Reference< frame::XModel >& xModel ) { boost::shared_ptr< PropertGetSetHelper > aStandardHelper( new BuiltinPropertyGetSetHelper( xModel ) ); boost::shared_ptr< PropertGetSetHelper > aUsingStatsHelper( new StatisticPropertyGetSetHelper( xModel ) ); @@ -645,7 +645,7 @@ class DocPropEnumeration : public DocPropEnumeration_BASE DocProps::iterator mIt; public: - DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.begin() ) {} + explicit DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.begin() ) {} virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mIt != mDocProps.end(); diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index ef016607e32d..8034ce1b5d6b 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -77,7 +77,7 @@ private: sal_Int32 nLen, nFnd, nNext, nSavPtr; OUString aFieldName; public: - SwVbaReadFieldParams( const OUString& rData ); + explicit SwVbaReadFieldParams( const OUString& rData ); ~SwVbaReadFieldParams(); long SkipToNextToken(); diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index 54eaca1c6a44..3e0d153f5fcb 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -66,7 +66,7 @@ class HeadersFootersEnumWrapper : public EnumerationHelper_BASE SwVbaHeadersFooters* pHeadersFooters; sal_Int32 nIndex; public: - HeadersFootersEnumWrapper( SwVbaHeadersFooters* _pHeadersFooters ) : pHeadersFooters( _pHeadersFooters ), nIndex( 0 ) {} + explicit HeadersFootersEnumWrapper( SwVbaHeadersFooters* _pHeadersFooters ) : pHeadersFooters( _pHeadersFooters ), nIndex( 0 ) {} virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < pHeadersFooters->getCount() ); diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index ee66621a8a82..c0aa120b8aaa 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -28,7 +28,7 @@ class ListGalleriesEnumWrapper : public EnumerationHelper_BASE SwVbaListGalleries* pListGalleries; sal_Int32 nIndex; public: - ListGalleriesEnumWrapper( SwVbaListGalleries* pGalleries ) : pListGalleries( pGalleries ), nIndex( 1 ) {} + explicit ListGalleriesEnumWrapper( SwVbaListGalleries* pGalleries ) : pListGalleries( pGalleries ), nIndex( 1 ) {} virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pListGalleries->getCount() ); diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx index df174ae5784f..dd565e429c11 100644 --- a/sw/source/ui/vba/vbalistlevels.cxx +++ b/sw/source/ui/vba/vbalistlevels.cxx @@ -28,7 +28,7 @@ class ListLevelsEnumWrapper : public EnumerationHelper_BASE SwVbaListLevels* pListLevels; sal_Int32 nIndex; public: - ListLevelsEnumWrapper( SwVbaListLevels* pLevels ) : pListLevels( pLevels ), nIndex( 1 ) {} + explicit ListLevelsEnumWrapper( SwVbaListLevels* pLevels ) : pListLevels( pLevels ), nIndex( 1 ) {} virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pListLevels->getCount() ); diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx index 3fa127a36acd..c9449c2c3bb4 100644 --- a/sw/source/ui/vba/vbalisttemplates.cxx +++ b/sw/source/ui/vba/vbalisttemplates.cxx @@ -27,7 +27,7 @@ class ListTemplatesEnumWrapper : public EnumerationHelper_BASE SwVbaListTemplates* pListTemplates; sal_Int32 nIndex; public: - ListTemplatesEnumWrapper( SwVbaListTemplates* pTemplates ) : pListTemplates( pTemplates ), nIndex( 1 ) {} + explicit ListTemplatesEnumWrapper( SwVbaListTemplates* pTemplates ) : pListTemplates( pTemplates ), nIndex( 1 ) {} virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pListTemplates->getCount() ); diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx index a47ad6d972bc..9d51520c5c88 100644 --- a/sw/source/ui/vba/vbaoptions.hxx +++ b/sw/source/ui/vba/vbaoptions.hxx @@ -33,7 +33,7 @@ class SwVbaOptions : public SwVbaOptions_BASE, private: OUString msDefaultFilePath; public: - SwVbaOptions( css::uno::Reference< css::uno::XComponentContext >& m_xContext ); + explicit SwVbaOptions( css::uno::Reference< css::uno::XComponentContext >& m_xContext ); virtual ~SwVbaOptions(); // Attributes diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index 19389c3f42fd..22f1632afcc7 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -62,7 +62,7 @@ class PanesEnumWrapper : public EnumerationHelper_BASE uno::Reference<container::XIndexAccess > m_xIndexAccess; sal_Int32 nIndex; public: - PanesEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} + explicit PanesEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index d32c53682d2d..12fdf269cd07 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -87,7 +87,7 @@ private: } public: - ParagraphCollectionHelper( const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException): mxTextDocument( xDocument ) + explicit ParagraphCollectionHelper( const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException): mxTextDocument( xDocument ) { } // XElementAccess diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 4b49b7740733..04b46a419a49 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -34,7 +34,7 @@ class RedlinesEnumeration : public RevisionEnumeration_BASE RevisionMap mRevisionMap; RevisionMap::iterator mIt; public: - RedlinesEnumeration( const RevisionMap& sMap ) : mRevisionMap( sMap ), mIt( mRevisionMap.begin() ) {} + explicit RedlinesEnumeration( const RevisionMap& sMap ) : mRevisionMap( sMap ), mIt( mRevisionMap.begin() ) {} virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mIt != mRevisionMap.end() ); diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index 06cd0f469315..4669a51c2f02 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -38,7 +38,7 @@ class SectionEnumeration : public SectionEnumeration_BASE XSectionVec::iterator mIt; public: - SectionEnumeration( const XSectionVec& rVec ) : mxSections( rVec ), mIt( mxSections.begin() ) {} + explicit SectionEnumeration( const XSectionVec& rVec ) : mxSections( rVec ), mIt( mxSections.begin() ) {} virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mIt != mxSections.end() ); diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index e46d74c53aa4..38ab165cdc34 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -166,7 +166,7 @@ private: uno::Reference< container::XNameAccess > mxParaStyles; uno::Any cachePos; public: - StyleCollectionHelper( const uno::Reference< frame::XModel >& _xModel ) : mxModel( _xModel ) + explicit StyleCollectionHelper( const uno::Reference< frame::XModel >& _xModel ) : mxModel( _xModel ) { // we only concern about the Paragraph styles uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( _xModel, uno::UNO_QUERY_THROW); @@ -252,7 +252,7 @@ class StylesEnumWrapper : public EnumerationHelper_BASE SwVbaStyles* pStyles; sal_Int32 nIndex; public: - StylesEnumWrapper( SwVbaStyles* _pStyles ) : pStyles( _pStyles ), nIndex( 1 ) {} + explicit StylesEnumWrapper( SwVbaStyles* _pStyles ) : pStyles( _pStyles ), nIndex( 1 ) {} virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pStyles->getCount() ); diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx index f43de3410de7..f32534f54997 100644 --- a/sw/source/ui/vba/vbasystem.hxx +++ b/sw/source/ui/vba/vbasystem.hxx @@ -48,7 +48,7 @@ private: PrivateProfileStringListener maPrivateProfileStringListener; public: - SwVbaSystem( css::uno::Reference< css::uno::XComponentContext >& m_xContext ); + explicit SwVbaSystem( css::uno::Reference< css::uno::XComponentContext >& m_xContext ); virtual ~SwVbaSystem(); // XSystem diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx index ecc02382e664..b46f4f3a6614 100644 --- a/sw/source/ui/vba/vbatablehelper.hxx +++ b/sw/source/ui/vba/vbatablehelper.hxx @@ -38,7 +38,7 @@ private: static sal_Int32 GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) throw (css::uno::RuntimeException); public: - SwVbaTableHelper( const css::uno::Reference< css::text::XTextTable >& xTextTable ) throw (css::uno::RuntimeException); + explicit SwVbaTableHelper( const css::uno::Reference< css::text::XTextTable >& xTextTable ) throw (css::uno::RuntimeException); ~SwVbaTableHelper() {} sal_Int32 getTabColumnsCount( sal_Int32 nRowIndex ) throw (css::uno::RuntimeException); sal_Int32 getTabColumnsMaxCount( ) throw (css::uno::RuntimeException); diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index a81375dcc779..1ccfa74702b6 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -69,7 +69,7 @@ class TableCollectionHelper : public TableCollectionHelper_Base XTextTableVec::iterator cachePos; public: - TableCollectionHelper( const uno::Reference< frame::XModel >& xDocument ) + explicit TableCollectionHelper( const uno::Reference< frame::XModel >& xDocument ) { // only count the tables in the body text, not in the header/footer uno::Reference< container::XIndexAccess > xTables = lcl_getTables( xDocument ); diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index d0cbc0811c6a..5bf40d7cbb4e 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -34,7 +34,7 @@ class TablesOfContentsEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: - TablesOfContentsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) + explicit TablesOfContentsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index 7ae01e32d383..9c14bad61971 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -46,7 +46,7 @@ class TabStopsEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: - TabStopsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) + explicit TabStopsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index bb0f62f0b6a7..f6c210956cad 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -85,7 +85,7 @@ class SwImplShellAction SwWrtShell* pSh; CurrShell* pCurrSh; public: - SwImplShellAction( SwDoc& rDoc ); + explicit SwImplShellAction( SwDoc& rDoc ); ~SwImplShellAction(); }; diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index a3ab6d9716c3..942f58b43ade 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -213,7 +213,7 @@ private: virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; public: - SwConnectionDisposedListener_Impl(SwDBManager& rMgr); + explicit SwConnectionDisposedListener_Impl(SwDBManager& rMgr); virtual ~SwConnectionDisposedListener_Impl(); void Dispose() { m_pDBManager = 0; } @@ -226,7 +226,7 @@ struct SwDBManager_Impl AbstractMailMergeDlg* pMergeDialog; ::rtl::Reference<SwConnectionDisposedListener_Impl> m_xDisposeListener; - SwDBManager_Impl(SwDBManager& rDBManager) + explicit SwDBManager_Impl(SwDBManager& rDBManager) :pMergeData(0) ,pMergeDialog(0) , m_xDisposeListener(new SwConnectionDisposedListener_Impl(rDBManager)) diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 18c8388985f4..ba2dd451f302 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -77,8 +77,10 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper < XContainerListener > SwWrtShell* pWrtSh; public: - SwDBTreeList_Impl(SwWrtShell* pShell) : - pWrtSh(pShell) {} + explicit SwDBTreeList_Impl(SwWrtShell* pShell) + : pWrtSh(pShell) + { + } virtual ~SwDBTreeList_Impl(); virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 98a98964dbd9..727a9bb050ac 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1207,7 +1207,7 @@ class IsPostitFieldWithAuthorOf : public FilterFunctor { OUString m_sAuthor; public: - IsPostitFieldWithAuthorOf(const OUString &rAuthor) + explicit IsPostitFieldWithAuthorOf(const OUString &rAuthor) : m_sAuthor(rAuthor) { } diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index cbe437ec7b92..366e1869b487 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -43,7 +43,7 @@ class SidebarTextEditSource : public SvxEditSource, public SfxBroadcaster { public: - SidebarTextEditSource( SidebarTextControl& rSidebarTextControl ); + explicit SidebarTextEditSource(SidebarTextControl& rSidebarTextControl); virtual ~SidebarTextEditSource(); virtual SvxEditSource* Clone() const SAL_OVERRIDE; diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index a3c5f68e7414..3921852714f0 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -203,7 +203,7 @@ class SwAnchorMarker Point aLastPos; bool bTopRightHandle; public: - SwAnchorMarker( SdrHdl* pH ) + explicit SwAnchorMarker( SdrHdl* pH ) : pHdl( pH ) , aHdlPos( pH->GetPos() ) , aLastPos( pH->GetPos() ) @@ -5982,7 +5982,7 @@ class CompareIgnoreCaseAsciiFavorExact { const OUString &m_rOrigWord; public: - CompareIgnoreCaseAsciiFavorExact(const OUString& rOrigWord) + explicit CompareIgnoreCaseAsciiFavorExact(const OUString& rOrigWord) : m_rOrigWord(rOrigWord) { } diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 839f6d59a241..2412888698db 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -208,7 +208,7 @@ class SwSrcEditWindow::ChangesListener: public cppu::WeakImplHelper< css::beans::XPropertiesChangeListener > { public: - ChangesListener(SwSrcEditWindow & editor): editor_(editor) {} + explicit ChangesListener(SwSrcEditWindow & editor): editor_(editor) {} private: virtual ~ChangesListener() {} diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 62b38d48f270..1656e510a77e 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -120,7 +120,7 @@ private: SAL_DLLPRIVATE com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> GetNumberingInfo()const; public: - SwFieldMgr(SwWrtShell* pSh = 0); + explicit SwFieldMgr(SwWrtShell* pSh = 0); ~SwFieldMgr(); void SetWrtShell( SwWrtShell* pShell ) diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index 55049118fcd8..cfeca301b6bf 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -88,7 +88,7 @@ private: ::std::shared_ptr<SwUnoCrsr> const m_pCursor; public: - SwExternalToolEdit(SwWrtShell *const pShell) + explicit SwExternalToolEdit(SwWrtShell *const pShell) : m_pShell(pShell) , m_pCursor( // need only Point, must point to SwGrfNode pShell->GetDoc()->CreateUnoCrsr( diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index 9bedd354bf49..bb375020a3eb 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -90,7 +90,7 @@ public: OUString maElementName; public: - StyleRedefinition(const OUString& aElementName) + explicit StyleRedefinition(const OUString& aElementName) : maElementName(aElementName) {} @@ -134,7 +134,7 @@ class StyleSet std::vector<StyleRedefinition> maStyles; public: - StyleSet(const OUString& aName) + explicit StyleSet(const OUString& aName) : maName(aName) , maStyles() {} diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 70cd467c37b0..63470d10e378 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -151,7 +151,7 @@ class SwPreviewZoomDlg : public SvxStandardDialog virtual void Apply() SAL_OVERRIDE; public: - SwPreviewZoomDlg( SwPagePreviewWin& rParent ); + explicit SwPreviewZoomDlg( SwPagePreviewWin& rParent ); virtual ~SwPreviewZoomDlg(); virtual void dispose() SAL_OVERRIDE; }; diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index d744d24c2630..0aaf8ce54730 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -412,7 +412,7 @@ SwXMailMerge::~SwXMailMerge() // Guarantee object consistence in case of an exception class MailMergeExecuteFinalizer: private boost::noncopyable { public: - MailMergeExecuteFinalizer(SwXMailMerge *mailmerge) + explicit MailMergeExecuteFinalizer(SwXMailMerge *mailmerge) : m_pMailMerge(mailmerge) { assert(m_pMailMerge); //mailmerge object missing diff --git a/sw/source/uibase/uno/unomodule.hxx b/sw/source/uibase/uno/unomodule.hxx index 8d7c29654f4b..8bf731e9e20c 100644 --- a/sw/source/uibase/uno/unomodule.hxx +++ b/sw/source/uibase/uno/unomodule.hxx @@ -53,9 +53,9 @@ class SwUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider css::uno::Reference < css::lang::XMultiServiceFactory > m_xFactory; public: - SwUnoModule( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory ) - : m_xFactory( xFactory ) - {} + explicit SwUnoModule( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory ) + : m_xFactory( xFactory ) + {} // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index e622d5812722..a5fd19a40887 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -126,11 +126,11 @@ class SwGlobalFrameListener_Impl : public SfxListener { bool bValid; public: - SwGlobalFrameListener_Impl(SfxViewFrame& rFrame) : - bValid(true) - { - StartListening(rFrame); - } + explicit SwGlobalFrameListener_Impl(SfxViewFrame& rFrame) + : bValid(true) + { + StartListening(rFrame); + } virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 53980635be55..48a0d51d82fe 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -58,7 +58,7 @@ class SwGlossDecideDlg : public ModalDialog DECL_LINK(SelectHdl, void*); public: - SwGlossDecideDlg(vcl::Window* pParent); + explicit SwGlossDecideDlg(vcl::Window* pParent); virtual ~SwGlossDecideDlg(); virtual void dispose() SAL_OVERRIDE; diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx index cfadf1b74209..99acee29afeb 100644 --- a/sw/source/uibase/utlui/initui.cxx +++ b/sw/source/uibase/utlui/initui.cxx @@ -275,7 +275,7 @@ SwGlossaryList* GetGlossaryList() struct ImpAutoFormatNameListLoader : public Resource { - ImpAutoFormatNameListLoader( std::vector<OUString>& rLst ); + explicit ImpAutoFormatNameListLoader( std::vector<OUString>& rLst ); }; void ShellResource::_GetAutoFormatNameLst() const diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index ea37b9a9c301..9a31f007e1d5 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -107,7 +107,7 @@ class TestBridgeImpl : public osl::DebugBase<TestBridgeImpl>, Reference< XComponentContext > m_xContext; public: - TestBridgeImpl( const Reference< XComponentContext > & xContext ) + explicit TestBridgeImpl( const Reference< XComponentContext > & xContext ) : m_xContext( xContext ) {} virtual ~TestBridgeImpl() diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx index 793436f42bb7..a093eb0f6003 100644 --- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx +++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx @@ -806,7 +806,7 @@ static bool raiseException(XBridgeTest* xLBT ) XComponentContext* m_xContext; public: - BridgeTest( XComponentContext* xContext ) + explicit BridgeTest( XComponentContext* xContext ) { m_xContext = xContext; } diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx index 972f53e28646..bd1fc93cfa87 100644 --- a/testtools/source/performance/ubobject.cxx +++ b/testtools/source/performance/ubobject.cxx @@ -68,7 +68,7 @@ public: ServiceImpl() : _nRef( 0 ) {} - ServiceImpl( const Reference< XMultiServiceFactory > & xMgr ) + explicit ServiceImpl( const Reference< XMultiServiceFactory > & xMgr ) : _nRef( 0 ) {} diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index f1eabf2f7a8c..807b5bde78cc 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -409,7 +409,7 @@ class TestImpl : public WeakImplHelper2< XServiceInfo, XMain > Reference< XInterface > resolveObject( const OUString & rUnoUrl ) throw (Exception); public: - TestImpl( const Reference< XMultiServiceFactory > & xSMgr ); + explicit TestImpl( const Reference< XMultiServiceFactory > & xSMgr ); virtual ~TestImpl(); // XServiceInfo diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index b9215fcdbfb4..edc301474144 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -82,7 +82,7 @@ namespace toolkit { } - CachedImage( OUString const& i_imageURL ) + explicit CachedImage( OUString const& i_imageURL ) :sImageURL( i_imageURL ) ,xGraphic() { @@ -94,7 +94,7 @@ namespace toolkit AnimatedImagesPeer& rAntiImpl; ::std::vector< ::std::vector< CachedImage > > aCachedImageSets; - AnimatedImagesPeer_Data( AnimatedImagesPeer& i_antiImpl ) + explicit AnimatedImagesPeer_Data( AnimatedImagesPeer& i_antiImpl ) :rAntiImpl( i_antiImpl ) ,aCachedImageSets() { diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index 360e1618d51f..c3553d5502be 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -90,7 +90,7 @@ namespace toolkit class StyleMethodGuard { public: - StyleMethodGuard( WindowStyleSettings_Data& i_rData ) + explicit StyleMethodGuard( WindowStyleSettings_Data& i_rData ) { if ( i_rData.pOwningWindow == NULL ) throw DisposedException(); diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 7e70d43324c6..98b953cd5e29 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -129,7 +129,7 @@ private: const OUString& m_rName; public: - FindControlModel( const OUString& _rName ) : m_rName( _rName ) { } + explicit FindControlModel( const OUString& _rName ) : m_rName( _rName ) { } bool operator()( const ControlModelContainerBase::UnoControlModelHolder& _rCompare ) { @@ -145,7 +145,7 @@ private: ControlModelContainerBase::UnoControlModelHolderList& m_rTargetList; public: - CloneControlModel( ControlModelContainerBase::UnoControlModelHolderList& _rTargetList ) + explicit CloneControlModel( ControlModelContainerBase::UnoControlModelHolderList& _rTargetList ) :m_rTargetList( _rTargetList ) { } @@ -167,7 +167,7 @@ struct CompareControlModel : public ::std::unary_function< ControlModelContainer private: Reference< XControlModel > m_xReference; public: - CompareControlModel( const Reference< XControlModel >& _rxReference ) : m_xReference( _rxReference ) { } + explicit CompareControlModel( const Reference< XControlModel >& _rxReference ) : m_xReference( _rxReference ) { } bool operator()( const ControlModelContainerBase::UnoControlModelHolder& _rCompare ) { diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index afce8f36d903..39404aa69ea5 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -156,7 +156,7 @@ protected: // ::cppu::OPropertySetHelper void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) SAL_OVERRIDE; public: - UnoControlDialogModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + explicit UnoControlDialogModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlDialogModel( const UnoControlDialogModel& rModel ); virtual ~UnoControlDialogModel(); diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 0f8ab776dce5..2a002ec46677 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -291,7 +291,7 @@ namespace toolkit bool& m_rFlag; public: - ResetFlagOnExit( bool& _rFlag ) + explicit ResetFlagOnExit( bool& _rFlag ) :m_rFlag( _rFlag ) { } diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index ac09345fab3b..a5b67972568a 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -506,7 +506,7 @@ struct PropertyNameEqual : public ::std::unary_function< Property, bool > { const OUString& m_rCompare; - PropertyNameEqual( const OUString& _rCompare ) : m_rCompare( _rCompare ) { } + explicit PropertyNameEqual( const OUString& _rCompare ) : m_rCompare( _rCompare ) { } bool operator()( const Property& _rLHS ) { @@ -589,7 +589,7 @@ struct Int32Equal : public ::std::unary_function< sal_Int32, bool > { sal_Int32 m_nCompare; - Int32Equal( sal_Int32 _nCompare ) : m_nCompare( _nCompare ) { } + explicit Int32Equal( sal_Int32 _nCompare ) : m_nCompare( _nCompare ) { } bool operator()( sal_Int32 _nLHS ) { diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index a19d63192753..5b69b22cf0fb 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -47,7 +47,7 @@ protected: ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: - UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); + explicit UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); UnoGridModel( const UnoGridModel& rModel ); UnoControlModel* Clone() const SAL_OVERRIDE; diff --git a/toolkit/source/controls/grid/grideventforwarder.hxx b/toolkit/source/controls/grid/grideventforwarder.hxx index 22a3952abab6..585c11153a77 100644 --- a/toolkit/source/controls/grid/grideventforwarder.hxx +++ b/toolkit/source/controls/grid/grideventforwarder.hxx @@ -43,7 +43,7 @@ namespace toolkit class GridEventForwarder : public GridEventForwarder_Base { public: - GridEventForwarder( UnoGridControl& i_parent ); + explicit GridEventForwarder( UnoGridControl& i_parent ); virtual ~GridEventForwarder(); public: diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 2ca1297ea9f6..3526251d8e0a 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -63,7 +63,7 @@ class SortableGridDataModel :public ::cppu::BaseMutex ,public SortableGridDataModel_PrivateBase { public: - SortableGridDataModel( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); + explicit SortableGridDataModel( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); SortableGridDataModel( SortableGridDataModel const & i_copySource ); bool isInitialized() const { return m_isInitialized; } diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx index 7511f0755305..b2a7fa92b452 100644 --- a/toolkit/source/controls/spinningprogress.cxx +++ b/toolkit/source/controls/spinningprogress.cxx @@ -32,7 +32,7 @@ typedef toolkit::AnimatedImagesControlModel SpinningProgressControlModel_Base; class SpinningProgressControlModel : public SpinningProgressControlModel_Base { public: - SpinningProgressControlModel( css::uno::Reference< css::uno::XComponentContext > const & i_factory ); + explicit SpinningProgressControlModel( css::uno::Reference< css::uno::XComponentContext > const & i_factory ); SpinningProgressControlModel( const SpinningProgressControlModel& i_copySource ); virtual UnoControlModel* Clone() const SAL_OVERRIDE; diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index 95e61961b64a..6ae88b785602 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -46,8 +46,8 @@ protected: ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: - UnoSpinButtonModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ); - UnoSpinButtonModel( const UnoSpinButtonModel& rModel ) : UnoControlModel( rModel ) {;} + explicit UnoSpinButtonModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ); + UnoSpinButtonModel( const UnoSpinButtonModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoSpinButtonModel( *this ); } diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx index dbf2e0c1d64b..361af8064ed3 100644 --- a/toolkit/source/controls/tree/treecontrol.hxx +++ b/toolkit/source/controls/tree/treecontrol.hxx @@ -39,7 +39,7 @@ protected: ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: - UnoTreeModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); + explicit UnoTreeModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); UnoTreeModel( const UnoTreeModel& rModel ); UnoControlModel* Clone() const SAL_OVERRIDE; diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index d5c6ebf6da51..b0c2a8b281b9 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -101,13 +101,13 @@ private: VCLXWindow* m_pLockWindow; public: - inline VclListenerLock( VCLXWindow* _pLockWindow ) - :m_pLockWindow( _pLockWindow ) + explicit VclListenerLock( VCLXWindow* _pLockWindow ) + : m_pLockWindow( _pLockWindow ) { if ( m_pLockWindow ) m_pLockWindow->suspendVclEventListening( ); } - inline ~VclListenerLock( ) + ~VclListenerLock() { if ( m_pLockWindow ) m_pLockWindow->resumeVclEventListening( ); diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 675ed753079b..71de06f45efd 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -363,7 +363,7 @@ private: uno::Reference< awt::XControlContainer > mxControlContainer; public: - DialogStepChangedListener( uno::Reference< awt::XControlContainer > xControlContainer ) + explicit DialogStepChangedListener( uno::Reference< awt::XControlContainer > xControlContainer ) : mxControlContainer( xControlContainer ) {} // XEventListener diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index bf62b7ca69fb..a495f1488b3f 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -2136,7 +2136,7 @@ struct ListItem { } - ListItem( const OUString& i_rItemText ) + explicit ListItem( const OUString& i_rItemText ) :ItemText( i_rItemText ) ,ItemImageURL() ,ItemData() @@ -2156,7 +2156,7 @@ struct StripItemData : public ::std::unary_function< ListItem, UnoListItem > struct UnoControlListBoxModel_Data { - UnoControlListBoxModel_Data( UnoControlListBoxModel& i_rAntiImpl ) + explicit UnoControlListBoxModel_Data( UnoControlListBoxModel& i_rAntiImpl ) :m_bSettingLegacyProperty( false ) ,m_rAntiImpl( i_rAntiImpl ) ,m_aListItems() diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index 457a05b4d112..e8dacc2625d3 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -1099,7 +1099,7 @@ class ImplPolygonPointFilter : public ImplPointFilter std::unique_ptr<ImplPolygon> mxPoly; sal_uInt16 mnSize; public: - ImplPolygonPointFilter(sal_uInt16 nDestSize) + explicit ImplPolygonPointFilter(sal_uInt16 nDestSize) : mxPoly(new ImplPolygon(nDestSize)) , mnSize(0) { |