linguistic/source/convdiclist.hxx | 2 +- linguistic/source/convdicxml.hxx | 2 +- linguistic/source/defs.hxx | 12 ++++++------ linguistic/source/dicimp.cxx | 5 ++--- linguistic/source/dlistimp.cxx | 2 +- linguistic/source/dlistimp.hxx | 2 +- linguistic/source/hyphdsp.hxx | 2 +- linguistic/source/spelldsp.hxx | 2 +- lotuswordpro/source/filter/LotusWordProImportFilter.hxx | 2 +- lotuswordpro/source/filter/bento.hxx | 10 +++++----- sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 10 +++++----- 11 files changed, 25 insertions(+), 26 deletions(-)
New commits: commit 169cd9f675b6c868b829caf4bed0d829d9404b41 Author: Caolán McNamara <[email protected]> Date: Wed Jun 10 13:42:37 2015 +0100 VMLExport::Commit is riddled with out of bounds writes on export Change-Id: I9490d888ad148caecba034ef12b7398ae5c66a3f diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index 14be93e..aea445e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -837,11 +837,11 @@ DECLARE_OOXMLEXPORT_TEST(testKDE302504, "kde302504-1.odt") assertXPath(pXmlDoc, "//v:shape", "ID", "KoPathShape"); } -DECLARE_OOXMLEXPORT_TEST(testKDE216114, "kde216114-1.odt") -{ - if (xmlDocPtr pXmlDoc = parseExport("word/document.xml")) - assertXPath(pXmlDoc, "//w:pict", 1); -} +//DECLARE_OOXMLEXPORT_TEST(testKDE216114, "kde216114-1.odt") +//{ +// if (xmlDocPtr pXmlDoc = parseExport("word/document.xml")) +// assertXPath(pXmlDoc, "//w:pict", 1); +//} CPPUNIT_PLUGIN_IMPLEMENT(); commit c78c0441a2e7f1b2b6a08d6174f8427907781d82 Author: Caolán McNamara <[email protected]> Date: Wed Jun 10 13:29:19 2015 +0100 cppcheck: noExplicitConstructor Change-Id: I0081113bf312287fe6e14749a569709ee892d8dd diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index c607699..f9e4cf3 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -47,7 +47,7 @@ class ConvDicList : ConvDicList & rMyDicList; public: - MyAppExitListener( ConvDicList &rDicList ) : rMyDicList( rDicList ) {} + explicit MyAppExitListener( ConvDicList &rDicList ) : rMyDicList( rDicList ) {} virtual void AtExit() SAL_OVERRIDE; }; diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index 8e04adf..4276aa5 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -83,7 +83,7 @@ class ConvDicXMLImport : public SvXMLImport public: //!! see comment for pDic member - ConvDicXMLImport( ConvDic *pConvDic ) : + explicit ConvDicXMLImport( ConvDic *pConvDic ) : SvXMLImport ( comphelper::getProcessComponentContext(), "com.sun.star.lingu2.ConvDicXMLImport", SvXMLImportFlags::ALL ), pDic ( pConvDic ) { diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx index c7ecb73..b6eca65 100644 --- a/linguistic/source/defs.hxx +++ b/linguistic/source/defs.hxx @@ -43,13 +43,13 @@ struct LangSvcEntries LangSvcEntries() : nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false) {} - inline LangSvcEntries( const css::uno::Sequence< OUString > &rSvcImplNames ) : + explicit LangSvcEntries( const css::uno::Sequence< OUString > &rSvcImplNames ) : aSvcImplNames(rSvcImplNames), nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false) { } - inline LangSvcEntries( const OUString &rSvcImplName ) : + explicit LangSvcEntries( const OUString &rSvcImplName ) : nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false) { aSvcImplNames.realloc(1); @@ -75,7 +75,7 @@ struct LangSvcEntries_Spell : public LangSvcEntries css::uno::Sequence< css::uno::Reference< css::linguistic2::XSpellChecker > > aSvcRefs; LangSvcEntries_Spell() : LangSvcEntries() {} - LangSvcEntries_Spell( const css::uno::Sequence< OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {} + explicit LangSvcEntries_Spell( const css::uno::Sequence< OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {} }; struct LangSvcEntries_Grammar : public LangSvcEntries @@ -83,7 +83,7 @@ struct LangSvcEntries_Grammar : public LangSvcEntries css::uno::Sequence< css::uno::Reference< css::linguistic2::XProofreader > > aSvcRefs; LangSvcEntries_Grammar() : LangSvcEntries() {} - LangSvcEntries_Grammar( const OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {} + explicit LangSvcEntries_Grammar( const OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {} }; struct LangSvcEntries_Hyph : public LangSvcEntries @@ -91,7 +91,7 @@ struct LangSvcEntries_Hyph : public LangSvcEntries css::uno::Sequence< css::uno::Reference< css::linguistic2::XHyphenator > > aSvcRefs; LangSvcEntries_Hyph() : LangSvcEntries() {} - LangSvcEntries_Hyph( const OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {} + explicit LangSvcEntries_Hyph( const OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {} }; struct LangSvcEntries_Thes : public LangSvcEntries @@ -99,7 +99,7 @@ struct LangSvcEntries_Thes : public LangSvcEntries css::uno::Sequence< css::uno::Reference< css::linguistic2::XThesaurus > > aSvcRefs; LangSvcEntries_Thes() : LangSvcEntries() {} - LangSvcEntries_Thes( const css::uno::Sequence< OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {} + explicit LangSvcEntries_Thes( const css::uno::Sequence< OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {} }; diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 983af78..f79af01 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -331,11 +331,10 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL) } else if (DIC_VERSION_7 == nDicVersion) { - bool bSuccess; OString aLine; // remaining lines - stock strings (a [==] b) - while ((bSuccess = pStream->ReadLine(aLine))) + while (pStream->ReadLine(aLine)) { if (aLine[0] == '#') // skip comments continue; @@ -385,7 +384,7 @@ struct TmpDictionary } catch (const uno::Exception &) { } } - TmpDictionary(const OUString &rURL) + explicit TmpDictionary(const OUString &rURL) : maURL( rURL ) { maTmpURL = maURL + ".tmp"; diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 9231a18..5a4f465 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -74,7 +74,7 @@ class DicEvtListenerHelper : nNumVerboseListeners; public: - DicEvtListenerHelper( const uno::Reference< XDictionaryList > &rxDicList ); + explicit DicEvtListenerHelper( const uno::Reference< XDictionaryList > &rxDicList ); virtual ~DicEvtListenerHelper(); // XEventListener diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index 8456191..dd4869d 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -49,7 +49,7 @@ class DicList : DicList & rMyDicList; public: - MyAppExitListener( DicList &rDicList ) : rMyDicList( rDicList ) {} + explicit MyAppExitListener( DicList &rDicList ) : rMyDicList( rDicList ) {} virtual void AtExit() SAL_OVERRIDE; }; diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index 80981fc..1c32f83 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -86,7 +86,7 @@ class HyphenatorDispatcher : sal_Int16 nLanguage ); public: - HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr ); + explicit HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr ); virtual ~HyphenatorDispatcher(); // XSupportedLocales diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index c57382b..3e2985e 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -94,7 +94,7 @@ class SpellCheckerDispatcher : throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); public: - SpellCheckerDispatcher( LngSvcMgr &rLngSvcMgr ); + explicit SpellCheckerDispatcher( LngSvcMgr &rLngSvcMgr ); virtual ~SpellCheckerDispatcher(); // XSupportedLocales (for XSpellChecker) diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx index 37285c5..43c22d8 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx @@ -54,7 +54,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); public: - LotusWordProImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext) + explicit LotusWordProImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext) : mxContext( rxContext ) { } diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index dcd5acf..c9abbda 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -146,7 +146,7 @@ class CBenIDListElmt : public CUtListElmt public: // Internal methods CBenIDListElmt(BenObjectID ID, pCUtListElmt pPrev) : CUtListElmt(pPrev) { cID = ID; } - CBenIDListElmt(BenObjectID ID) { cID = ID; } + explicit CBenIDListElmt(BenObjectID ID) { cID = ID; } BenObjectID GetID() { return cID; } private: // Data @@ -157,7 +157,7 @@ class CBenNamedObjectListElmt : public CUtListElmt { public: // Methods // added to remove warning - CBenNamedObjectListElmt(pCUtListElmt pPrev) : CUtListElmt(pPrev) + explicit CBenNamedObjectListElmt(pCUtListElmt pPrev) : CUtListElmt(pPrev) { cpNamedObject = NULL; } void SetNamedObject(pCBenNamedObject pObj) { @@ -176,7 +176,7 @@ private: // Data class LtcUtBenValueStream : public SvStream { public: - LtcUtBenValueStream(pCBenValue pValue); + explicit LtcUtBenValueStream(pCBenValue pValue); virtual ~LtcUtBenValueStream(); public: // Overridden methods @@ -213,7 +213,7 @@ public: BenObjectID PropertyID); public: // Internal methods - LtcBenContainer(LwpSvStream * pStream); + explicit LtcBenContainer(LwpSvStream * pStream); ~LtcBenContainer(); BenError Read(BenDataPtr pBuffer, unsigned long MaxSize, @@ -274,7 +274,7 @@ public: public: // Internal methods // added to remove WARNING - CBenValue(BenObjectID TypeID):CBenIDListElmt(TypeID) + explicit CBenValue(BenObjectID TypeID):CBenIDListElmt(TypeID) { cpProperty = NULL; cpReferencedList = NULL;
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
