[Libreoffice-commits] core.git: include/filter include/formula include/framework
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Oct 29 11:49:48 UTC 2019
include/filter/msfilter/escherex.hxx | 3 ---
include/filter/msfilter/mscodec.hxx | 8 ++++----
include/filter/msfilter/msdffimp.hxx | 2 +-
include/filter/msfilter/mstoolbar.hxx | 22 +++++++++++-----------
include/filter/msfilter/msvbahelper.hxx | 2 +-
include/filter/msfilter/svdfppt.hxx | 10 +++++-----
include/formula/funcutl.hxx | 1 -
include/formula/token.hxx | 20 ++++++++++----------
include/formula/vectortoken.hxx | 4 ++--
include/framework/dispatchhelper.hxx | 2 +-
include/framework/titlehelper.hxx | 2 +-
11 files changed, 36 insertions(+), 40 deletions(-)
New commits:
commit bff71a43e03df33e4eb859e2bfe9e31a1762093d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Oct 29 10:25:13 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Oct 29 12:48:51 2019 +0100
loplugin:finalclasses filter..framework
Change-Id: Ic4d0a2946c925035d60defc4d25caea05535adbc
Reviewed-on: https://gerrit.libreoffice.org/81654
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index bd705ae4b9cd..5a1bf293152c 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -522,12 +522,9 @@ struct EscherPersistEntry
class EscherBlibEntry
{
-
friend class EscherGraphicProvider;
friend class EscherEx;
-protected:
-
sal_uInt32 mnIdentifier[ 4 ];
sal_uInt32 mnPictureOffset; // offset to the graphic in PictureStreams
sal_uInt32 mnSize; // size of real graphic
diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx
index a56694e9e1bd..47067a38fe5e 100644
--- a/include/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
@@ -135,7 +135,7 @@ private:
/** Encodes and decodes data from protected MSO XLS 95- documents.
*/
-class MSFILTER_DLLPUBLIC MSCodec_XorXLS95 : public MSCodec_Xor95
+class MSFILTER_DLLPUBLIC MSCodec_XorXLS95 final : public MSCodec_Xor95
{
public:
explicit MSCodec_XorXLS95() : MSCodec_Xor95(2) {}
@@ -156,7 +156,7 @@ public:
/** Encodes and decodes data from protected MSO Word 95- documents.
*/
-class MSFILTER_DLLPUBLIC MSCodec_XorWord95 : public MSCodec_Xor95
+class MSFILTER_DLLPUBLIC MSCodec_XorWord95 final : public MSCodec_Xor95
{
public:
explicit MSCodec_XorWord95() : MSCodec_Xor95(7) {}
@@ -330,7 +330,7 @@ protected:
Implementation is based on the wvDecrypt package by Caolan McNamara:
http://www.csn.ul.ie/~caolan/docs/wvDecrypt.html
*/
-class MSFILTER_DLLPUBLIC MSCodec_Std97 : public MSCodec97
+class MSFILTER_DLLPUBLIC MSCodec_Std97 final : public MSCodec97
{
public:
MSCodec_Std97();
@@ -395,7 +395,7 @@ private:
rtlDigest m_hDigest;
};
-class MSFILTER_DLLPUBLIC MSCodec_CryptoAPI : public MSCodec97
+class MSFILTER_DLLPUBLIC MSCodec_CryptoAPI final : public MSCodec97
{
private:
css::uno::Sequence<sal_Int8> m_aStd97Key;
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 856e705c6acd..981ab4dd49db 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -271,7 +271,7 @@ private:
/** block of parameters for import/export for a single call of
ImportObjAtCurrentStreamPos() */
-class MSFILTER_DLLPUBLIC SvxMSDffImportData : public SvxMSDffClientData
+class MSFILTER_DLLPUBLIC SvxMSDffImportData final : public SvxMSDffClientData
{
private:
/** list of all SvxMSDffImportRec instances of/for a group */
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 3e546c8dcdb1..284d55fd2ea9 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -110,7 +110,7 @@ public:
};
-class MSFILTER_DLLPUBLIC WString : public TBBase
+class MSFILTER_DLLPUBLIC WString final : public TBBase
{
OUString sString;
@@ -120,7 +120,7 @@ public:
const OUString& getString() const { return sString; }
};
-class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase
+class MSFILTER_DLLPUBLIC TBCExtraInfo final : public TBBase
{
WString wstrHelpFile;
sal_Int32 idHelpContext;
@@ -141,7 +141,7 @@ public:
OUString const & getOnAction() const;
};
-class MSFILTER_DLLPUBLIC TBCGeneralInfo : public TBBase
+class MSFILTER_DLLPUBLIC TBCGeneralInfo final : public TBBase
{
sal_uInt8 bFlags;
WString customText;
@@ -156,7 +156,7 @@ public:
OUString const & CustomText() { return customText.getString(); }
};
-class MSFILTER_DLLPUBLIC TBCBitMap : public TBBase
+class MSFILTER_DLLPUBLIC TBCBitMap final : public TBBase
{
friend class TBCBSpecific; // #FIXME hacky access, need to fix
sal_Int32 cbDIB;
@@ -172,7 +172,7 @@ public:
BitmapEx& getBitMap() { return mBitMap;}
};
-class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase
+class MSFILTER_DLLPUBLIC TBCMenuSpecific final : public TBBase
{
sal_Int32 tbid;
std::shared_ptr< WString > name; //exist only if tbid equals 0x00000001
@@ -182,7 +182,7 @@ public:
OUString Name();
};
-class MSFILTER_DLLPUBLIC TBCCDData : public TBBase
+class MSFILTER_DLLPUBLIC TBCCDData final : public TBBase
{
sal_Int16 cwstrItems; //Signed integer that specifies the number of items in wstrList. MUST be positive.
std::vector< WString > wstrList; // Zero-based index array of WString structures. Number of elements MUST be equal to cwstrItems.
@@ -198,7 +198,7 @@ public:
bool Read(SvStream &rS) override;
};
-class TBCComboDropdownSpecific : public TBBase
+class TBCComboDropdownSpecific final : public TBBase
{
std::shared_ptr< TBCCDData > data;
public:
@@ -276,7 +276,7 @@ public:
sal_uInt32 getTbct() const { return tbct; };
};
-class MSFILTER_DLLPUBLIC TBCData : public TBBase
+class MSFILTER_DLLPUBLIC TBCData final : public TBBase
{
TBCHeader rHeader;
TBCGeneralInfo controlGeneralInfo;
@@ -294,7 +294,7 @@ public:
TBCMenuSpecific* getMenuSpecific();
};
-class MSFILTER_DLLPUBLIC TB : public TBBase
+class MSFILTER_DLLPUBLIC TB final : public TBBase
{
sal_uInt8 bSignature;// Signed integer that specifies the toolbar signature number. MUST be 0x02.
sal_uInt8 bVersion; // Signed integer that specifies the toolbar version number. MUST be 0x01.
@@ -316,7 +316,7 @@ public:
bool IsMenuToolbar() const { return ( ( ltbtr & 0x2000000 ) == 0x2000000 ); }
};
-class MSFILTER_DLLPUBLIC SRECT : public TBBase
+class MSFILTER_DLLPUBLIC SRECT final : public TBBase
{
public:
SRECT() : left(0), top(0), right(0), bottom(0) {}
@@ -331,7 +331,7 @@ public:
};
-class MSFILTER_DLLPUBLIC TBVisualData : public TBBase
+class MSFILTER_DLLPUBLIC TBVisualData final : public TBBase
{
sal_Int8 tbds;
sal_Int8 tbv;
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index 782eb212113e..5e142df6b503 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -69,7 +69,7 @@ typedef ::cppu::WeakImplHelper<
css::lang::XInitialization,
css::script::vba::XVBAMacroResolver > VBAMacroResolverBase;
-class VBAMacroResolver : public VBAMacroResolverBase
+class VBAMacroResolver final : public VBAMacroResolverBase
{
public:
explicit VBAMacroResolver();
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index d03bf7488394..574733030eed 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -529,7 +529,7 @@ struct MSFILTER_DLLPUBLIC HeaderFooterEntry
explicit HeaderFooterEntry( const PptSlidePersistEntry* pMaster = nullptr );
};
-struct MSFILTER_DLLPUBLIC ProcessData : public SvxMSDffClientData
+struct MSFILTER_DLLPUBLIC ProcessData final : public SvxMSDffClientData
{
PptSlidePersistEntry& rPersistEntry;
SdPageCapsule pPage;
@@ -865,7 +865,7 @@ struct PPTStyleSheet : public PPTNumberFormatCreator
~PPTStyleSheet();
};
-struct ImplPPTParaPropSet : public salhelper::SimpleReferenceObject
+struct ImplPPTParaPropSet final : public salhelper::SimpleReferenceObject
{
sal_uInt16 mnDepth;
sal_uInt32 mnAttrSet;
@@ -975,7 +975,7 @@ struct PPTTabEntry
sal_uInt16 nStyle;
};
-struct PPTRuler : public salhelper::SimpleReferenceObject
+struct PPTRuler final : public salhelper::SimpleReferenceObject
{
sal_Int32 nFlags;
sal_uInt16 nDefaultTab;
@@ -1192,7 +1192,7 @@ public:
#define PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK 8
#define PPT_TEXTOBJ_FLAGS_VERTICAL 16
-struct ImplPPTTextObj : public salhelper::SimpleReferenceObject
+struct ImplPPTTextObj final : public salhelper::SimpleReferenceObject
{
sal_uInt32 mnShapeId;
sal_uInt32 mnShapeMaster;
@@ -1267,7 +1267,7 @@ public:
PPTTextObj& operator=( PPTTextObj& rTextObj );
};
-class PPTConvertOCXControls : public SvxMSConvertOCXControls
+class PPTConvertOCXControls final : public SvxMSConvertOCXControls
{
virtual void GetDrawPage() override;
PptPageKind ePageKind;
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 7809db0b91a8..5e4a037c607e 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -142,7 +142,6 @@ private:
Link<weld::Widget&,bool> maActivateHdl;
Link<RefButton&,void> maClickHdl;
-protected:
DECL_LINK(Click, weld::Button&, void);
DECL_LINK(KeyInput, const KeyEvent&, bool);
DECL_LINK(GetFocus, weld::Widget&, void);
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 034b3aa78b6f..02bffd6a0225 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -259,7 +259,7 @@ public:
// A special token for the FormulaAutoPilot only. Keeps a reference pointer of
// the token of which it was created for comparison.
-class FORMULA_DLLPUBLIC FormulaFAPToken : public FormulaByteToken
+class FORMULA_DLLPUBLIC FormulaFAPToken final : public FormulaByteToken
{
private:
FormulaTokenRef pOrigToken;
@@ -292,7 +292,7 @@ public:
virtual bool operator==( const FormulaToken& rToken ) const override;
};
-class FORMULA_DLLPUBLIC FormulaTypedDoubleToken : public FormulaDoubleToken
+class FORMULA_DLLPUBLIC FormulaTypedDoubleToken final : public FormulaDoubleToken
{
private:
sal_Int16 mnType; /**< Can hold, for example, a value
@@ -312,7 +312,7 @@ public:
};
-class FORMULA_DLLPUBLIC FormulaStringToken : public FormulaToken
+class FORMULA_DLLPUBLIC FormulaStringToken final : public FormulaToken
{
svl::SharedString maString;
public:
@@ -328,7 +328,7 @@ public:
/** Identical to FormulaStringToken, but with explicit OpCode instead of implicit
ocPush, and an optional sal_uInt8 for ocBad tokens. */
-class FORMULA_DLLPUBLIC FormulaStringOpToken : public FormulaByteToken
+class FORMULA_DLLPUBLIC FormulaStringOpToken final : public FormulaByteToken
{
svl::SharedString maString;
public:
@@ -341,7 +341,7 @@ public:
virtual bool operator==( const FormulaToken& rToken ) const override;
};
-class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken
+class FORMULA_DLLPUBLIC FormulaIndexToken final : public FormulaToken
{
private:
sal_uInt16 nIndex;
@@ -361,7 +361,7 @@ public:
};
-class FORMULA_DLLPUBLIC FormulaExternalToken : public FormulaToken
+class FORMULA_DLLPUBLIC FormulaExternalToken final : public FormulaToken
{
private:
OUString aExternal;
@@ -385,7 +385,7 @@ public:
};
-class FORMULA_DLLPUBLIC FormulaMissingToken : public FormulaToken
+class FORMULA_DLLPUBLIC FormulaMissingToken final : public FormulaToken
{
public:
FormulaMissingToken() :
@@ -399,7 +399,7 @@ public:
virtual bool operator==( const FormulaToken& rToken ) const override;
};
-class FORMULA_DLLPUBLIC FormulaJumpToken : public FormulaToken
+class FORMULA_DLLPUBLIC FormulaJumpToken final : public FormulaToken
{
private:
std::unique_ptr<short[]>
@@ -429,7 +429,7 @@ public:
};
-class FORMULA_DLLPUBLIC FormulaUnknownToken : public FormulaToken
+class FORMULA_DLLPUBLIC FormulaUnknownToken final : public FormulaToken
{
public:
FormulaUnknownToken( OpCode e ) :
@@ -442,7 +442,7 @@ public:
};
-class FORMULA_DLLPUBLIC FormulaErrorToken : public FormulaToken
+class FORMULA_DLLPUBLIC FormulaErrorToken final : public FormulaToken
{
FormulaError nError;
public:
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 853850496975..26830bf6588c 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -59,7 +59,7 @@ struct FORMULA_DLLPUBLIC VectorRefArray
* This token represents a single cell reference in a vectorized formula
* calculation context.
*/
-class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken
+class FORMULA_DLLPUBLIC SingleVectorRefToken final : public FormulaToken
{
VectorRefArray maArray;
size_t mnArrayLength;
@@ -77,7 +77,7 @@ public:
* This token represents a range reference in a vectorized formula
* calculation context.
*/
-class FORMULA_DLLPUBLIC DoubleVectorRefToken : public FormulaToken
+class FORMULA_DLLPUBLIC DoubleVectorRefToken final : public FormulaToken
{
std::vector<VectorRefArray> maArrays;
diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx
index b2f1939a439d..100ef2d859a9 100644
--- a/include/framework/dispatchhelper.hxx
+++ b/include/framework/dispatchhelper.hxx
@@ -52,7 +52,7 @@ namespace framework
- dispatching of the URL
All these steps are done inside one method call here.
*/
-class FWE_DLLPUBLIC DispatchHelper
+class FWE_DLLPUBLIC DispatchHelper final
: public ::cppu::WeakImplHelper<css::lang::XServiceInfo, css::frame::XDispatchHelper,
css::frame::XDispatchResultListener>
{
diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx
index daadbe8442ba..c18f5f502756 100644
--- a/include/framework/titlehelper.hxx
+++ b/include/framework/titlehelper.hxx
@@ -50,7 +50,7 @@ namespace framework{
@threadsafe
*/
-class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
+class FWE_DLLPUBLIC TitleHelper final : private ::cppu::BaseMutex
, public ::cppu::WeakImplHelper< css::frame::XTitle ,
css::frame::XTitleChangeBroadcaster,
css::frame::XTitleChangeListener ,
More information about the Libreoffice-commits
mailing list