writerfilter/source/dmapper/TagLogger.hxx | 2 writerfilter/source/dmapper/TblStylePrHandler.hxx | 2 writerfilter/source/dmapper/TrackChangesHandler.hxx | 2 writerfilter/source/filter/RtfFilter.cxx | 2 writerfilter/source/filter/WriterFilter.cxx | 2 writerfilter/source/filter/WriterFilterDetection.cxx | 2 writerfilter/source/ooxml/Handler.hxx | 20 ++++----- writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx | 2 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 31 +++++---------- writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 8 +-- 10 files changed, 33 insertions(+), 40 deletions(-)
New commits: commit a21a0b6dceaf965673ae601318e77991919c8f6a Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Mon May 4 09:04:20 2015 +0200 writerfilter: noExplicitConstructor cppcheck fixes Change-Id: I4195fc8a7736a29a6f08d0745f39a0907a5545e8 diff --git a/writerfilter/source/dmapper/TagLogger.hxx b/writerfilter/source/dmapper/TagLogger.hxx index 988d656..141a534 100644 --- a/writerfilter/source/dmapper/TagLogger.hxx +++ b/writerfilter/source/dmapper/TagLogger.hxx @@ -39,7 +39,7 @@ namespace writerfilter xmlTextWriterPtr pWriter; const char* pName; - TagLogger(const char* name); + explicit TagLogger(const char* name); public: ~TagLogger(); diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx index c0694a8..13ab322 100644 --- a/writerfilter/source/dmapper/TblStylePrHandler.hxx +++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx @@ -65,7 +65,7 @@ private: virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; public: - TblStylePrHandler( DomainMapper & rDMapper ); + explicit TblStylePrHandler( DomainMapper & rDMapper ); virtual ~TblStylePrHandler( ); inline PropertyMapPtr getProperties() { return m_pProperties; }; diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx index 31b4d61..3b733e4 100644 --- a/writerfilter/source/dmapper/TrackChangesHandler.hxx +++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx @@ -32,7 +32,7 @@ class TrackChangesHandler : public LoggedProperties virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; public: - TrackChangesHandler( sal_Int32 nToken ); + explicit TrackChangesHandler( sal_Int32 nToken ); virtual ~TrackChangesHandler(); /// Compute the UNO properties for the track changes object based on the received tokens. diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index 6ab4934..bea67c9 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -53,7 +53,7 @@ class RtfFilter : public cppu::WeakImplHelper uno::Reference<lang::XComponent> m_xSrcDoc, m_xDstDoc; public: - RtfFilter(const uno::Reference<uno::XComponentContext>& xContext); + explicit RtfFilter(const uno::Reference<uno::XComponentContext>& xContext); virtual ~RtfFilter(); // XFilter diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index 327477b..a2f289a 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -96,7 +96,7 @@ protected: uno::Reference<lang::XComponent> m_xSrcDoc, m_xDstDoc; public: - WriterFilter(const uno::Reference<uno::XComponentContext>& rxContext) + explicit WriterFilter(const uno::Reference<uno::XComponentContext>& rxContext) : m_xContext(rxContext) {} virtual ~WriterFilter() {} diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx index 5b202b3..95d46f73 100644 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ b/writerfilter/source/filter/WriterFilterDetection.cxx @@ -36,7 +36,7 @@ class WriterFilterDetection : public cppu::WeakImplHelper uno::Reference<uno::XComponentContext> m_xContext; public: - WriterFilterDetection(const uno::Reference<uno::XComponentContext>& rxContext); + explicit WriterFilterDetection(const uno::Reference<uno::XComponentContext>& rxContext); virtual ~WriterFilterDetection(); //XExtendedFilterDetection diff --git a/writerfilter/source/ooxml/Handler.hxx b/writerfilter/source/ooxml/Handler.hxx index 2b470a6..c021fbe 100644 --- a/writerfilter/source/ooxml/Handler.hxx +++ b/writerfilter/source/ooxml/Handler.hxx @@ -30,7 +30,7 @@ class OOXMLFootnoteHandler : public Properties OOXMLFastContextHandler * mpFastContext; public: - OOXMLFootnoteHandler(OOXMLFastContextHandler * pContext); + explicit OOXMLFootnoteHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLFootnoteHandler(); virtual void attribute(Id name, Value & val) SAL_OVERRIDE; @@ -41,7 +41,7 @@ class OOXMLEndnoteHandler : public Properties { OOXMLFastContextHandler * mpFastContext; public: - OOXMLEndnoteHandler(OOXMLFastContextHandler * pContext); + explicit OOXMLEndnoteHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLEndnoteHandler(); virtual void attribute(Id name, Value & val) SAL_OVERRIDE; @@ -54,7 +54,7 @@ class OOXMLFooterHandler : public Properties OUString msStreamId; sal_Int32 mnType; public: - OOXMLFooterHandler(OOXMLFastContextHandler * pContext); + explicit OOXMLFooterHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLFooterHandler() {} void finalize(); virtual void attribute(Id name, Value & val) SAL_OVERRIDE; @@ -67,7 +67,7 @@ class OOXMLHeaderHandler : public Properties OUString msStreamId; sal_Int32 mnType; public: - OOXMLHeaderHandler(OOXMLFastContextHandler * pContext); + explicit OOXMLHeaderHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLHeaderHandler() {} void finalize(); virtual void attribute(Id name, Value & val) SAL_OVERRIDE; @@ -78,7 +78,7 @@ class OOXMLCommentHandler : public Properties { OOXMLFastContextHandler * mpFastContext; public: - OOXMLCommentHandler(OOXMLFastContextHandler * pContext); + explicit OOXMLCommentHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLCommentHandler(); virtual void attribute(Id name, Value & val) SAL_OVERRIDE; virtual void sprm(Sprm & sprm) SAL_OVERRIDE; @@ -89,7 +89,7 @@ class OOXMLOLEHandler : public Properties OOXMLFastContextHandler * mpFastContext; public: - OOXMLOLEHandler(OOXMLFastContextHandler * pContext); + explicit OOXMLOLEHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLOLEHandler(); virtual void attribute(Id name, Value & val) SAL_OVERRIDE; @@ -101,7 +101,7 @@ class OOXMLEmbeddedFontHandler : public Properties OOXMLFastContextHandler * mpFastContext; public: - OOXMLEmbeddedFontHandler(OOXMLFastContextHandler * pContext); + explicit OOXMLEmbeddedFontHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLEmbeddedFontHandler(); virtual void attribute(Id name, Value & val) SAL_OVERRIDE; @@ -113,7 +113,7 @@ class OOXMLBreakHandler : public Properties sal_Int32 mnType, mnClear; Stream & mrStream; public: - OOXMLBreakHandler(Stream & rStream); + explicit OOXMLBreakHandler(Stream & rStream); virtual ~OOXMLBreakHandler(); virtual void attribute(Id name, Value & val) SAL_OVERRIDE; virtual void sprm(Sprm & sprm) SAL_OVERRIDE; @@ -123,7 +123,7 @@ class OOXMLPictureHandler : public Properties { OOXMLFastContextHandler * mpFastContext; public: - OOXMLPictureHandler(OOXMLFastContextHandler * pContext); + explicit OOXMLPictureHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLPictureHandler(); virtual void attribute(Id name, Value & val) SAL_OVERRIDE; @@ -137,7 +137,7 @@ class OOXMLHyperlinkHandler : public Properties OUString mURL; public: - OOXMLHyperlinkHandler(OOXMLFastContextHandler * pContext); + explicit OOXMLHyperlinkHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLHyperlinkHandler(); virtual void attribute(Id name, Value & val) SAL_OVERRIDE; diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx index d259ead..96d4a4d 100644 --- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx +++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx @@ -35,7 +35,7 @@ class OOXMLBinaryObjectReference : void read(); public: - OOXMLBinaryObjectReference(OOXMLStream::Pointer_t pStream); + explicit OOXMLBinaryObjectReference(OOXMLStream::Pointer_t pStream); virtual ~OOXMLBinaryObjectReference(); virtual void resolve(BinaryObj & rHandler) SAL_OVERRIDE; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index a592dd1..832edb1 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -50,11 +50,9 @@ public: enum ResourceEnum_t { UNKNOWN, STREAM, PROPERTIES, TABLE, SHAPE }; OOXMLFastContextHandler(); - explicit OOXMLFastContextHandler - (css::uno::Reference< css::uno::XComponentContext > const & context); + explicit OOXMLFastContextHandler(css::uno::Reference< css::uno::XComponentContext > const & context); - explicit OOXMLFastContextHandler - (OOXMLFastContextHandler * pContext); + explicit OOXMLFastContextHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandler(); @@ -254,7 +252,7 @@ private: class OOXMLFastContextHandlerStream : public OOXMLFastContextHandler { public: - OOXMLFastContextHandlerStream(OOXMLFastContextHandler * pContext); + explicit OOXMLFastContextHandlerStream(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerStream(); virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return STREAM; } @@ -277,7 +275,7 @@ private: class OOXMLFastContextHandlerProperties : public OOXMLFastContextHandler { public: - OOXMLFastContextHandlerProperties(OOXMLFastContextHandler * pContext); + explicit OOXMLFastContextHandlerProperties(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerProperties(); virtual OOXMLValue::Pointer_t getValue() const SAL_OVERRIDE; @@ -313,7 +311,7 @@ class OOXMLFastContextHandlerPropertyTable : public OOXMLFastContextHandlerProperties { public: - OOXMLFastContextHandlerPropertyTable(OOXMLFastContextHandler * pContext); + explicit OOXMLFastContextHandlerPropertyTable(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerPropertyTable(); protected: @@ -327,8 +325,7 @@ class OOXMLFastContextHandlerValue : public OOXMLFastContextHandler { public: - OOXMLFastContextHandlerValue - (OOXMLFastContextHandler * pContext); + explicit OOXMLFastContextHandlerValue(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerValue(); void setValue(OOXMLValue::Pointer_t pValue); @@ -351,7 +348,7 @@ protected: class OOXMLFastContextHandlerTable : public OOXMLFastContextHandler { public: - OOXMLFastContextHandlerTable(OOXMLFastContextHandler * pContext); + explicit OOXMLFastContextHandlerTable(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerTable(); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (Token_t Element, @@ -376,7 +373,7 @@ protected: class OOXMLFastContextHandlerXNote : public OOXMLFastContextHandlerProperties { public: - OOXMLFastContextHandlerXNote(OOXMLFastContextHandler * pContext); + explicit OOXMLFastContextHandlerXNote(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerXNote(); void checkId(OOXMLValue::Pointer_t pValue); @@ -402,8 +399,7 @@ private: class OOXMLFastContextHandlerTextTableCell : public OOXMLFastContextHandler { public: - OOXMLFastContextHandlerTextTableCell - (OOXMLFastContextHandler * pContext); + explicit OOXMLFastContextHandlerTextTableCell(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerTextTableCell(); virtual std::string getType() const SAL_OVERRIDE { return "TextTableCell"; } @@ -415,8 +411,7 @@ public: class OOXMLFastContextHandlerTextTableRow : public OOXMLFastContextHandler { public: - OOXMLFastContextHandlerTextTableRow - (OOXMLFastContextHandler * pContext); + explicit OOXMLFastContextHandlerTextTableRow(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerTextTableRow(); virtual std::string getType() const SAL_OVERRIDE { return "TextTableRow"; } @@ -431,8 +426,7 @@ private: class OOXMLFastContextHandlerTextTable : public OOXMLFastContextHandler { public: - OOXMLFastContextHandlerTextTable - (OOXMLFastContextHandler * pContext); + explicit OOXMLFastContextHandlerTextTable(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerTextTable(); @@ -453,8 +447,7 @@ private: bool m_bShapeStarted; public: - explicit OOXMLFastContextHandlerShape - (OOXMLFastContextHandler * pContext); + explicit OOXMLFastContextHandlerShape(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerShape(); virtual std::string getType() const SAL_OVERRIDE { return "Shape"; } diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index 26c1715..35ed5e5 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -189,7 +189,7 @@ class OOXMLPropertySetValue : public OOXMLValue { OOXMLPropertySet::Pointer_t mpPropertySet; public: - OOXMLPropertySetValue(OOXMLPropertySet::Pointer_t pPropertySet); + explicit OOXMLPropertySetValue(OOXMLPropertySet::Pointer_t pPropertySet); virtual ~OOXMLPropertySetValue(); virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE; @@ -301,7 +301,7 @@ class OOXMLPropertySetEntryToString : public Properties OUString mStr; public: - OOXMLPropertySetEntryToString(Id nId); + explicit OOXMLPropertySetEntryToString(Id nId); virtual ~OOXMLPropertySetEntryToString(); virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; @@ -315,7 +315,7 @@ class OOXMLPropertySetEntryToInteger : public Properties Id mnId; int mnValue; public: - OOXMLPropertySetEntryToInteger(Id nId); + explicit OOXMLPropertySetEntryToInteger(Id nId); virtual ~OOXMLPropertySetEntryToInteger(); virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; @@ -329,7 +329,7 @@ class OOXMLPropertySetEntryToBool : public Properties Id mnId; bool mValue; public: - OOXMLPropertySetEntryToBool(Id nId); + explicit OOXMLPropertySetEntryToBool(Id nId); virtual ~OOXMLPropertySetEntryToBool(); virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits