[Libreoffice-commits] core.git: 2 commits - lotuswordpro/source mysqlc/source o3tl/qa package/source registry/source sw/qa sw/source
Caolán McNamara
caolanm at redhat.com
Thu Jun 11 06:56:40 PDT 2015
lotuswordpro/source/filter/lwpdrawobj.hxx | 8 +++----
lotuswordpro/source/filter/lwpfootnote.hxx | 2 -
lotuswordpro/source/filter/lwpframelayout.hxx | 2 -
lotuswordpro/source/filter/lwpfrib.hxx | 3 --
lotuswordpro/source/filter/lwpfribbreaks.hxx | 6 ++---
lotuswordpro/source/filter/lwpfribframe.hxx | 2 -
lotuswordpro/source/filter/lwpfribmark.hxx | 8 +++----
lotuswordpro/source/filter/lwpfribsection.hxx | 2 -
lotuswordpro/source/filter/lwpfribtable.hxx | 2 -
lotuswordpro/source/filter/lwpfribtext.hxx | 21 ++++++-------------
lotuswordpro/source/filter/lwpglobalmgr.hxx | 2 -
lotuswordpro/source/filter/lwplnopts.hxx | 2 -
lotuswordpro/source/filter/lwpnotes.hxx | 2 -
lotuswordpro/source/filter/lwpnumericfmt.hxx | 4 +--
lotuswordpro/source/filter/lwpobjfactory.hxx | 3 --
lotuswordpro/source/filter/lwpparaproperty.hxx | 19 ++++++++---------
lotuswordpro/source/filter/lwpprtinfo.hxx | 2 -
lotuswordpro/source/filter/lwpslvlist.hxx | 2 -
lotuswordpro/source/filter/lwpsortopt.hxx | 2 -
lotuswordpro/source/filter/lwptblformula.hxx | 10 ++++-----
lotuswordpro/source/filter/lwpuidoc.hxx | 2 -
lotuswordpro/source/filter/lwpusrdicts.hxx | 2 -
lotuswordpro/source/filter/tocread.hxx | 2 -
lotuswordpro/source/filter/utlist.hxx | 8 +++----
lotuswordpro/source/filter/xfilter/xfbookmark.hxx | 2 -
lotuswordpro/source/filter/xfilter/xfbreaks.hxx | 2 -
lotuswordpro/source/filter/xfilter/xfcolor.hxx | 2 -
lotuswordpro/source/filter/xfilter/xfframe.hxx | 2 -
lotuswordpro/source/filter/xfilter/xfsaxstream.hxx | 2 -
lotuswordpro/source/filter/xfilter/xfstylecont.hxx | 2 -
lotuswordpro/source/filter/xfilter/xftextcontent.hxx | 2 -
mysqlc/source/mysqlc_databasemetadata.hxx | 2 -
o3tl/qa/test-sorted_vector.cxx | 2 -
package/source/xstor/disposelistener.hxx | 2 -
package/source/xstor/ohierarchyholder.hxx | 4 +--
package/source/xstor/xfactory.hxx | 2 -
package/source/xstor/xstorage.hxx | 2 -
registry/source/reflread.cxx | 2 -
sw/qa/extras/ooxmlexport/data/ooo72950-1.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 6 +++++
sw/source/filter/ww8/docxattributeoutput.cxx | 6 ++---
41 files changed, 78 insertions(+), 82 deletions(-)
New commits:
commit f81c775b0782259c1b5504af859237fd71ac89e6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 11 14:30:18 2015 +0100
best effort export of ooo72950-1.odt to docx without crashing
the curious case of ooo72950-1.odt which has no nodes in the first line of the
table as seen from the visual layout perspective seeing as the table is split
over two columns with the second column portion of the table higher than the
left column portion
Change-Id: I38526bf80ff8cef1688aa5f5f686e437c4a3d6e5
diff --git a/sw/qa/extras/ooxmlexport/data/ooo72950-1.odt b/sw/qa/extras/ooxmlexport/data/ooo72950-1.odt
new file mode 100644
index 0000000..df0ac91
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/ooo72950-1.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 14be93e..dddbdee 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -843,6 +843,12 @@ DECLARE_OOXMLEXPORT_TEST(testKDE216114, "kde216114-1.odt")
assertXPath(pXmlDoc, "//w:pict", 1);
}
+DECLARE_OOXMLEXPORT_TEST(testOO72950, "ooo72950-1.odt")
+{
+ if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
+ assertXPath(pXmlDoc, "//w:tbl", 1);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index a0276c4..e5111e1 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -249,7 +249,7 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText
sal_uInt32 nRow = pTextNodeInfo->getRow();
sal_uInt32 nCell = pTextNodeInfo->getCell();
- if ( nRow == 0 && nCell == 0 )
+ if (nCell == 0)
{
// Do we have to start the table?
// [If we are at the right depth already, it means that we
@@ -259,14 +259,14 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText
if ( nCurrentDepth > m_tableReference->m_nTableDepth )
{
// Start all the tables that begin here
- for ( sal_uInt32 nDepth = m_tableReference->m_nTableDepth + 1; nDepth <= pTextNodeInfo->getDepth(); ++nDepth )
+ for ( sal_uInt32 nDepth = m_tableReference->m_nTableDepth + 1; nDepth <= nCurrentDepth; ++nDepth )
{
ww8::WW8TableNodeInfoInner::Pointer_t pInner( pTextNodeInfo->getInnerForDepth( nDepth ) );
StartTable( pInner );
StartTableRow( pInner );
- StartTableCell(pInner, 0, 0);
+ StartTableCell(pInner, 0, nDepth == nCurrentDepth ? nRow : 0);
}
m_tableReference->m_nTableDepth = nCurrentDepth;
commit 8a3120ced522357f53c97b051d0af6437c7a0316
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 11 11:25:08 2015 +0100
cppcheck: noExplicitConstructor
Change-Id: Id6291335945a8f10cef3afd1a2b3bae65fdf4562
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index a379478..1b899a5 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -154,7 +154,7 @@ public:
class LwpDrawGroup : public LwpDrawObj
{
public:
- LwpDrawGroup(SvStream* pStream) : LwpDrawObj(pStream) {}
+ explicit LwpDrawGroup(SvStream* pStream) : LwpDrawObj(pStream) {}
virtual ~LwpDrawGroup() {}
protected:
@@ -305,7 +305,7 @@ private:
SdwPoint m_aVector;
public:
- LwpDrawTextBox(SvStream* pStream);
+ explicit LwpDrawTextBox(SvStream* pStream);
virtual ~LwpDrawTextBox();
static void SetFontStyle(rtl::Reference<XFFont> const & pFont, SdwTextBoxRecord* pRec);
@@ -348,7 +348,7 @@ protected:
class LwpDrawMetafile : public LwpDrawObj
{
public:
- LwpDrawMetafile(SvStream* pStream);
+ explicit LwpDrawMetafile(SvStream* pStream);
virtual ~LwpDrawMetafile() {}
protected:
@@ -371,7 +371,7 @@ private:
SdwBmpRecord m_aBmpRec;
sal_uInt8* m_pImageData;
public:
- LwpDrawBitmap(SvStream* pStream);
+ explicit LwpDrawBitmap(SvStream* pStream);
virtual ~LwpDrawBitmap();
protected:
diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx
index 703249f..7db29b5 100644
--- a/lotuswordpro/source/filter/lwpfootnote.hxx
+++ b/lotuswordpro/source/filter/lwpfootnote.hxx
@@ -105,7 +105,7 @@ class LwpFribFootnote: public LwpFrib
{
public:
- LwpFribFootnote(LwpPara* pPara );
+ explicit LwpFribFootnote(LwpPara* pPara );
virtual ~LwpFribFootnote(){}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
void RegisterNewStyle();
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx
index a686377..8c86cc7 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -76,7 +76,7 @@ Mar 2005 Created
class LwpFrame
{
public:
- LwpFrame(LwpPlacableLayout* pLayout);
+ explicit LwpFrame(LwpPlacableLayout* pLayout);
~LwpFrame();
void RegisterStyle(XFFrameStyle* pFrameStyle);
void Parse(XFFrame* pXFFrame, sal_Int32 nPageNo = 0);
diff --git a/lotuswordpro/source/filter/lwpfrib.hxx b/lotuswordpro/source/filter/lwpfrib.hxx
index de50c6d..8392d83 100644
--- a/lotuswordpro/source/filter/lwpfrib.hxx
+++ b/lotuswordpro/source/filter/lwpfrib.hxx
@@ -91,11 +91,10 @@ class LwpHyperlinkMgr;
class LwpFrib
{
public:
- LwpFrib(LwpPara* pPara);
+ explicit LwpFrib(LwpPara* pPara);
virtual ~LwpFrib();
static LwpFrib* CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt8 fribtag, sal_uInt8 editID);
virtual void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
-// virtual void Parse(IXFStream* pOutputStream);
LwpFrib* GetNext(){return m_pNext;}
void SetNext(LwpFrib* next){m_pNext = next;}
sal_uInt8 GetType() { return m_nFribType;}
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.hxx b/lotuswordpro/source/filter/lwpfribbreaks.hxx
index e508089..fbbc3e5 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.hxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.hxx
@@ -72,7 +72,7 @@
class LwpFribPageBreak: public LwpFrib
{
public:
- LwpFribPageBreak( LwpPara* pPara );
+ explicit LwpFribPageBreak( LwpPara* pPara );
virtual ~LwpFribPageBreak();
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
void RegisterBreakStyle(LwpPara* pPara);
@@ -90,14 +90,14 @@ private:
class LwpFribLineBreak: public LwpFrib
{
public:
- LwpFribLineBreak( LwpPara* pPara ) : LwpFrib(pPara){}
+ explicit LwpFribLineBreak( LwpPara* pPara ) : LwpFrib(pPara){}
virtual ~LwpFribLineBreak(){}
};
class LwpFribColumnBreak: public LwpFrib
{
public:
- LwpFribColumnBreak( LwpPara* pPara ) : LwpFrib(pPara){}
+ explicit LwpFribColumnBreak( LwpPara* pPara ) : LwpFrib(pPara){}
virtual ~LwpFribColumnBreak(){}
void RegisterBreakStyle(LwpPara* pPara);
};
diff --git a/lotuswordpro/source/filter/lwpfribframe.hxx b/lotuswordpro/source/filter/lwpfribframe.hxx
index 4afcc6d..3a0649a 100644
--- a/lotuswordpro/source/filter/lwpfribframe.hxx
+++ b/lotuswordpro/source/filter/lwpfribframe.hxx
@@ -71,7 +71,7 @@
class LwpFribFrame : public LwpFrib
{
public:
- LwpFribFrame( LwpPara* pPara) : LwpFrib(pPara){}
+ explicit LwpFribFrame( LwpPara* pPara) : LwpFrib(pPara){}
virtual ~LwpFribFrame(){}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
rtl::Reference<LwpObject> GetLayout();
diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx
index cf84841..f9acf96 100644
--- a/lotuswordpro/source/filter/lwpfribmark.hxx
+++ b/lotuswordpro/source/filter/lwpfribmark.hxx
@@ -74,7 +74,7 @@
class LwpFribCHBlock : public LwpFrib
{
public:
- LwpFribCHBlock( LwpPara* pPara )
+ explicit LwpFribCHBlock( LwpPara* pPara )
: LwpFrib(pPara)
, m_nType(0)
{}
@@ -92,7 +92,7 @@ private:
class LwpFribBookMark : public LwpFrib
{
public:
- LwpFribBookMark( LwpPara* pPara );
+ explicit LwpFribBookMark( LwpPara* pPara );
virtual ~LwpFribBookMark(){}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpObjectID GetMarkerID(){return m_objMarker;}
@@ -110,7 +110,7 @@ private:
class LwpFribField : public LwpFrib
{
public:
- LwpFribField( LwpPara* pPara );
+ explicit LwpFribField( LwpPara* pPara );
virtual ~LwpFribField(){}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpFieldMark* GetMarker();
@@ -151,7 +151,7 @@ private:
class LwpFribRubyMarker : public LwpFrib
{
public:
- LwpFribRubyMarker( LwpPara* pPara );
+ explicit LwpFribRubyMarker( LwpPara* pPara );
virtual ~LwpFribRubyMarker(){}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpRubyMarker* GetMarker();
diff --git a/lotuswordpro/source/filter/lwpfribsection.hxx b/lotuswordpro/source/filter/lwpfribsection.hxx
index 75c2cfc..05f0c3d 100644
--- a/lotuswordpro/source/filter/lwpfribsection.hxx
+++ b/lotuswordpro/source/filter/lwpfribsection.hxx
@@ -111,7 +111,7 @@ class XFIndex;
class LwpFribSection: public LwpFrib
{
public:
- LwpFribSection(LwpPara* pPara );
+ explicit LwpFribSection(LwpPara* pPara );
virtual ~LwpFribSection();
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpSection * GetSection();
diff --git a/lotuswordpro/source/filter/lwpfribtable.hxx b/lotuswordpro/source/filter/lwpfribtable.hxx
index 7c24562..c9f3fd3 100644
--- a/lotuswordpro/source/filter/lwpfribtable.hxx
+++ b/lotuswordpro/source/filter/lwpfribtable.hxx
@@ -62,7 +62,7 @@ class LwpSuperTableLayout;
class LwpFribTable : public LwpFrib
{
public:
- LwpFribTable( LwpPara* pPara ) : LwpFrib(pPara){}
+ explicit LwpFribTable( LwpPara* pPara ) : LwpFrib(pPara){}
virtual ~LwpFribTable(){}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpSuperTableLayout* GetSuperTable();
diff --git a/lotuswordpro/source/filter/lwpfribtext.hxx b/lotuswordpro/source/filter/lwpfribtext.hxx
index 5be9823..0c48b9c 100644
--- a/lotuswordpro/source/filter/lwpfribtext.hxx
+++ b/lotuswordpro/source/filter/lwpfribtext.hxx
@@ -83,22 +83,21 @@ public:
class LwpFribHardSpace : public LwpFrib
{
public:
- LwpFribHardSpace( LwpPara* pPara ) : LwpFrib(pPara){}
+ explicit LwpFribHardSpace( LwpPara* pPara ) : LwpFrib(pPara){}
virtual ~LwpFribHardSpace(){}
};
class LwpFribSoftHyphen : public LwpFrib
{
public:
- LwpFribSoftHyphen( LwpPara* pPara ) : LwpFrib(pPara){}
+ explicit LwpFribSoftHyphen( LwpPara* pPara ) : LwpFrib(pPara){}
virtual ~LwpFribSoftHyphen(){}
};
-//add by , 02/03/2005
class LwpFribParaNumber : public LwpFrib
{
public:
- LwpFribParaNumber( LwpPara* pPara ) : LwpFrib(pPara),
+ explicit LwpFribParaNumber( LwpPara* pPara ) : LwpFrib(pPara),
m_nStyleID(0), m_nNumberChar(0), m_nLevel(1), m_nStart(0){}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
@@ -136,7 +135,7 @@ inline sal_uInt16 LwpFribParaNumber::GetStart() const
class LwpFribDocVar : public LwpFrib
{
public:
- LwpFribDocVar( LwpPara* pPara );
+ explicit LwpFribDocVar( LwpPara* pPara );
virtual ~LwpFribDocVar();
@@ -146,8 +145,6 @@ public:
void XFConvert(XFContentContainer* pXFPara);//add by ,05/5/27
-// inline sal_uInt16 GetType() const;
-
enum {
FILENAME = 0x02,
PATH = 0x03,
@@ -186,22 +183,18 @@ private:
void RegisterDefaultTimeStyle();
void RegisterTotalTimeStyle();
};
-//inline sal_uInt16 LwpFribDocVar::GetType() const
-//{
-// return m_nType;
-//}
class LwpFribTab : public LwpFrib
{
public:
- LwpFribTab( LwpPara* pPara ) : LwpFrib(pPara){}
+ explicit LwpFribTab( LwpPara* pPara ) : LwpFrib(pPara){}
virtual ~LwpFribTab(){}
};
class LwpFribUnicode: public LwpFrib
{
public:
- LwpFribUnicode( LwpPara* pPara ) : LwpFrib(pPara){}
+ explicit LwpFribUnicode( LwpPara* pPara ) : LwpFrib(pPara){}
virtual ~LwpFribUnicode(){}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
void XFConvert(XFContentContainer* pXFPara,LwpStory* pStory);
@@ -214,7 +207,7 @@ public:
class LwpFribPageNumber : public LwpFrib
{
public:
- LwpFribPageNumber(LwpPara* pPara) : LwpFrib(pPara),
+ explicit LwpFribPageNumber(LwpPara* pPara) : LwpFrib(pPara),
m_nNumStyle(0), m_nStartNum(1), m_nStartOnPage(1), m_nFlag(0){}
virtual ~LwpFribPageNumber(){}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
diff --git a/lotuswordpro/source/filter/lwpglobalmgr.hxx b/lotuswordpro/source/filter/lwpglobalmgr.hxx
index 066d77e..6b07509 100644
--- a/lotuswordpro/source/filter/lwpglobalmgr.hxx
+++ b/lotuswordpro/source/filter/lwpglobalmgr.hxx
@@ -90,7 +90,7 @@ public:
OUString GetEditorName(sal_uInt8 nID);
XFColor GetHighlightColor(sal_uInt8 nID);
private:
- LwpGlobalMgr(LwpSvStream* pSvStream);
+ explicit LwpGlobalMgr(LwpSvStream* pSvStream);
private:
static std::map< sal_uInt32,LwpGlobalMgr* > m_ThreadMap;
LwpObjectFactory* m_pObjFactory;
diff --git a/lotuswordpro/source/filter/lwplnopts.hxx b/lotuswordpro/source/filter/lwplnopts.hxx
index a13646d..a9a5b62 100644
--- a/lotuswordpro/source/filter/lwplnopts.hxx
+++ b/lotuswordpro/source/filter/lwplnopts.hxx
@@ -75,7 +75,7 @@
class LwpLineNumberOptions
{
public:
- LwpLineNumberOptions(LwpObjectStream* pStrm);
+ explicit LwpLineNumberOptions(LwpObjectStream* pStrm);
~LwpLineNumberOptions(){}
protected:
sal_uInt16 m_nType;
diff --git a/lotuswordpro/source/filter/lwpnotes.hxx b/lotuswordpro/source/filter/lwpnotes.hxx
index 9ab2abe..8baa1f4 100644
--- a/lotuswordpro/source/filter/lwpnotes.hxx
+++ b/lotuswordpro/source/filter/lwpnotes.hxx
@@ -74,7 +74,7 @@
class LwpFribNote: public LwpFrib
{
public:
- LwpFribNote(LwpPara* pPara );
+ explicit LwpFribNote(LwpPara* pPara );
virtual ~LwpFribNote(){}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
void RegisterNewStyle();
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index c4881f7..b450103 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -102,7 +102,7 @@ struct LwpCurrencyInfo
OUString sSymbol;
bool bPost;
bool bShowSpace;
- LwpCurrencyInfo(const OUString& sSym)
+ explicit LwpCurrencyInfo(const OUString& sSym)
{
sSymbol = sSym;
bPost = false;
@@ -248,7 +248,7 @@ private:
class LwpNumericFormat
{
public:
- LwpNumericFormat(LwpObjectStream * pStrm);
+ explicit LwpNumericFormat(LwpObjectStream * pStrm);
~LwpNumericFormat(){}
void Read();
static bool IsCurrencyFormat(sal_uInt16 Format);
diff --git a/lotuswordpro/source/filter/lwpobjfactory.hxx b/lotuswordpro/source/filter/lwpobjfactory.hxx
index 4feab65..82a3173 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.hxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.hxx
@@ -83,9 +83,8 @@
class LwpObjectFactory
{
public:
- LwpObjectFactory(LwpSvStream* pSvStream);
+ explicit LwpObjectFactory(LwpSvStream* pSvStream);
public:
-// static LwpObjectFactory* Instance(LwpSvStream* pSvStream=NULL);
~LwpObjectFactory();
//For object Factory and object manager
diff --git a/lotuswordpro/source/filter/lwpparaproperty.hxx b/lotuswordpro/source/filter/lwpparaproperty.hxx
index ab7df94f..0a9eb2c 100644
--- a/lotuswordpro/source/filter/lwpparaproperty.hxx
+++ b/lotuswordpro/source/filter/lwpparaproperty.hxx
@@ -115,8 +115,7 @@ inline LwpParaProperty* LwpParaProperty::GetPrevious()
class LwpParaAlignProperty : public LwpParaProperty
{
public:
-// LwpParaAlignProperty(LwpParaAlignProperty* pOther);
- LwpParaAlignProperty(LwpObjectStream* pFile);
+ explicit LwpParaAlignProperty(LwpObjectStream* pFile);
virtual ~LwpParaAlignProperty();
LwpAlignmentOverride* GetAlignment();
sal_uInt32 GetType() SAL_OVERRIDE;
@@ -133,7 +132,7 @@ inline LwpAlignmentOverride* LwpParaAlignProperty::GetAlignment()
class LwpParaIndentProperty : public LwpParaProperty
{
public:
- LwpParaIndentProperty(LwpObjectStream* pFile);
+ explicit LwpParaIndentProperty(LwpObjectStream* pFile);
virtual ~LwpParaIndentProperty();
LwpIndentOverride* GetIndent();
sal_uInt32 GetType() SAL_OVERRIDE;
@@ -155,7 +154,7 @@ inline LwpIndentOverride* LwpParaIndentProperty::GetIndent()
class LwpParaSpacingProperty : public LwpParaProperty
{
public:
- LwpParaSpacingProperty(LwpObjectStream* pFile);
+ explicit LwpParaSpacingProperty(LwpObjectStream* pFile);
virtual ~LwpParaSpacingProperty();
LwpSpacingOverride* GetSpacing();
sal_uInt32 GetType() SAL_OVERRIDE;
@@ -173,7 +172,7 @@ class LwpParaBorderOverride;
class LwpParaBorderProperty : public LwpParaProperty
{
public:
- LwpParaBorderProperty(LwpObjectStream* pStrm);
+ explicit LwpParaBorderProperty(LwpObjectStream* pStrm);
sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_BORDER; }
@@ -191,7 +190,7 @@ inline LwpParaBorderOverride* LwpParaBorderProperty::GetLocalParaBorder()
class LwpParaBreaksProperty : public LwpParaProperty
{
public:
- LwpParaBreaksProperty(LwpObjectStream* pStrm);
+ explicit LwpParaBreaksProperty(LwpObjectStream* pStrm);
sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_BREAKS; }
@@ -210,7 +209,7 @@ inline LwpBreaksOverride* LwpParaBreaksProperty::GetLocalParaBreaks()
class LwpParaBulletProperty : public LwpParaProperty
{
public:
- LwpParaBulletProperty(LwpObjectStream* pStrm);
+ explicit LwpParaBulletProperty(LwpObjectStream* pStrm);
virtual ~LwpParaBulletProperty();
@@ -230,7 +229,7 @@ inline LwpBulletOverride* LwpParaBulletProperty::GetLocalParaBullet()
class LwpParaNumberingProperty : public LwpParaProperty
{
public:
- LwpParaNumberingProperty(LwpObjectStream* pStrm);
+ explicit LwpParaNumberingProperty(LwpObjectStream* pStrm);
sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_NUMBERING; }
@@ -247,7 +246,7 @@ inline LwpNumberingOverride* LwpParaNumberingProperty::GetLocalNumbering() const
class LwpParaTabRackProperty : public LwpParaProperty
{
public:
- LwpParaTabRackProperty(LwpObjectStream* pStrm);
+ explicit LwpParaTabRackProperty(LwpObjectStream* pStrm);
virtual ~LwpParaTabRackProperty();
sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_TABRACK; }
@@ -265,7 +264,7 @@ inline LwpTabOverride* LwpParaTabRackProperty::GetTab()
class LwpParaBackGroundProperty : public LwpParaProperty
{
public:
- LwpParaBackGroundProperty(LwpObjectStream* pFile);
+ explicit LwpParaBackGroundProperty(LwpObjectStream* pFile);
virtual ~LwpParaBackGroundProperty();
LwpBackgroundOverride* GetBackground();
sal_uInt32 GetType() SAL_OVERRIDE;
diff --git a/lotuswordpro/source/filter/lwpprtinfo.hxx b/lotuswordpro/source/filter/lwpprtinfo.hxx
index 057a390..4fa9848 100644
--- a/lotuswordpro/source/filter/lwpprtinfo.hxx
+++ b/lotuswordpro/source/filter/lwpprtinfo.hxx
@@ -74,7 +74,7 @@
class LwpPrinterInfo
{
public:
- LwpPrinterInfo(LwpObjectStream* pStrm);
+ explicit LwpPrinterInfo(LwpObjectStream* pStrm);
~LwpPrinterInfo(){}
private:
LwpAtomHolder m_OutputFile;
diff --git a/lotuswordpro/source/filter/lwpslvlist.hxx b/lotuswordpro/source/filter/lwpslvlist.hxx
index fa8a4ae..c4037e6 100644
--- a/lotuswordpro/source/filter/lwpslvlist.hxx
+++ b/lotuswordpro/source/filter/lwpslvlist.hxx
@@ -68,7 +68,7 @@ class LwpSLVList
{
public:
LwpSLVList(){}
- LwpSLVList(LwpObjectStream* pStrm){Read(pStrm);}
+ explicit LwpSLVList(LwpObjectStream* pStrm){Read(pStrm);}
public:
void Read(LwpObjectStream* pStrm)
{
diff --git a/lotuswordpro/source/filter/lwpsortopt.hxx b/lotuswordpro/source/filter/lwpsortopt.hxx
index 81ee1d6..44aace5 100644
--- a/lotuswordpro/source/filter/lwpsortopt.hxx
+++ b/lotuswordpro/source/filter/lwpsortopt.hxx
@@ -88,7 +88,7 @@ class LwpSortOption
{
public:
LwpSortOption(){}
- LwpSortOption(LwpObjectStream* pStrm);
+ explicit LwpSortOption(LwpObjectStream* pStrm);
~LwpSortOption(){}
public:
void Read(LwpObjectStream *pStrm);
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index 8ead65c..e405958 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -122,7 +122,7 @@ public:
class LwpFormulaConst:public LwpFormulaArg
{
public:
- LwpFormulaConst( double dVal);
+ explicit LwpFormulaConst( double dVal);
virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
private:
double m_dVal;
@@ -131,7 +131,7 @@ private:
class LwpFormulaText:public LwpFormulaArg
{
public:
- LwpFormulaText( const OUString& aText);
+ explicit LwpFormulaText( const OUString& aText);
virtual OUString ToString(LwpTableLayout* /*pCellsMap*/) SAL_OVERRIDE {return m_aText;}
private:
OUString m_aText;
@@ -167,7 +167,7 @@ private:
class LwpFormulaFunc :public LwpFormulaArg
{
public:
- LwpFormulaFunc(sal_uInt16 nTokenType);
+ explicit LwpFormulaFunc(sal_uInt16 nTokenType);
virtual ~LwpFormulaFunc();
void AddArg(LwpFormulaArg* pArg);
@@ -183,14 +183,14 @@ protected:
class LwpFormulaOp : public LwpFormulaFunc
{
public:
- LwpFormulaOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
+ explicit LwpFormulaOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
};
class LwpFormulaUnaryOp : public LwpFormulaFunc
{
public:
- LwpFormulaUnaryOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
+ explicit LwpFormulaUnaryOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
};
diff --git a/lotuswordpro/source/filter/lwpuidoc.hxx b/lotuswordpro/source/filter/lwpuidoc.hxx
index 004e782..632088b 100644
--- a/lotuswordpro/source/filter/lwpuidoc.hxx
+++ b/lotuswordpro/source/filter/lwpuidoc.hxx
@@ -132,7 +132,7 @@ public:
class LwpUIDocument
{
public:
- LwpUIDocument(LwpObjectStream *pStrm);
+ explicit LwpUIDocument(LwpObjectStream *pStrm);
~LwpUIDocument();
private:
LwpNamedProperties m_NamedProps;
diff --git a/lotuswordpro/source/filter/lwpusrdicts.hxx b/lotuswordpro/source/filter/lwpusrdicts.hxx
index b0523c2..f1c8bb6 100644
--- a/lotuswordpro/source/filter/lwpusrdicts.hxx
+++ b/lotuswordpro/source/filter/lwpusrdicts.hxx
@@ -74,7 +74,7 @@ class LwpUserDictFiles
{
public:
LwpUserDictFiles(){}
- LwpUserDictFiles(LwpObjectStream *pStrm);
+ explicit LwpUserDictFiles(LwpObjectStream *pStrm);
~LwpUserDictFiles(){}
static void Read(LwpObjectStream *pStrm);
};
diff --git a/lotuswordpro/source/filter/tocread.hxx b/lotuswordpro/source/filter/tocread.hxx
index 7568bc9..03dc96b 100644
--- a/lotuswordpro/source/filter/tocread.hxx
+++ b/lotuswordpro/source/filter/tocread.hxx
@@ -61,7 +61,7 @@ namespace OpenStormBento
class CBenTOCReader
{
public: // Methods
- CBenTOCReader(pLtcBenContainer pContainer)
+ explicit CBenTOCReader(pLtcBenContainer pContainer)
: cpContainer(pContainer)
, cpTOC(NULL)
, cBlockSize(0)
diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx
index 6b05e4a..08774a9 100644
--- a/lotuswordpro/source/filter/utlist.hxx
+++ b/lotuswordpro/source/filter/utlist.hxx
@@ -72,8 +72,8 @@ public: // Methods
: cpNext(NULL)
, cpPrev(NULL)
{}
- CUtListElmt(pCUtListElmt pPrev) { InsertAfter(pPrev); }
- CUtListElmt(pCUtList pList);
+ explicit CUtListElmt(pCUtListElmt pPrev) { InsertAfter(pPrev); }
+ explicit CUtListElmt(pCUtList pList);
virtual ~CUtListElmt();
void Remove()
{
@@ -105,9 +105,9 @@ class CUtComparableListElmt : public CUtListElmt
{
public: // Methods
CUtComparableListElmt() { ; }
- CUtComparableListElmt(pCUtComparableListElmt pPrev) :
+ explicit CUtComparableListElmt(pCUtComparableListElmt pPrev) :
CUtListElmt(pPrev) { ; }
- CUtComparableListElmt(pCUtList pList) : CUtListElmt(pList) { ; }
+ explicit CUtComparableListElmt(pCUtList pList) : CUtListElmt(pList) { ; }
public: // Pure virtual methods
};
diff --git a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
index 6b8aabc..217556b 100644
--- a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
@@ -69,7 +69,7 @@
class XFBookmark : public XFContent
{
public:
- XFBookmark(bool isStart)
+ explicit XFBookmark(bool isStart)
{
m_bStart = isStart;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
index 661bf00..e94e8de 100644
--- a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
@@ -70,7 +70,7 @@ class XFBreaks
public:
XFBreaks();
- XFBreaks(enumXFBreaks breaks);
+ explicit XFBreaks(enumXFBreaks breaks);
public:
/**
diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.hxx b/lotuswordpro/source/filter/xfilter/xfcolor.hxx
index 8910a53..429e79e 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolor.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolor.hxx
@@ -78,7 +78,7 @@ public:
{
m_bValid = true;
}
- XFColor(sal_uInt32 color)
+ explicit XFColor(sal_uInt32 color)
{
unsigned int c = color&0x00ffffff;
unsigned int temp = c;
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx
index 60a27d6..d9fdb43 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx
@@ -80,7 +80,7 @@ class XFFrame : public XFContentContainer
{
public:
XFFrame();
- XFFrame(bool isTextBox);
+ explicit XFFrame(bool isTextBox);
virtual ~XFFrame();
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
index 64c6020..f2fb10d 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
@@ -81,7 +81,7 @@ class IXFAttrList;
class XFSaxStream : public IXFStream
{
public:
- XFSaxStream(css::uno::Reference<css::xml::sax::XDocumentHandler>& xHandler);
+ explicit XFSaxStream(css::uno::Reference<css::xml::sax::XDocumentHandler>& xHandler);
virtual ~XFSaxStream();
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
index 59af93e4..5757d23 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
@@ -85,7 +85,7 @@ class XFStyleContainer
public:
XFStyleContainer(){}
- XFStyleContainer(const OUString& strStyleNamePrefix);
+ explicit XFStyleContainer(const OUString& strStyleNamePrefix);
XFStyleContainer(const XFStyleContainer& other);
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
index eef5c18..319be67 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
@@ -71,7 +71,7 @@ class XFTextContent : public XFContent
public:
XFTextContent(){}
- XFTextContent(const OUString& text);
+ explicit XFTextContent(const OUString& text);
virtual ~XFTextContent();
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
index 4f4013d..3dd311f 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -64,7 +64,7 @@ namespace connectivity
public:
inline const OConnection& getOwnConnection() const { return m_rConnection; }
- ODatabaseMetaData(OConnection& _rCon);
+ explicit ODatabaseMetaData(OConnection& _rCon);
virtual ~ODatabaseMetaData();
// as I mentioned before this interface is really BIG
diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx
index 5090dee..023d9de 100644
--- a/o3tl/qa/test-sorted_vector.cxx
+++ b/o3tl/qa/test-sorted_vector.cxx
@@ -22,7 +22,7 @@ class SwContent
public:
int x;
- SwContent(int x_) : x(x_) {}
+ explicit SwContent(int x_) : x(x_) {}
bool operator<( const SwContent &rCmp) const
{
diff --git a/package/source/xstor/disposelistener.hxx b/package/source/xstor/disposelistener.hxx
index 63e5346..31ce20b 100644
--- a/package/source/xstor/disposelistener.hxx
+++ b/package/source/xstor/disposelistener.hxx
@@ -31,7 +31,7 @@ class OChildDispListener_Impl : public ::cppu::WeakImplHelper1 < ::com::sun::sta
OStorage* m_pStorage;
public:
- OChildDispListener_Impl( OStorage& aStorage );
+ explicit OChildDispListener_Impl( OStorage& aStorage );
virtual ~OChildDispListener_Impl();
void OwnerIsDisposed();
diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx
index d680b43..680b30c 100644
--- a/package/source/xstor/ohierarchyholder.hxx
+++ b/package/source/xstor/ohierarchyholder.hxx
@@ -70,7 +70,7 @@ public:
, m_xOwnStorage( xStorage )
{}
- OHierarchyElement_Impl( const ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage >& xWeakStorage )
+ explicit OHierarchyElement_Impl( const ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage >& xWeakStorage )
: m_rParent( NULL )
, m_xWeakOwnStorage( xWeakStorage )
{}
@@ -112,7 +112,7 @@ class OHierarchyHolder_Impl : public ::cppu::OWeakObject
::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage > m_xWeakOwnStorage;
::rtl::Reference< OHierarchyElement_Impl > m_xChild;
public:
- OHierarchyHolder_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xOwnStorage )
+ explicit OHierarchyHolder_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xOwnStorage )
: m_xWeakOwnStorage( xOwnStorage )
, m_xChild( new OHierarchyElement_Impl( ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage >( xOwnStorage ) ) )
{}
diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx
index b6dbe4e..8ec725b 100644
--- a/package/source/xstor/xfactory.hxx
+++ b/package/source/xstor/xfactory.hxx
@@ -31,7 +31,7 @@ class OStorageFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
public:
- OStorageFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext )
+ explicit OStorageFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext )
: m_xContext( xContext )
{
OSL_ENSURE( xContext.is(), "No service manager is provided!\n" );
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 4e1283a..d52a839 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -103,7 +103,7 @@ struct StorageHolder_Impl
OStorage* m_pPointer;
::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage > m_xWeakRef;
- inline StorageHolder_Impl( OStorage* pStorage );
+ explicit inline StorageHolder_Impl( OStorage* pStorage );
StorageHolder_Impl( const StorageHolder_Impl& aSH )
: m_pPointer( aSH.m_pPointer )
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 346fce0..8d14bf6 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -189,7 +189,7 @@ public:
sal_uInt16 m_numOfStrings;
sal_uInt16 m_stringsCopied;
- StringCache(sal_uInt16 size); // throws std::bad_alloc
+ explicit StringCache(sal_uInt16 size); // throws std::bad_alloc
~StringCache();
const sal_Unicode* getString(sal_uInt16 index);
More information about the Libreoffice-commits
mailing list