mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:unuseddefaultparam in lotuswordpro

Browse Source 
Change-Id: I60a7a6d1b576411bea63f1616f2103ec6f126915
This commit is contained in:
Noel Grandin
2016-03-01 15:27:02 +02:00
parent 1fe8e60c01
commit 5055b4ad7b
10 changed files with 40 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lotuswordpro/source/filter/lwpobjstrm.cxx
View File

@@ -202,12 +202,10 @@ void LwpObjectStream::Seek( sal_uInt16 pos)
/** /**
* @descr Quick read sal_Bool * @descr Quick read sal_Bool
*/ */
bool LwpObjectStream::QuickReadBool(bool *pFailure) bool LwpObjectStream::QuickReadBool()
{ {
SVBT16 aValue = {0}; SVBT16 aValue = {0};
sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue)); QuickRead(aValue, sizeof(aValue));
if (pFailure)
*pFailure = (nRead != sizeof(aValue));
return static_cast<bool>(SVBT16ToShort(aValue)); return static_cast<bool>(SVBT16ToShort(aValue));
} }
/** /**
@@ -235,23 +233,19 @@ sal_uInt16 LwpObjectStream::QuickReaduInt16(bool *pFailure)
/** /**
* @descr Quick read sal_Int32 * @descr Quick read sal_Int32
*/ */
sal_Int32 LwpObjectStream::QuickReadInt32(bool *pFailure) sal_Int32 LwpObjectStream::QuickReadInt32()
{ {
SVBT32 aValue = {0}; SVBT32 aValue = {0};
sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue)); QuickRead(aValue, sizeof(aValue));
if (pFailure)
*pFailure = (nRead != sizeof(aValue));
return static_cast<sal_Int32>(SVBT32ToUInt32(aValue)); return static_cast<sal_Int32>(SVBT32ToUInt32(aValue));
} }
/** /**
* @descr Quick read sal_Int16 * @descr Quick read sal_Int16
*/ */
sal_Int16 LwpObjectStream::QuickReadInt16(bool *pFailure) sal_Int16 LwpObjectStream::QuickReadInt16()
{ {
SVBT16 aValue = {0}; SVBT16 aValue = {0};
sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue)); QuickRead(aValue, sizeof(aValue));
if (pFailure)
*pFailure = (nRead != sizeof(aValue));
return static_cast<sal_Int16>(SVBT16ToShort(aValue)); return static_cast<sal_Int16>(SVBT16ToShort(aValue));
} }
@@ -269,7 +263,7 @@ sal_uInt8 LwpObjectStream::QuickReaduInt8(bool *pFailure)
/** /**
* @descr Quick read double * @descr Quick read double
*/ */
double LwpObjectStream::QuickReadDouble(bool *pFailure) double LwpObjectStream::QuickReadDouble()
{ {
union union
{ {
@@ -277,9 +271,7 @@ double LwpObjectStream::QuickReadDouble(bool *pFailure)
sal_uInt8 c[8]; sal_uInt8 c[8];
} s; } s;
memset(s.c, 0, sizeof(s.c)); memset(s.c, 0, sizeof(s.c));
sal_uInt16 nRead = QuickRead(s.c, sizeof(s.c)); QuickRead(s.c, sizeof(s.c));
if (pFailure)
*pFailure = (nRead != sizeof(s.c));
#if defined(OSL_BIGENDIAN) #if defined(OSL_BIGENDIAN)
for (size_t i = 0; i < 4; ++i) for (size_t i = 0; i < 4; ++i)
std::swap(s.c[i], s.c[7-i]); std::swap(s.c[i], s.c[7-i]);

8
lotuswordpro/source/filter/lwpobjstrm.hxx
View File

@@ -92,13 +92,13 @@ public:
void SkipExtra(); void SkipExtra();
sal_uInt16 CheckExtra(); sal_uInt16 CheckExtra();
bool QuickReadBool(bool *pFailure=nullptr); bool QuickReadBool();
sal_uInt32 QuickReaduInt32(bool *pFailure=nullptr); sal_uInt32 QuickReaduInt32(bool *pFailure=nullptr);
sal_uInt16 QuickReaduInt16(bool *pFailure=nullptr); sal_uInt16 QuickReaduInt16(bool *pFailure=nullptr);
sal_uInt8 QuickReaduInt8(bool *pFailure=nullptr); sal_uInt8 QuickReaduInt8(bool *pFailure=nullptr);
sal_Int32 QuickReadInt32(bool *pFailure=nullptr); sal_Int32 QuickReadInt32();
sal_Int16 QuickReadInt16(bool *pFailure=nullptr); sal_Int16 QuickReadInt16();
double QuickReadDouble(bool *pFailure=nullptr); double QuickReadDouble();
OUString QuickReadStringPtr(); OUString QuickReadStringPtr();

6
lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
View File

@@ -95,7 +95,7 @@ public:
void AddWeekDay( bool bLongFmt = true ); void AddWeekDay( bool bLongFmt = true );
void AddEra(bool bLongFmt = false); void AddEra();
void AddHour( bool bLongFmt = true ); void AddHour( bool bLongFmt = true );
@@ -155,11 +155,11 @@ inline void XFDateStyle::AddWeekDay( bool bLongFmt )
m_aParts.AddStyle(part); m_aParts.AddStyle(part);
} }
inline void XFDateStyle::AddEra(bool bLongFmt) inline void XFDateStyle::AddEra()
{ {
XFDatePart *part = new XFDatePart(); XFDatePart *part = new XFDatePart();
part->SetPartType(enumXFDateEra); part->SetPartType(enumXFDateEra);
part->SetLongFmt(bLongFmt); part->SetLongFmt(false);
m_aParts.AddStyle(part); m_aParts.AddStyle(part);
} }

4
lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
View File

@@ -86,11 +86,11 @@ public:
/** /**
* @descr Set drawing object rotate. * @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_nFlag |= XFDRAWOBJECT_FLAG_ROTATE;
m_fRotate = degree*2*PI/360; m_fRotate = degree*2*PI/360;
m_aRotatePoint = rRotatePoint; m_aRotatePoint = XFPoint(0,0);
} }
void ContentToXml(IXFStream *pStrm); void ContentToXml(IXFStream *pStrm);

20
lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
View File

@@ -81,38 +81,29 @@ XFDrawPath::XFDrawPath()
{ {
} }
void XFDrawPath::MoveTo(XFPoint pt, bool absPosition) void XFDrawPath::MoveTo(XFPoint pt)
{ {
XFSvgPathEntry entry; XFSvgPathEntry entry;
if( absPosition )
entry.SetCommand("M"); entry.SetCommand("M");
else
entry.SetCommand("m");
entry.AddPoint(pt); entry.AddPoint(pt);
m_aPaths.push_back(entry); m_aPaths.push_back(entry);
} }
void XFDrawPath::LineTo(XFPoint pt, bool absPosition) void XFDrawPath::LineTo(XFPoint pt)
{ {
XFSvgPathEntry entry; XFSvgPathEntry entry;
if( absPosition )
entry.SetCommand("L"); entry.SetCommand("L");
else
entry.SetCommand("l");
entry.AddPoint(pt); entry.AddPoint(pt);
m_aPaths.push_back(entry); 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; XFSvgPathEntry entry;
if( absPosition )
entry.SetCommand("C"); entry.SetCommand("C");
else
entry.SetCommand("c");
entry.AddPoint(ctrl1); entry.AddPoint(ctrl1);
entry.AddPoint(ctrl2); entry.AddPoint(ctrl2);
entry.AddPoint(dest); entry.AddPoint(dest);
@@ -120,14 +111,11 @@ void XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, bool abs
m_aPaths.push_back(entry); m_aPaths.push_back(entry);
} }
void XFDrawPath::ClosePath(bool absPosition) void XFDrawPath::ClosePath()
{ {
XFSvgPathEntry entry; XFSvgPathEntry entry;
if( absPosition )
entry.SetCommand("Z"); entry.SetCommand("Z");
else
entry.SetCommand("z");
m_aPaths.push_back(entry); m_aPaths.push_back(entry);
} }

8
lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
View File

@@ -107,22 +107,22 @@ public:
/** /**
* @descr Move command. * @descr Move command.
*/ */
void MoveTo(XFPoint pt, bool absPosition = true); void MoveTo(XFPoint pt);
/** /**
* @descr Line command. * @descr Line command.
*/ */
void LineTo(XFPoint pt, bool absPosition = true); void LineTo(XFPoint pt);
/** /**
* @descr Curve command. * @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. * @descr Close path command.
*/ */
void ClosePath(bool absPosition = true); void ClosePath();
virtual void ToXml(IXFStream *pStrm) override; virtual void ToXml(IXFStream *pStrm) override;

6
lotuswordpro/source/filter/xfilter/xffont.hxx
View File

@@ -189,7 +189,7 @@ public:
/** /**
* @descr Set crossout. * @descr Set crossout.
*/ */
void SetCrossout(enumXFCrossout cross,bool wordByWord=false); void SetCrossout(enumXFCrossout cross);
/** /**
* @descr Set font transform type,pls refer to enumXFTransform. * @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; m_nFlag |= XFFONT_FLAG_UNDERLINE;
} }
inline void XFFont::SetCrossout(enumXFCrossout cross, bool wordByWord) inline void XFFont::SetCrossout(enumXFCrossout cross)
{ {
m_eCrossout = cross; m_eCrossout = cross;
m_bWordByWord = wordByWord; m_bWordByWord = false;
m_nFlag |= XFFONT_FLAG_CROSSOUT; m_nFlag |= XFFONT_FLAG_CROSSOUT;
} }

4
lotuswordpro/source/filter/xfilter/xfframestyle.hxx
View File

@@ -84,7 +84,7 @@ public:
virtual ~XFFrameStyle(); virtual ~XFFrameStyle();
public: public:
void SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs = 0); void SetWrapType(enumXFWrap wrap);
/** /**
* @descr: space between frame and paragraph text. * @descr: space between frame and paragraph text.
@@ -172,7 +172,7 @@ protected:
enumXFFrameYRel m_eYRel; enumXFFrameYRel m_eYRel;
}; };
inline void XFFrameStyle::SetWrapType(enumXFWrap wrap, sal_Int32 /*nParagraphs*/) inline void XFFrameStyle::SetWrapType(enumXFWrap wrap)
{ {
m_eWrap = wrap; m_eWrap = wrap;
} }

6
lotuswordpro/source/filter/xfilter/xflistitem.hxx
View File

@@ -70,7 +70,7 @@ public:
XFListItem(); XFListItem();
public: public:
void SetIsHeader(bool isHeader=true); void SetIsHeader();
virtual void ToXml(IXFStream *pStrm) override; virtual void ToXml(IXFStream *pStrm) override;
@@ -83,9 +83,9 @@ inline XFListItem::XFListItem()
m_bIsHeader = false; 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) inline void XFListItem::ToXml(IXFStream *pStrm)

6
lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
View File

@@ -73,7 +73,7 @@ public:
public: public:
void SetDecimalDigits(sal_Int32 decimal); void SetDecimalDigits(sal_Int32 decimal);
void SetGroup(bool group = true); void SetGroup();
void SetColor(const XFColor& color); void SetColor(const XFColor& color);
XFColor GetColor(){return m_aColor;} XFColor GetColor(){return m_aColor;}
@@ -134,9 +134,9 @@ inline void XFNumberStyle::SetNegativeStyle(const OUString& prefix, const OUStri
m_strNegativeSuffix = suffix; 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) inline void XFNumberStyle::SetColor(const XFColor& color)