diff options
23 files changed, 156 insertions, 207 deletions
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx index 221e5d4223e8..b7691a651ec9 100644 --- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx @@ -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) { diff --git a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx index e94e8de40cbe..9d86a7b4505c 100644 --- a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx +++ b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx @@ -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) { diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx index a8bd647b4f08..4eb91d6e4718 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx @@ -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() { diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx index 38e7a21c7739..aca72f7cbc7e 100644 --- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx @@ -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() { diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx index 514bdf844303..f2617e6f13b5 100644 --- a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx @@ -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); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx index 11e87fc6b180..87f619527f85 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx @@ -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() { diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx index b8c9158669c9..dfee4d19714c 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx @@ -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() { diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx index e4f6038accfd..5145a4173c5b 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx @@ -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() { diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx index 9a4a3aff1b46..0681be67e98c 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx @@ -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; diff --git a/lotuswordpro/source/filter/xfilter/xfentry.cxx b/lotuswordpro/source/filter/xfilter/xfentry.cxx index 993d4beaeeac..4d34c112fa8a 100644 --- a/lotuswordpro/source/filter/xfilter/xfentry.cxx +++ b/lotuswordpro/source/filter/xfilter/xfentry.cxx @@ -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) { diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx index cc503820c4d9..4526f839829b 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx @@ -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() { diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx index e5e2779ff7da..fbb51386ac21 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx @@ -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() { diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx index e75625858e4d..2a7cb6f55086 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx @@ -149,7 +149,6 @@ public: protected: enumXFWrap m_eWrap; - sal_Int32 m_nWrapLines; XFPadding m_aPad; XFMargins m_aMargins; XFBorders *m_pBorders; diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx index 63097ffd5b65..8f00dda4f122 100644 --- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx @@ -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) { diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx index 32c5fb7f30b5..dc1011d29701 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.cxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx @@ -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(); diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx index 1125afad2b70..aa341783a5f9 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.hxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx @@ -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() diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx index 509699df3e52..1b6e6386a828 100644 --- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx +++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx @@ -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) { diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx index b989875221be..1900747d6a7b 100644 --- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx @@ -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*/) { diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx index ab613675bd92..6eb25956f5f6 100644 --- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx @@ -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() { diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx index 851530b760fa..287e2f48b2fe 100644 --- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx +++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx @@ -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() { diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx index ba6406d508cb..04a84439c3d8 100644 --- a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx @@ -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() { diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx index ccef2e80bb12..18c5297cb97c 100644 --- a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx @@ -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) { diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx index e12f29fa5f41..dd10bcaebed2 100644 --- a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx @@ -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: |