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

loplugin:constantparam in lotuswordpro

Browse Source 
Change-Id: I09c2301adb674fbed68a2659f828c7501a90b0c6
This commit is contained in:
Noel Grandin
2016-03-23 09:40:09 +02:00
parent de0e1e7d4b
commit b6fc1f033f
16 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lotuswordpro/source/filter/lwpdrawobj.cxx
View File

@@ -252,7 +252,7 @@ void LwpDrawObj::SetLineStyle(XFDrawStyle* pStyle, sal_uInt8 nWidth, sal_uInt8 n
if (nLineStyle == LS_DOT) if (nLineStyle == LS_DOT)
{ {
pStyle->SetLineDashStyle(enumXFLineDash, 1, 1, 0.05, 0.05, 0.05); pStyle->SetLineDashStyle(enumXFLineDash, 0.05, 0.05, 0.05);
} }
// line width // line width
@@ -317,11 +317,11 @@ void LwpDrawObj::SetArrowHead(XFDrawStyle* pOpenedObjStyle, sal_uInt8 nArrowFlag
if (nLeftArrow) if (nLeftArrow)
{ {
pOpenedObjStyle->SetArrowStart( GetArrowName(nLeftArrow), fArrowSize, true); pOpenedObjStyle->SetArrowStart( GetArrowName(nLeftArrow), fArrowSize);
} }
if (nRightArrow) if (nRightArrow)
{ {
pOpenedObjStyle->SetArrowEnd( GetArrowName(nRightArrow), fArrowSize, true); pOpenedObjStyle->SetArrowEnd( GetArrowName(nRightArrow), fArrowSize);
} }
} }

2
lotuswordpro/source/filter/lwpfont.cxx
View File

@@ -236,7 +236,7 @@ void LwpFontTableEntry::RegisterFontDecl()
{ {
if(m_FaceName.str().isEmpty()) return; if(m_FaceName.str().isEmpty()) return;
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
XFFontDecl aFontDecl1( m_FaceName.str(), m_FaceName.str(), false ); XFFontDecl aFontDecl1( m_FaceName.str(), m_FaceName.str() );
pXFStyleManager->AddFontDecl(aFontDecl1); pXFStyleManager->AddFontDecl(aFontDecl1);
} }

14
lotuswordpro/source/filter/lwpfribmark.cxx
View File

@@ -436,7 +436,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
pDateStyle->AddText(":"); pDateStyle->AddText(":");
pDateStyle->AddMinute(); pDateStyle->AddMinute();
pDateStyle->AddText(":"); pDateStyle->AddText(":");
pDateStyle->AddSecond(true,0); pDateStyle->AddSecond();
} }
else if (sFormula == "%FLM/D/YY") else if (sFormula == "%FLM/D/YY")
{ {
@@ -887,7 +887,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
pTimeStyle->AddText(":"); pTimeStyle->AddText(":");
pTimeStyle->AddMinute(); pTimeStyle->AddMinute();
pTimeStyle->AddText(":"); pTimeStyle->AddText(":");
pTimeStyle->AddSecond(true,0); pTimeStyle->AddSecond();
} }
else if (sFormula == "%FLH:mm ampm") else if (sFormula == "%FLH:mm ampm")
{ {
@@ -912,7 +912,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
pTimeStyle->AddText(":"); pTimeStyle->AddText(":");
pTimeStyle->AddMinute(); pTimeStyle->AddMinute();
pTimeStyle->AddText(":"); pTimeStyle->AddText(":");
pTimeStyle->AddSecond(true,0); pTimeStyle->AddSecond();
pTimeStyle->AddText(" "); pTimeStyle->AddText(" ");
pTimeStyle->SetAmPm(true); pTimeStyle->SetAmPm(true);
} }
@@ -923,7 +923,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
pTimeStyle->AddText(":"); pTimeStyle->AddText(":");
pTimeStyle->AddMinute(); pTimeStyle->AddMinute();
pTimeStyle->AddText(":"); pTimeStyle->AddText(":");
pTimeStyle->AddSecond(true,0); pTimeStyle->AddSecond();
} }
else if (sFormula == "%FLH ampm") else if (sFormula == "%FLH ampm")
{ {
@@ -945,7 +945,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
else if (sFormula == "%FLSS") else if (sFormula == "%FLSS")
{ {
pTimeStyle = new XFTimeStyle; pTimeStyle = new XFTimeStyle;
pTimeStyle->AddSecond(true,0); pTimeStyle->AddSecond();
} }
else if (sFormula == "%FLampm") else if (sFormula == "%FLampm")
{ {
@@ -1002,7 +1002,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
pTimeStyle->AddText(":"); pTimeStyle->AddText(":");
pTimeStyle->AddMinute(); pTimeStyle->AddMinute();
pTimeStyle->AddText(":"); pTimeStyle->AddText(":");
pTimeStyle->AddSecond(true,0); pTimeStyle->AddSecond();
pTimeStyle->AddText(" "); pTimeStyle->AddText(" ");
pTimeStyle->SetAmPm(true); pTimeStyle->SetAmPm(true);
} }
@@ -1020,7 +1020,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
pTimeStyle->AddText(":"); pTimeStyle->AddText(":");
pTimeStyle->AddMinute(); pTimeStyle->AddMinute();
pTimeStyle->AddText(":"); pTimeStyle->AddText(":");
pTimeStyle->AddSecond(true,0); pTimeStyle->AddSecond();
} }
//other version end //other version end
} }

2
lotuswordpro/source/filter/lwpfribtext.cxx
View File

@@ -194,7 +194,7 @@ void LwpFribDocVar::RegisterDefaultTimeStyle()
pDateStyle->AddText(":"); pDateStyle->AddText(":");
pDateStyle->AddMinute(); pDateStyle->AddMinute();
pDateStyle->AddText(":"); pDateStyle->AddText(":");
pDateStyle->AddSecond(true,0); pDateStyle->AddSecond();
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
m_TimeStyle = pXFStyleManager->AddStyle(pDateStyle).m_pStyle->GetStyleName(); m_TimeStyle = pXFStyleManager->AddStyle(pDateStyle).m_pStyle->GetStyleName();

4
lotuswordpro/source/filter/lwpobjid.cxx
View File

@@ -63,8 +63,8 @@
#include "lwpobjfactory.hxx" #include "lwpobjfactory.hxx"
#include "lwpglobalmgr.hxx" #include "lwpglobalmgr.hxx"
LwpObjectID::LwpObjectID(sal_uInt32 low, sal_uInt16 high) LwpObjectID::LwpObjectID()
:m_nLow(low), m_nHigh(high), m_nIndex(0), m_bIsCompressed(false) :m_nLow(0), m_nHigh(0), m_nIndex(0), m_bIsCompressed(false)
{ {
} }
/** /**

2
lotuswordpro/source/filter/lwpobjid.hxx
View File

@@ -77,7 +77,7 @@ class LwpObject;
class LwpObjectID class LwpObjectID
{ {
public: public:
LwpObjectID(sal_uInt32 low=0, sal_uInt16 high=0); LwpObjectID();
private: private:
sal_uInt32 m_nLow; sal_uInt32 m_nLow;
sal_uInt16 m_nHigh; sal_uInt16 m_nHigh;

6
lotuswordpro/source/filter/lwpparastyle.cxx
View File

@@ -271,20 +271,20 @@ void LwpParaStyle::ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff::
break; break;
case 0x15: //double , fall through! case 0x15: //double , fall through!
case 0x16: //thick double case 0x16: //thick double
pXFBorders->SetDoubleLine(eXFBorderSide, true, false); pXFBorders->SetDoubleLine(eXFBorderSide);
pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.333)); pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.333));
pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.334)); pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.334));
pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.333)); pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.333));
// pXFBorders->SetWidth(eXFBorderSide, fWidth); // pXFBorders->SetWidth(eXFBorderSide, fWidth);
break; break;
case 0x18: //thick-thin case 0x18: //thick-thin
pXFBorders->SetDoubleLine(eXFBorderSide, true, false); pXFBorders->SetDoubleLine(eXFBorderSide);
pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.5)); pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.5));
pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.25)); pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.25));
pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.25)); pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.25));
break; break;
case 0x19: //thin-thick case 0x19: //thin-thick
pXFBorders->SetDoubleLine(eXFBorderSide, true, false); pXFBorders->SetDoubleLine(eXFBorderSide);
pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.7)); pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.7));
pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.15)); pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.15));
pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.15)); pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.15));

8
lotuswordpro/source/filter/lwptools.cxx
View File

@@ -410,9 +410,9 @@ XFDateStyle* LwpTools::GetSystemDateStyle(bool bLongFormat)
} }
} }
if (j==1) if (j==1)
pDateStyle->AddSecond(false,0); pDateStyle->AddSecond(false);
else else
pDateStyle->AddSecond(true,0); pDateStyle->AddSecond();
break; break;
} }
case 'S': case 'S':
@@ -731,9 +731,9 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
} }
} }
if (j==1) if (j==1)
pTimeStyle->AddSecond(false,0); pTimeStyle->AddSecond(false);
else else
pTimeStyle->AddSecond(true,0); pTimeStyle->AddSecond();
break; break;
} }
case 'S': case 'S':

10
lotuswordpro/source/filter/xfilter/xfborders.cxx
View File

@@ -227,21 +227,21 @@ void XFBorders::SetWidth(enumXFBorder side, double width)
} }
} }
void XFBorders::SetDoubleLine(enumXFBorder side, bool dual,bool bSameWidth) void XFBorders::SetDoubleLine(enumXFBorder side)
{ {
switch(side) switch(side)
{ {
case enumXFBorderLeft: case enumXFBorderLeft:
m_aBorderLeft.SetDoubleLine(dual,bSameWidth); m_aBorderLeft.SetDoubleLine(true/*dual*/,false/*bSameWidth*/);
break; break;
case enumXFBorderRight: case enumXFBorderRight:
m_aBorderRight.SetDoubleLine(dual,bSameWidth); m_aBorderRight.SetDoubleLine(true/*dual*/,false/*bSameWidth*/);
break; break;
case enumXFBorderTop: case enumXFBorderTop:
m_aBorderTop.SetDoubleLine(dual,bSameWidth); m_aBorderTop.SetDoubleLine(true/*dual*/,false/*bSameWidth*/);
break; break;
case enumXFBorderBottom: case enumXFBorderBottom:
m_aBorderBottom.SetDoubleLine(dual,bSameWidth); m_aBorderBottom.SetDoubleLine(true/*dual*/,false/*bSameWidth*/);
break; break;
default: default:
break; break;

3
lotuswordpro/source/filter/xfilter/xfborders.hxx
View File

@@ -148,9 +148,8 @@ public:
/** /**
* @descr Set border side as double line. * @descr Set border side as double line.
* @param bSameWidth whether two borders are same width.
*/ */
void SetDoubleLine(enumXFBorder side, bool dual,bool bSameWidth); void SetDoubleLine(enumXFBorder side);
/** /**
* @descr Set inner border with of border side. * @descr Set inner border with of border side.

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

@@ -101,7 +101,7 @@ public:
void AddMinute( bool bLongFmt = true ); void AddMinute( bool bLongFmt = true );
void AddSecond( bool bLongFmt = true, sal_Int16 nDecimalPos = 2); void AddSecond( bool bLongFmt = true );
void AddAmPm(); void AddAmPm();
@@ -187,12 +187,12 @@ inline void XFDateStyle::AddMinute( bool bLongFmt )
m_aParts.AddStyle(part); m_aParts.AddStyle(part);
} }
inline void XFDateStyle::AddSecond( bool bLongFmt, sal_Int16 pos) inline void XFDateStyle::AddSecond( bool bLongFmt )
{ {
XFDatePart *part = new XFDatePart(); XFDatePart *part = new XFDatePart();
part->SetPartType(enumXFDateSecond); part->SetPartType(enumXFDateSecond);
part->SetLongFmt(bLongFmt); part->SetLongFmt(bLongFmt);
part->SetDecimalPos(pos); part->SetDecimalPos(0);
m_aParts.AddStyle(part); m_aParts.AddStyle(part);
} }

10
lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
View File

@@ -89,7 +89,7 @@ XFDrawStyle::~XFDrawStyle()
} }
} }
void XFDrawStyle::SetLineStyle(double width, XFColor color, sal_Int32 transparency) void XFDrawStyle::SetLineStyle(double width, XFColor color)
{ {
if( !m_pLineStyle ) if( !m_pLineStyle )
{ {
@@ -98,10 +98,10 @@ void XFDrawStyle::SetLineStyle(double width, XFColor color, sal_Int32 transpa
} }
m_pLineStyle->SetWidth(width); m_pLineStyle->SetWidth(width);
m_pLineStyle->SetColor(color); m_pLineStyle->SetColor(color);
m_pLineStyle->SetTransparency(transparency); m_pLineStyle->SetTransparency(0);
} }
void XFDrawStyle::SetLineDashStyle(enumXFLineStyle style, int num1, int num2, double len1, double len2, double space ) void XFDrawStyle::SetLineDashStyle(enumXFLineStyle style, double len1, double len2, double space )
{ {
if( !m_pLineStyle ) if( !m_pLineStyle )
{ {
@@ -109,9 +109,9 @@ void XFDrawStyle::SetLineDashStyle(enumXFLineStyle style, int num1, int num2,
m_pLineStyle->SetStyleName( XFGlobal::GenStrokeDashName()); m_pLineStyle->SetStyleName( XFGlobal::GenStrokeDashName());
} }
m_pLineStyle->SetLineStyle(style); m_pLineStyle->SetLineStyle(style);
m_pLineStyle->SetDot1Number(num1); m_pLineStyle->SetDot1Number(1);
m_pLineStyle->SetDot1Length(len1); m_pLineStyle->SetDot1Length(len1);
m_pLineStyle->SetDot2Number(num2); m_pLineStyle->SetDot2Number(1);
m_pLineStyle->SetDot2Length(len2); m_pLineStyle->SetDot2Length(len2);
m_pLineStyle->SetSpace(space); m_pLineStyle->SetSpace(space);
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();

16
lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
View File

@@ -86,12 +86,12 @@ public:
/** /**
* @descr Set drawing object border line. * @descr Set drawing object border line.
*/ */
void SetLineStyle(double width, XFColor color = XFColor(0,0,0), sal_Int32 transparency = 0); void SetLineStyle(double width, XFColor color = XFColor(0,0,0));
/** /**
* @descr Set drawing object dash border style. * @descr Set drawing object dash border style.
*/ */
void SetLineDashStyle(enumXFLineStyle style, int num1, int num2, double len1, double len2, double space ); void SetLineDashStyle(enumXFLineStyle style, double len1, double len2, double space );
/** /**
* @descr Set drawing object area fill color. * @descr Set drawing object area fill color.
@@ -106,12 +106,12 @@ public:
/** /**
* @descr Set drawing object arrow start style,only lines can have arrows. * @descr Set drawing object arrow start style,only lines can have arrows.
*/ */
void SetArrowStart(const OUString& start, double size=0.3, bool center = false); void SetArrowStart(const OUString& start, double size=0.3);
/** /**
* @descr Set drawing object arrow end style,only lines can have arrows. * @descr Set drawing object arrow end style,only lines can have arrows.
*/ */
void SetArrowEnd(const OUString& end, double size=0.3, bool center = false); void SetArrowEnd(const OUString& end, double size=0.3);
void SetFontWorkStyle(enumXFFWStyle eStyle, enumXFFWAdjust eAdjust); void SetFontWorkStyle(enumXFFWStyle eStyle, enumXFFWAdjust eAdjust);
@@ -133,20 +133,20 @@ private:
bool m_bArrowEndCenter; bool m_bArrowEndCenter;
}; };
inline void XFDrawStyle::SetArrowStart(const OUString& start, double size, bool center) inline void XFDrawStyle::SetArrowStart(const OUString& start, double size)
{ {
assert(size>0); assert(size>0);
m_strArrowStart = start; m_strArrowStart = start;
m_fArrowStartSize = size; m_fArrowStartSize = size;
m_bArrowStartCenter = center; m_bArrowStartCenter = true;
} }
inline void XFDrawStyle::SetArrowEnd(const OUString& end, double size, bool center) inline void XFDrawStyle::SetArrowEnd(const OUString& end, double size)
{ {
assert(size>0); assert(size>0);
m_strArrowEnd = end; m_strArrowEnd = end;
m_fArrowEndSize = size; m_fArrowEndSize = size;
m_bArrowEndCenter = center; m_bArrowEndCenter = true;
} }
#endif #endif

4
lotuswordpro/source/filter/xfilter/xffontdecl.cxx
View File

@@ -59,11 +59,11 @@
************************************************************************/ ************************************************************************/
#include "xffontdecl.hxx" #include "xffontdecl.hxx"
XFFontDecl::XFFontDecl(const OUString& name, const OUString& family, bool fixed) XFFontDecl::XFFontDecl(const OUString& name, const OUString& family)
{ {
m_strFontName = name; m_strFontName = name;
m_strFontFamily = family; m_strFontFamily = family;
m_bPitchFixed = fixed; m_bPitchFixed = false;
} }

2
lotuswordpro/source/filter/xfilter/xffontdecl.hxx
View File

@@ -71,7 +71,7 @@
class XFFontDecl class XFFontDecl
{ {
public: public:
XFFontDecl(const OUString& name, const OUString& family, bool fixed = false); XFFontDecl(const OUString& name, const OUString& family);
public: public:
/** /**

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

@@ -115,7 +115,7 @@ public:
void AddMinute( bool bLongFmt = true ); void AddMinute( bool bLongFmt = true );
void AddSecond( bool bLongFmt = true, sal_Int16 nDecimalPos = 2); void AddSecond( bool bLongFmt = true );
void SetAmPm(bool bAmPm); void SetAmPm(bool bAmPm);
@@ -170,12 +170,12 @@ inline void XFTimeStyle::AddMinute( bool bLongFmt )
m_aParts.push_back(part); m_aParts.push_back(part);
} }
inline void XFTimeStyle::AddSecond( bool bLongFmt, sal_Int16 pos) inline void XFTimeStyle::AddSecond( bool bLongFmt )
{ {
XFTimePart part; XFTimePart part;
part.SetPartType(enumXFDateSecond); part.SetPartType(enumXFDateSecond);
part.SetLongFmt(bLongFmt); part.SetLongFmt(bLongFmt);
part.SetDecimalPos(pos); part.SetDecimalPos(0);
m_aParts.push_back(part); m_aParts.push_back(part);
} }