ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

use initialization list in lotuswordpro

Browse Source 
this exposes 3 unused private members, detete them.
reorder some initialization to match declaration order.
remove a broken and redundant member initialization
and destruction in xfindex.cxx
(starts loop at 1 and default ctor/dtor do the same)
simplify default ctor in xfframe.cxx

Change-Id: Iaada8849e030d494a9bc7f7b0c3f8f1da3828290
Reviewed-on: https://gerrit.libreoffice.org/24466
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Jochen Nitschke
2016-04-29 09:35:16 +00:00
committed by Noel Grandin
parent 47405e0095
commit c581db0822
23 changed files with 156 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lotuswordpro/source/filter/xfilter/xfbgimage.cxx
+7 -8
View File
@@ -61,14 +61,13 @@
#include "xfbase64.hxx"
XFBGImage::XFBGImage()
{
m_bUserFileLink = false;
m_bRepeate = false;
m_bStretch = false;
m_bPosition = true;
m_eHoriAlign = enumXFAlignCenter;
m_eVertAlign = enumXFAlignCenter;
}
: m_bUserFileLink(false)
, m_bRepeate(false)
, m_bStretch(false)
, m_bPosition(true)
, m_eHoriAlign(enumXFAlignCenter)
, m_eVertAlign(enumXFAlignCenter)
{}
void XFBGImage::SetImageData(sal_uInt8 *buf, int len)
{
lotuswordpro/source/filter/xfilter/xfbreaks.hxx
+4 -7
View File
@@ -90,14 +90,11 @@ private:
enumXFBreaks m_eBreaks;
};
inline XFBreaks::XFBreaks()
{
m_eBreaks = enumXFBreakAuto;
}
inline XFBreaks::XFBreaks() : m_eBreaks(enumXFBreakAuto)
{}
inline XFBreaks::XFBreaks(enumXFBreaks breaks):m_eBreaks(breaks)
{
}
inline XFBreaks::XFBreaks(enumXFBreaks breaks) : m_eBreaks(breaks)
{}
inline void XFBreaks::SetBreakType(enumXFBreaks breaks)
{
lotuswordpro/source/filter/xfilter/xfcell.cxx
+8 -9
View File
@@ -66,15 +66,14 @@
#include "xfrow.hxx"
XFCell::XFCell()
{
m_pSubTable = nullptr;
m_pOwnerRow = nullptr;
m_nCol = 0;
m_nColSpaned = 1;
m_nRepeated = 0;
m_eValueType = enumXFValueTypeNone;
m_bProtect = false;
}
: m_pOwnerRow(nullptr)
, m_pSubTable(nullptr)
, m_nCol(0)
, m_nColSpaned(1)
, m_nRepeated(0)
, m_eValueType(enumXFValueTypeNone)
, m_bProtect(false)
{}
XFCell::~XFCell()
{
lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
+7 -8
View File
@@ -63,14 +63,13 @@
#include "xfbgimage.hxx"
XFCellStyle::XFCellStyle()
{
m_eHoriAlign = enumXFAlignNone;
m_eVertAlign = enumXFAlignNone;
m_fTextIndent = 0;
m_pBorders = nullptr;
m_pBackImage = nullptr;
m_bWrapText = false;
}
: m_eHoriAlign(enumXFAlignNone)
, m_eVertAlign(enumXFAlignNone)
, m_fTextIndent(0)
, m_pBackImage(nullptr)
, m_pBorders(nullptr)
, m_bWrapText(false)
{}
XFCellStyle::~XFCellStyle()
{
lotuswordpro/source/filter/xfilter/xfcolumns.hxx
+8 -10
View File
@@ -74,11 +74,10 @@ class XFColumn
{
public:
XFColumn()
{
m_nRelWidth = 0;
m_fMarginLeft = 0;
m_fMarginRight = 0;
}
: m_nRelWidth(0)
, m_fMarginLeft(0)
, m_fMarginRight(0)
{}
public:
/**
@@ -108,11 +107,10 @@ class XFColumnSep
{
public:
XFColumnSep()
{
m_nRelHeight = 100;
m_fWidth = 0;
m_eVertAlign = enumXFAlignMiddle;
}
: m_nRelHeight(100)
, m_fWidth(0)
, m_eVertAlign(enumXFAlignMiddle)
{}
public:
void SetRelHeight(sal_Int32 height);
void SetWidth(double width);
lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx
+5 -6
View File
@@ -60,12 +60,11 @@
#include "xfdrawareastyle.hxx"
XFDrawAreaStyle::XFDrawAreaStyle()
{
m_eAreaStyle = enumXFAreaSolid;
m_eLineStyle = enumXFAreaLineSingle;
m_nAngle = 0;
m_fSpace = 0.18;
}
: m_eAreaStyle(enumXFAreaSolid)
, m_eLineStyle(enumXFAreaLineSingle)
, m_nAngle(0)
, m_fSpace(0.18)
{}
enumXFStyle XFDrawAreaStyle::GetStyleFamily()
{
lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx
+9 -11
View File
@@ -60,17 +60,15 @@
#include "xfdrawlinestyle.hxx"
XFDrawLineStyle::XFDrawLineStyle()
{
m_eLineStyle = enumXFLineSolid;
m_fWidth = 0;
m_nTransparency = 0;
m_nNumber1 = 1;
m_nNumber2 = 1;
m_fSpace = 0;
m_fLength1 = 0;
m_fLength2 = 0;
}
: m_eLineStyle(enumXFLineSolid)
, m_fWidth(0)
, m_nTransparency(0)
, m_nNumber1(1)
, m_nNumber2(1)
, m_fSpace(0)
, m_fLength1(0)
, m_fLength2(0)
{}
enumXFStyle XFDrawLineStyle::GetStyleFamily()
{
lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
+9 -14
View File
@@ -64,20 +64,15 @@
#include "xffontworkstyle.hxx"
#include "../lwpglobalmgr.hxx"
XFDrawStyle::XFDrawStyle()
{
m_eWrap = enumXFWrapNone;
m_nWrapLines = 0; //not limited.
m_pLineStyle = nullptr;
m_pAreaStyle = nullptr;
m_pFontWorkStyle = nullptr;
m_fArrowStartSize = 0.3;
m_fArrowEndSize = 0.3;
m_bArrowStartCenter = false;
m_bArrowEndCenter = false;
}
: m_pFontWorkStyle(nullptr)
, m_eWrap(enumXFWrapNone)
, m_pLineStyle(nullptr)
, m_pAreaStyle(nullptr)
, m_fArrowStartSize(0.3)
, m_fArrowEndSize(0.3)
, m_bArrowStartCenter(false)
, m_bArrowEndCenter(false)
{}
XFDrawStyle::~XFDrawStyle()
{
lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
-1
View File
@@ -122,7 +122,6 @@ public:
private:
XFFontWorkStyle* m_pFontWorkStyle;
enumXFWrap m_eWrap;
sal_Int32 m_nWrapLines;
XFDrawLineStyle *m_pLineStyle;
XFDrawAreaStyle *m_pAreaStyle;
OUString m_strArrowStart;
lotuswordpro/source/filter/xfilter/xfentry.cxx
+4 -5
View File
@@ -65,11 +65,10 @@
#include "xfentry.hxx"
XFEntry::XFEntry()
{
m_eType = enumXFEntryTOC;
m_bMainEntry = false;
m_nOutlineLevel = 1;
}
: m_eType(enumXFEntryTOC)
, m_bMainEntry(false)
, m_nOutlineLevel(1)
{}
void XFEntry::ToXml(IXFStream *pStrm)
{
lotuswordpro/source/filter/xfilter/xfframe.cxx
+15 -24
View File
@@ -60,31 +60,22 @@
#include "xfframe.hxx"
#include "xfparagraph.hxx"
#define ZINDEX_MIN 0
XFFrame::XFFrame()
{
m_isTextBox = false;
m_eAnchor = enumXFAnchorPara;
m_nAnchorPage = 0;
m_nZIndex = ZINDEX_MIN;
//give it a default name:
m_strName = XFGlobal::GenFrameName();
m_fMinHeight = 0;
m_fMaxHeight = 0;
m_nFlag = 0;
m_eType = enumXFFrameTextbox;
}
XFFrame::XFFrame(bool isTextBox):m_isTextBox(isTextBox)
{
m_eAnchor = enumXFAnchorPara;
m_nAnchorPage = 0;
m_nZIndex = ZINDEX_MIN;
//give it a default name:
m_strName = XFGlobal::GenFrameName();
m_fMinHeight = 0;
m_fMaxHeight = 0;
m_nFlag = 0;
m_eType = enumXFFrameTextbox;
}
: XFFrame::XFFrame(false)
{}
XFFrame::XFFrame(bool isTextBox)
: m_eAnchor(enumXFAnchorPara)
, m_nAnchorPage(0)
, m_strName(XFGlobal::GenFrameName()) // give it a default name
, m_nZIndex(ZINDEX_MIN)
, m_fMinHeight(0)
, m_fMaxHeight(0)
, m_eType(enumXFFrameTextbox)
, m_nFlag(0)
, m_isTextBox(isTextBox)
{}
XFFrame::~XFFrame()
{
lotuswordpro/source/filter/xfilter/xfframestyle.cxx
+18 -22
View File
@@ -64,28 +64,24 @@
#include "xfbgimage.hxx"
XFFrameStyle::XFFrameStyle()
{
m_eWrap = enumXFWrapNone;
m_nWrapLines = 0; //not limited.
m_pBorders = nullptr;
m_pColumns = nullptr;
m_pShadow = nullptr;
m_pBGImage = nullptr;
m_bProtectContent = false;
m_bProtectSize = false;
m_bProtectPos = false;
m_bEditable = false;
m_bPrintable = true;
m_bBackground = false;
m_nTransparency = 0;
m_eTextDir = enumXFTextDirNone;
m_eXPos = enumXFFrameXPosCenter;
m_eXRel = enumXFFrameXRelParaContent;
m_eYPos = enumXFFrameYPosTop;
m_eYRel = enumXFFrameYRelPage;
}
: m_eWrap(enumXFWrapNone)
, m_pBorders(nullptr)
, m_pColumns(nullptr)
, m_pShadow(nullptr)
, m_pBGImage(nullptr)
, m_bProtectContent(false)
, m_bProtectSize(false)
, m_bProtectPos(false)
, m_bEditable(false)
, m_bPrintable(true)
, m_bBackground(false)
, m_nTransparency(0)
, m_eTextDir(enumXFTextDirNone)
, m_eXPos(enumXFFrameXPosCenter)
, m_eXRel(enumXFFrameXRelParaContent)
, m_eYPos(enumXFFrameYPosTop)
, m_eYRel(enumXFFrameYRelPage)
{}
XFFrameStyle::~XFFrameStyle()
{
lotuswordpro/source/filter/xfilter/xfframestyle.hxx
-1
View File
@@ -149,7 +149,6 @@ public:
protected:
enumXFWrap m_eWrap;
sal_Int32 m_nWrapLines;
XFPadding m_aPad;
XFMargins m_aMargins;
XFBorders *m_pBorders;
lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
+15 -16
View File
@@ -62,22 +62,21 @@
#include "xfshadow.hxx"
XFImageStyle::XFImageStyle()
{
m_nBrightness = 0;
m_nContrast = 0;
m_nGamma = 0;
m_nTransparent = 0;
m_nAdjustRed = 0;
m_nAdjustGreen = 0;
m_nAdjustBlue = 0;
m_fClipLeft = 0;
m_fClipRight = 0;
m_fClipTop = 0;
m_fClipBottom = 0;
m_bHoriFlip = false;
m_bVertFlip = false;
m_eColorMode = enumXFColorStandard;
}
: m_nBrightness(0)
, m_nContrast(0)
, m_nGamma(0)
, m_nTransparent(0)
, m_nAdjustRed(0)
, m_nAdjustGreen(0)
, m_nAdjustBlue(0)
, m_fClipLeft(0)
, m_fClipRight(0)
, m_fClipTop(0)
, m_fClipBottom(0)
, m_bHoriFlip(false)
, m_bVertFlip(false)
, m_eColorMode(enumXFColorStandard)
{}
void XFImageStyle::ToXml(IXFStream *pStrm)
{
lotuswordpro/source/filter/xfilter/xfindex.cxx
+5 -17
View File
@@ -61,28 +61,16 @@
#include "xfparagraph.hxx"
XFIndex::XFIndex()
{
m_pTitle = nullptr;
m_eType = enumXFIndexTOC;
m_bProtect = true;
m_bSeparator = false;
m_nMaxLevel = 0;
for(sal_uInt16 i=1;i<MAX_TOC_LEVEL+1;i++)
{
m_aTOCSource[i].clear();
}
}
: m_eType(enumXFIndexTOC)
, m_bProtect(true)
, m_bSeparator(false)
, m_pTitle(nullptr)
{}
XFIndex::~XFIndex()
{
delete m_pTitle;
for(sal_uInt16 i=1;i<MAX_TOC_LEVEL+1;i++)
{
m_aTOCSource[i].clear();
}
while(m_aTemplates.size()>0)
{
XFIndexTemplate * pTemplate = m_aTemplates.back();
lotuswordpro/source/filter/xfilter/xfindex.hxx
-2
View File
@@ -173,8 +173,6 @@ private:
#define MAX_TOC_LEVEL 10
std::vector<OUString> m_aTOCSource[MAX_TOC_LEVEL+1];
sal_uInt32 m_nMaxLevel;
};
inline XFIndexTemplate::XFIndexTemplate()
lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
+8 -9
View File
@@ -94,15 +94,14 @@ private:
};
inline XFLineNumberConfig::XFLineNumberConfig()
{
m_ePosition = enumXFLineNumberLeft;
m_fOffset = 0;
m_nIncrement = 5;
m_nSepIncrement = 3;
m_bRestartOnPage = false;
m_bCountEmptyLines = true;
m_bCountFrameLines = false;
}
: m_ePosition(enumXFLineNumberLeft)
, m_fOffset(0)
, m_nIncrement(5)
, m_nSepIncrement(3)
, m_bRestartOnPage(false)
, m_bCountEmptyLines(true)
, m_bCountFrameLines(false)
{}
inline void XFLineNumberConfig::SetNumberOffset(double offset)
{
lotuswordpro/source/filter/xfilter/xfliststyle.cxx
+8 -9
View File
@@ -60,15 +60,14 @@
#include "xfliststyle.hxx"
XFListLevel::XFListLevel()
{
m_nLevel = 0;
m_nDisplayLevel = 0;
m_fIndent = 0;
m_fMinLabelWidth = 0.499;
m_fMinLabelDistance = 0;
m_eAlign = enumXFAlignStart;
m_eListType = enumXFListLevelNumber;
}
: m_nLevel(0)
, m_nDisplayLevel(0)
, m_fIndent(0)
, m_fMinLabelWidth(0.499)
, m_fMinLabelDistance(0)
, m_eAlign(enumXFAlignStart)
, m_eListType(enumXFListLevelNumber)
{}
void XFListLevel::ToXml(IXFStream * /*pStrm*/)
{
lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
+11 -10
View File
@@ -59,16 +59,17 @@
************************************************************************/
#include "xfnumberstyle.hxx"
XFNumberStyle::XFNumberStyle():m_aColor(0,0,0),m_aNegativeColor(255,0,0)
{
m_eType = enumXFNumberNumber;
m_nDecimalDigits = 0;
m_nMinInteger = 1;
m_nMinExponent = 2;
m_bGroup = false;
m_bRedIfNegative = false;
m_bCurrencySymbolPost = false;
}
XFNumberStyle::XFNumberStyle()
: m_eType(enumXFNumberNumber)
, m_nDecimalDigits(0)
, m_nMinInteger(1)
, m_nMinExponent(2)
, m_bGroup(false)
, m_aColor(0,0,0)
, m_bCurrencySymbolPost(false)
, m_bRedIfNegative(false)
, m_aNegativeColor(255,0,0)
{}
enumXFStyle XFNumberStyle::GetStyleFamily()
{
lotuswordpro/source/filter/xfilter/xfshadow.cxx
+5 -5
View File
@@ -59,11 +59,11 @@
************************************************************************/
#include "xfshadow.hxx"
XFShadow::XFShadow():m_aColor(128,128,0)
{
m_ePosition = enumXFShadowNone;
m_fOffset = 0.18;
}
XFShadow::XFShadow()
: m_ePosition(enumXFShadowNone)
, m_fOffset(0.18)
, m_aColor(128,128,0)
{}
OUString XFShadow::ToString()
{
lotuswordpro/source/filter/xfilter/xftablestyle.cxx
+4 -5
View File
@@ -61,11 +61,10 @@
#include "xfbgimage.hxx"
XFTableStyle::XFTableStyle()
{
m_fWidth = 2;
m_eAlign = enumXFAlignStart;
m_pBGImage = nullptr;
}
: m_fWidth(2)
, m_pBGImage(nullptr)
, m_eAlign(enumXFAlignStart)
{}
XFTableStyle::~XFTableStyle()
{
lotuswordpro/source/filter/xfilter/xftabstyle.cxx
+3 -4
View File
@@ -60,10 +60,9 @@
#include "xftabstyle.hxx"
XFTabStyle::XFTabStyle()
{
m_eType = enumXFTabNone;
m_fLength = 0;
}
: m_eType(enumXFTabNone)
, m_fLength(0)
{}
void XFTabStyle::ToXml(IXFStream *pStrm)
{
lotuswordpro/source/filter/xfilter/xftimestyle.hxx
+3 -4
View File
@@ -68,10 +68,9 @@ class XFDateTimePart : public XFStyle
{
public:
XFDateTimePart()
{
m_ePart = enumXFDateUnknown;
m_bLongFmt = false;
}
: m_ePart(enumXFDateUnknown)
, m_bLongFmt(false)
{}
virtual ~XFDateTimePart(){}
public: