diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-01 15:27:02 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-03-02 07:57:37 +0200 |
commit | 5055b4ad7be50e905ebc0c032fa9f5cdc6316fc1 (patch) | |
tree | 08f87b2de669b1b1d78ead9edc21152c4ee4069e | |
parent | 1fe8e60c014df28c6d5a9bf06e868d4764e661d5 (diff) |
loplugin:unuseddefaultparam in lotuswordpro
Change-Id: I60a7a6d1b576411bea63f1616f2103ec6f126915
-rw-r--r-- | lotuswordpro/source/filter/lwpobjstrm.cxx | 24 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpobjstrm.hxx | 8 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfdatestyle.hxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfdrawobj.hxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfdrawpath.cxx | 28 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfdrawpath.hxx | 8 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xffont.hxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfframestyle.hxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xflistitem.hxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx | 6 |
10 files changed, 40 insertions, 60 deletions
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx index 6c9c09a9c15f..7dc67e747656 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.cxx +++ b/lotuswordpro/source/filter/lwpobjstrm.cxx @@ -202,12 +202,10 @@ void LwpObjectStream::Seek( sal_uInt16 pos) /** * @descr Quick read sal_Bool */ -bool LwpObjectStream::QuickReadBool(bool *pFailure) +bool LwpObjectStream::QuickReadBool() { SVBT16 aValue = {0}; - sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue)); - if (pFailure) - *pFailure = (nRead != sizeof(aValue)); + QuickRead(aValue, sizeof(aValue)); return static_cast<bool>(SVBT16ToShort(aValue)); } /** @@ -235,23 +233,19 @@ sal_uInt16 LwpObjectStream::QuickReaduInt16(bool *pFailure) /** * @descr Quick read sal_Int32 */ -sal_Int32 LwpObjectStream::QuickReadInt32(bool *pFailure) +sal_Int32 LwpObjectStream::QuickReadInt32() { SVBT32 aValue = {0}; - sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue)); - if (pFailure) - *pFailure = (nRead != sizeof(aValue)); + QuickRead(aValue, sizeof(aValue)); return static_cast<sal_Int32>(SVBT32ToUInt32(aValue)); } /** * @descr Quick read sal_Int16 */ -sal_Int16 LwpObjectStream::QuickReadInt16(bool *pFailure) +sal_Int16 LwpObjectStream::QuickReadInt16() { SVBT16 aValue = {0}; - sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue)); - if (pFailure) - *pFailure = (nRead != sizeof(aValue)); + QuickRead(aValue, sizeof(aValue)); return static_cast<sal_Int16>(SVBT16ToShort(aValue)); } @@ -269,7 +263,7 @@ sal_uInt8 LwpObjectStream::QuickReaduInt8(bool *pFailure) /** * @descr Quick read double */ -double LwpObjectStream::QuickReadDouble(bool *pFailure) +double LwpObjectStream::QuickReadDouble() { union { @@ -277,9 +271,7 @@ double LwpObjectStream::QuickReadDouble(bool *pFailure) sal_uInt8 c[8]; } s; memset(s.c, 0, sizeof(s.c)); - sal_uInt16 nRead = QuickRead(s.c, sizeof(s.c)); - if (pFailure) - *pFailure = (nRead != sizeof(s.c)); + QuickRead(s.c, sizeof(s.c)); #if defined(OSL_BIGENDIAN) for (size_t i = 0; i < 4; ++i) std::swap(s.c[i], s.c[7-i]); diff --git a/lotuswordpro/source/filter/lwpobjstrm.hxx b/lotuswordpro/source/filter/lwpobjstrm.hxx index d842485cd03f..826bd8e757b4 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.hxx +++ b/lotuswordpro/source/filter/lwpobjstrm.hxx @@ -92,13 +92,13 @@ public: void SkipExtra(); sal_uInt16 CheckExtra(); - bool QuickReadBool(bool *pFailure=nullptr); + bool QuickReadBool(); sal_uInt32 QuickReaduInt32(bool *pFailure=nullptr); sal_uInt16 QuickReaduInt16(bool *pFailure=nullptr); sal_uInt8 QuickReaduInt8(bool *pFailure=nullptr); - sal_Int32 QuickReadInt32(bool *pFailure=nullptr); - sal_Int16 QuickReadInt16(bool *pFailure=nullptr); - double QuickReadDouble(bool *pFailure=nullptr); + sal_Int32 QuickReadInt32(); + sal_Int16 QuickReadInt16(); + double QuickReadDouble(); OUString QuickReadStringPtr(); diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx index 143b00678e1e..07e5e12f1328 100644 --- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx @@ -95,7 +95,7 @@ public: void AddWeekDay( bool bLongFmt = true ); - void AddEra(bool bLongFmt = false); + void AddEra(); void AddHour( bool bLongFmt = true ); @@ -155,11 +155,11 @@ inline void XFDateStyle::AddWeekDay( bool bLongFmt ) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddEra(bool bLongFmt) +inline void XFDateStyle::AddEra() { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateEra); - part->SetLongFmt(bLongFmt); + part->SetLongFmt(false); m_aParts.AddStyle(part); } diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx index 0fa262344d67..4d19489b64a9 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx @@ -86,11 +86,11 @@ public: /** * @descr Set drawing object rotate. */ - void SetRotate(double degree, const XFPoint& rRotatePoint=XFPoint(0,0)) + void SetRotate(double degree) { m_nFlag |= XFDRAWOBJECT_FLAG_ROTATE; m_fRotate = degree*2*PI/360; - m_aRotatePoint = rRotatePoint; + m_aRotatePoint = XFPoint(0,0); } void ContentToXml(IXFStream *pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx index f125779b775f..52c8ac011765 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx @@ -81,38 +81,29 @@ XFDrawPath::XFDrawPath() { } -void XFDrawPath::MoveTo(XFPoint pt, bool absPosition) +void XFDrawPath::MoveTo(XFPoint pt) { XFSvgPathEntry entry; - if( absPosition ) - entry.SetCommand("M"); - else - entry.SetCommand("m"); + entry.SetCommand("M"); entry.AddPoint(pt); m_aPaths.push_back(entry); } -void XFDrawPath::LineTo(XFPoint pt, bool absPosition) +void XFDrawPath::LineTo(XFPoint pt) { XFSvgPathEntry entry; - if( absPosition ) - entry.SetCommand("L"); - else - entry.SetCommand("l"); + entry.SetCommand("L"); entry.AddPoint(pt); m_aPaths.push_back(entry); } -void XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, bool absPosition) +void XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2) { XFSvgPathEntry entry; - if( absPosition ) - entry.SetCommand("C"); - else - entry.SetCommand("c"); + entry.SetCommand("C"); entry.AddPoint(ctrl1); entry.AddPoint(ctrl2); entry.AddPoint(dest); @@ -120,14 +111,11 @@ void XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, bool abs m_aPaths.push_back(entry); } -void XFDrawPath::ClosePath(bool absPosition) +void XFDrawPath::ClosePath() { XFSvgPathEntry entry; - if( absPosition ) - entry.SetCommand("Z"); - else - entry.SetCommand("z"); + entry.SetCommand("Z"); m_aPaths.push_back(entry); } diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx index 584677ad1265..486672469c3a 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx @@ -107,22 +107,22 @@ public: /** * @descr Move command. */ - void MoveTo(XFPoint pt, bool absPosition = true); + void MoveTo(XFPoint pt); /** * @descr Line command. */ - void LineTo(XFPoint pt, bool absPosition = true); + void LineTo(XFPoint pt); /** * @descr Curve command. */ - void CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, bool absPosition = true); + void CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2); /** * @descr Close path command. */ - void ClosePath(bool absPosition = true); + void ClosePath(); virtual void ToXml(IXFStream *pStrm) override; diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/source/filter/xfilter/xffont.hxx index d7ada0605cad..95ecbfa2fb84 100644 --- a/lotuswordpro/source/filter/xfilter/xffont.hxx +++ b/lotuswordpro/source/filter/xfilter/xffont.hxx @@ -189,7 +189,7 @@ public: /** * @descr Set crossout. */ - void SetCrossout(enumXFCrossout cross,bool wordByWord=false); + void SetCrossout(enumXFCrossout cross); /** * @descr Set font transform type,pls refer to enumXFTransform. @@ -354,10 +354,10 @@ inline void XFFont::SetUnderline(enumXFUnderline underline, bool wordByWord) m_nFlag |= XFFONT_FLAG_UNDERLINE; } -inline void XFFont::SetCrossout(enumXFCrossout cross, bool wordByWord) +inline void XFFont::SetCrossout(enumXFCrossout cross) { m_eCrossout = cross; - m_bWordByWord = wordByWord; + m_bWordByWord = false; m_nFlag |= XFFONT_FLAG_CROSSOUT; } diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx index 838d861b48c1..e75625858e4d 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx @@ -84,7 +84,7 @@ public: virtual ~XFFrameStyle(); public: - void SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs = 0); + void SetWrapType(enumXFWrap wrap); /** * @descr: space between frame and paragraph text. @@ -172,7 +172,7 @@ protected: enumXFFrameYRel m_eYRel; }; -inline void XFFrameStyle::SetWrapType(enumXFWrap wrap, sal_Int32 /*nParagraphs*/) +inline void XFFrameStyle::SetWrapType(enumXFWrap wrap) { m_eWrap = wrap; } diff --git a/lotuswordpro/source/filter/xfilter/xflistitem.hxx b/lotuswordpro/source/filter/xfilter/xflistitem.hxx index d0e1a075a6d4..65ce1e83e43f 100644 --- a/lotuswordpro/source/filter/xfilter/xflistitem.hxx +++ b/lotuswordpro/source/filter/xfilter/xflistitem.hxx @@ -70,7 +70,7 @@ public: XFListItem(); public: - void SetIsHeader(bool isHeader=true); + void SetIsHeader(); virtual void ToXml(IXFStream *pStrm) override; @@ -83,9 +83,9 @@ inline XFListItem::XFListItem() m_bIsHeader = false; } -inline void XFListItem::SetIsHeader(bool isHeader) +inline void XFListItem::SetIsHeader() { - m_bIsHeader = isHeader; + m_bIsHeader = true; } inline void XFListItem::ToXml(IXFStream *pStrm) diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx index 57e710d00a49..7848d44a76ce 100644 --- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx @@ -73,7 +73,7 @@ public: public: void SetDecimalDigits(sal_Int32 decimal); - void SetGroup(bool group = true); + void SetGroup(); void SetColor(const XFColor& color); XFColor GetColor(){return m_aColor;} @@ -134,9 +134,9 @@ inline void XFNumberStyle::SetNegativeStyle(const OUString& prefix, const OUStri m_strNegativeSuffix = suffix; } -inline void XFNumberStyle::SetGroup(bool group) +inline void XFNumberStyle::SetGroup() { - m_bGroup = group; + m_bGroup = true; } inline void XFNumberStyle::SetColor(const XFColor& color) |