summaryrefslogtreecommitdiff
path: root/lotuswordpro/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-10-31 16:04:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-11-01 07:16:08 +0100
commitbbf1312b2d775a851a38290e3c12c677f6acbfde (patch)
tree3724292b32ece4347f6b8a92ad0c51a844072444 /lotuswordpro/inc
parent6084ca8a637abb57b3d7236c303e22afa6423b43 (diff)
loplugin:finalclasses in lotuswordpro
Change-Id: I09a570741f5801980ae07fb90835e543519df046 Reviewed-on: https://gerrit.libreoffice.org/44135 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'lotuswordpro/inc')
-rw-r--r--lotuswordpro/inc/lwpbasetype.hxx4
-rw-r--r--lotuswordpro/inc/lwpfoundry.hxx9
-rw-r--r--lotuswordpro/inc/lwpidxmgr.hxx6
-rw-r--r--lotuswordpro/inc/lwpobjfactory.hxx4
-rw-r--r--lotuswordpro/inc/lwpoverride.hxx64
-rw-r--r--lotuswordpro/inc/xfilter/xfnumberstyle.hxx27
6 files changed, 38 insertions, 76 deletions
diff --git a/lotuswordpro/inc/lwpbasetype.hxx b/lotuswordpro/inc/lwpbasetype.hxx
index 7da677280c4c..99f33050b2fe 100644
--- a/lotuswordpro/inc/lwpbasetype.hxx
+++ b/lotuswordpro/inc/lwpbasetype.hxx
@@ -101,7 +101,7 @@ private:
/**
* @brief point class
*/
-class LwpPoint
+class LwpPoint final
{
public:
LwpPoint();
@@ -111,7 +111,7 @@ public:
sal_Int32 GetY() const {return m_nY;}
inline void SetX(sal_Int32 nX);
inline void SetY(sal_Int32 nY);
-protected:
+private:
sal_Int32 m_nX;
sal_Int32 m_nY;
};
diff --git a/lotuswordpro/inc/lwpfoundry.hxx b/lotuswordpro/inc/lwpfoundry.hxx
index 7c5ff3bee569..30b604b295fa 100644
--- a/lotuswordpro/inc/lwpfoundry.hxx
+++ b/lotuswordpro/inc/lwpfoundry.hxx
@@ -177,17 +177,16 @@ public:
class LwpOrderedObject;
class LwpListList;
-class LwpOrderedObjectManager
+class LwpOrderedObjectManager final
{
public:
LwpOrderedObjectManager(){}
-protected:
- LwpObjectID m_Head;
-public:
void Read(LwpObjectStream *pStrm);
LwpOrderedObject* Enumerate(LwpOrderedObject* pLast);
-protected:
+private:
LwpListList* GetNextActiveListList(LwpListList* pLast);
+
+ LwpObjectID m_Head;
};
class LwpStyleManager;
diff --git a/lotuswordpro/inc/lwpidxmgr.hxx b/lotuswordpro/inc/lwpidxmgr.hxx
index 21f902a76cda..fc01fed425a4 100644
--- a/lotuswordpro/inc/lwpidxmgr.hxx
+++ b/lotuswordpro/inc/lwpidxmgr.hxx
@@ -77,11 +77,11 @@ struct LwpKey
/**
* @brief LwpIndexManager, to read all index records and maintain the index information
*/
-class LwpIndexManager
+class LwpIndexManager final
{
public:
LwpIndexManager();
-protected:
+private:
static const sal_uInt8 MAXOBJECTIDS;
std::vector<LwpKey> m_ObjectKeys; //the <id, offset> ordered vector
std::vector<LwpKey> m_RootObjs; //For those object ids in RootObjIndex
@@ -93,7 +93,7 @@ protected:
sal_uInt32 m_ChildIndex[256]; //Offset of leaf index
sal_uInt16 m_nLeafCount;
-protected:
+
void ReadRootData(LwpObjectStream *pObjStrm ); //Read root index data
//Add new method to handle ObjIndex
diff --git a/lotuswordpro/inc/lwpobjfactory.hxx b/lotuswordpro/inc/lwpobjfactory.hxx
index 37c3c3a48420..f3a00e1f769c 100644
--- a/lotuswordpro/inc/lwpobjfactory.hxx
+++ b/lotuswordpro/inc/lwpobjfactory.hxx
@@ -77,11 +77,10 @@
/**
* @brief object factory used for lwp object creation and maintenance
*/
-class LwpObjectFactory
+class LwpObjectFactory final
{
public:
explicit LwpObjectFactory(LwpSvStream* pSvStream);
-public:
~LwpObjectFactory();
//For object Factory and object manager
@@ -106,7 +105,6 @@ private:
LwpIdToObjMap m_IdToObjList;
LwpIndexManager m_IndexMgr;
-protected:
rtl::Reference<LwpObject> FindObject(const LwpObjectID &objID);
public:
rtl::Reference<LwpObject> CreateObject(sal_uInt32 type, LwpObjectHeader &objHdr);
diff --git a/lotuswordpro/inc/lwpoverride.hxx b/lotuswordpro/inc/lwpoverride.hxx
index b7d0752fa664..d9df79894382 100644
--- a/lotuswordpro/inc/lwpoverride.hxx
+++ b/lotuswordpro/inc/lwpoverride.hxx
@@ -103,7 +103,7 @@ protected:
sal_uInt16 m_nApply;
};
-class LwpTextLanguageOverride : public LwpOverride
+class LwpTextLanguageOverride final : public LwpOverride
{
public:
LwpTextLanguageOverride() : m_nLanguage(0) {}
@@ -112,17 +112,14 @@ public:
void Read(LwpObjectStream* pStrm) override;
-protected:
- LwpTextLanguageOverride(LwpTextLanguageOverride const& rOther);
-
private:
+ LwpTextLanguageOverride(LwpTextLanguageOverride const& rOther);
LwpTextLanguageOverride& operator=(LwpTextLanguageOverride const& rOther) = delete;
-private:
sal_uInt16 m_nLanguage;
};
-class LwpTextAttributeOverride : public LwpOverride
+class LwpTextAttributeOverride final : public LwpOverride
{
public:
LwpTextAttributeOverride() : m_nHideLevels(0), m_nBaseLineOffset(0) {}
@@ -135,13 +132,10 @@ public:
bool IsHighlight();
-protected:
- LwpTextAttributeOverride(LwpTextAttributeOverride const& rOther);
-
private:
+ LwpTextAttributeOverride(LwpTextAttributeOverride const& rOther);
LwpTextAttributeOverride& operator=(LwpTextAttributeOverride const& rOther) = delete;
-private:
enum{
TAO_HIGHLIGHT = 0x08,
};
@@ -154,7 +148,7 @@ inline sal_uInt16 LwpTextAttributeOverride::GetHideLevels() const
return m_nHideLevels;
}
-class LwpKinsokuOptsOverride : public LwpOverride
+class LwpKinsokuOptsOverride final : public LwpOverride
{
public:
LwpKinsokuOptsOverride() : m_nLevels(0) {}
@@ -163,17 +157,14 @@ public:
void Read(LwpObjectStream* pStrm) override;
-protected:
- LwpKinsokuOptsOverride(LwpKinsokuOptsOverride const& rOther);
-
private:
+ LwpKinsokuOptsOverride(LwpKinsokuOptsOverride const& rOther);
LwpKinsokuOptsOverride& operator=(LwpKinsokuOptsOverride const& rOther) = delete;
-private:
sal_uInt16 m_nLevels;
};
-class LwpBulletOverride : public LwpOverride
+class LwpBulletOverride final : public LwpOverride
{
public:
LwpBulletOverride() {m_bIsNull = true;}
@@ -203,13 +194,10 @@ public:
bool IsInValid(){return m_bIsNull;}
-protected:
- LwpBulletOverride(LwpBulletOverride const& rOther);
-
private:
+ LwpBulletOverride(LwpBulletOverride const& rOther);
LwpBulletOverride& operator=(LwpBulletOverride const& rOther) = delete;
-private:
enum
{
BO_SILVERBULLET = 0x01,
@@ -273,7 +261,7 @@ inline void LwpBulletOverride::RevertRightAligned()
LwpOverride::Override(BO_RIGHTALIGN, STATE_STYLE);
}
-class LwpAlignmentOverride : public LwpOverride
+class LwpAlignmentOverride final : public LwpOverride
{
public:
LwpAlignmentOverride() : m_nAlignType(ALIGN_LEFT), m_nPosition(0), m_nAlignChar(0){}
@@ -298,13 +286,10 @@ public:
void Override(LwpAlignmentOverride* other);
void OverrideAlignment(AlignType val);
-protected:
- LwpAlignmentOverride(LwpAlignmentOverride const& rOther);
-
private:
+ LwpAlignmentOverride(LwpAlignmentOverride const& rOther);
LwpAlignmentOverride& operator=(LwpAlignmentOverride const& rOther) = delete;
-private:
enum
{
AO_TYPE = 0x01,
@@ -317,7 +302,7 @@ private:
sal_uInt16 m_nAlignChar;
};
-class LwpSpacingCommonOverride : public LwpOverride
+class LwpSpacingCommonOverride final : public LwpOverride
{
public:
LwpSpacingCommonOverride() : m_nSpacingType(SPACING_NONE), m_nAmount(0), m_nMultiple(65536){}
@@ -343,13 +328,10 @@ public:
void OverrideAmount(sal_Int32 val);
void OverrideMultiple(sal_Int32 val);
-protected:
- LwpSpacingCommonOverride(LwpSpacingCommonOverride const& rOther);
-
private:
+ LwpSpacingCommonOverride(LwpSpacingCommonOverride const& rOther);
LwpSpacingCommonOverride& operator=(LwpSpacingCommonOverride const& rOther) = delete;
-protected:
enum
{
SPO_TYPE = 0x01,
@@ -361,7 +343,7 @@ protected:
sal_Int32 m_nMultiple;
};
-class LwpSpacingOverride : public LwpOverride
+class LwpSpacingOverride final : public LwpOverride
{
public:
LwpSpacingOverride();
@@ -378,20 +360,17 @@ public:
LwpSpacingCommonOverride* GetAboveSpacing(){return m_pParaSpacingAbove;}
LwpSpacingCommonOverride* GetBelowSpacing(){return m_pParaSpacingBelow;}
-protected:
- LwpSpacingOverride(LwpSpacingOverride const& rOther);
-
private:
+ LwpSpacingOverride(LwpSpacingOverride const& rOther);
LwpSpacingOverride& operator=(LwpSpacingOverride const& rOther) = delete;
-private:
LwpSpacingCommonOverride* m_pSpacing;
LwpSpacingCommonOverride* m_pAboveLineSpacing;
LwpSpacingCommonOverride* m_pParaSpacingAbove;
LwpSpacingCommonOverride* m_pParaSpacingBelow;
};
-class LwpIndentOverride : public LwpOverride
+class LwpIndentOverride final : public LwpOverride
{
public:
LwpIndentOverride() : m_nAll(0), m_nFirst(0), m_nRest(0), m_nRight(0) {}
@@ -427,13 +406,10 @@ public:
void SetMRest(sal_Int32 val){m_nRest=val;}
void SetMRight(sal_Int32 val){m_nRight=val;}
-protected:
- LwpIndentOverride(LwpIndentOverride const& rOther);
-
private:
+ LwpIndentOverride(LwpIndentOverride const& rOther);
LwpIndentOverride& operator=(LwpIndentOverride const& rOther) = delete;
-private:
enum
{
IO_ALL = 0x0001,
@@ -470,7 +446,7 @@ inline double LwpIndentOverride::GetRight() const
}
class LwpBackgroundStuff;
-class LwpAmikakeOverride : public LwpOverride
+class LwpAmikakeOverride final : public LwpOverride
{
public:
LwpAmikakeOverride();
@@ -487,16 +463,12 @@ public:
AMIKAKE_CHARACTER = 2
};
-protected:
- LwpAmikakeOverride(LwpAmikakeOverride const& rOther);
-
private:
+ LwpAmikakeOverride(LwpAmikakeOverride const& rOther);
LwpAmikakeOverride& operator=(LwpAmikakeOverride const& rOther) = delete;
-private:
std::unique_ptr<LwpBackgroundStuff> m_pBackgroundStuff;
sal_uInt16 m_nType;
-
};
#endif
diff --git a/lotuswordpro/inc/xfilter/xfnumberstyle.hxx b/lotuswordpro/inc/xfilter/xfnumberstyle.hxx
index f84d0755c9cc..69d9a7e68280 100644
--- a/lotuswordpro/inc/xfilter/xfnumberstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfnumberstyle.hxx
@@ -65,12 +65,11 @@
#include <xfilter/xfcolor.hxx>
#include <rtl/ustring.hxx>
-class XFNumberStyle : public XFStyle
+class XFNumberStyle final : public XFStyle
{
public:
XFNumberStyle();
-public:
void SetDecimalDigits(sal_Int32 decimal);
void SetGroup();
@@ -92,31 +91,25 @@ public:
virtual void ToXml(IXFStream *pStrm) override;
-protected:
+private:
void ToXml_StartElement(IXFStream *pStrm);
-
void ToXml_EndElement(IXFStream *pStrm);
-
void ToXml_Normal(IXFStream *pStrm);
-
void ToXml_Negative(IXFStream *pStrm);
-
void ToXml_Content(IXFStream *pStrm, bool nagetive);
-protected:
enumXFNumberType m_eType;
- sal_Int32 m_nDecimalDigits;
- sal_Int32 m_nMinInteger;
- sal_Int32 m_nMinExponent;
- bool m_bGroup;
- XFColor m_aColor;
- bool m_bCurrencySymbolPost;
+ sal_Int32 m_nDecimalDigits;
+ sal_Int32 m_nMinInteger;
+ sal_Int32 m_nMinExponent;
+ bool m_bGroup;
+ XFColor m_aColor;
+ bool m_bCurrencySymbolPost;
OUString m_strCurrencySymbol;
OUString m_strPrefix;
OUString m_strSuffix;
-
- bool m_bRedIfNegative;
- XFColor m_aNegativeColor;
+ bool m_bRedIfNegative;
+ XFColor m_aNegativeColor;
OUString m_strNegativePrefix;
OUString m_strNegativeSuffix;
};