hwpfilter/source/formula.h | 4 ++-- idlc/inc/astexpression.hxx | 4 ++-- idlc/inc/aststack.hxx | 4 ++-- idlc/inc/fehelper.hxx | 10 +++++----- idlc/inc/idlc.hxx | 4 ++-- include/formula/FormulaCompiler.hxx | 4 ++-- include/framework/framelistanalyzer.hxx | 4 ++-- include/framework/menuconfiguration.hxx | 4 ++-- include/jvmaccess/unovirtualmachine.hxx | 4 ++-- include/jvmaccess/virtualmachine.hxx | 4 ++-- include/oox/core/recordparser.hxx | 4 ++-- include/oox/crypto/CryptTools.hxx | 4 ++-- include/oox/drawingml/shape.hxx | 2 +- include/oox/helper/grabbagstack.hxx | 5 ++--- include/oox/ole/axcontrol.hxx | 4 ++-- include/oox/ole/vbacontrol.hxx | 4 ++-- include/oox/ppt/timenode.hxx | 4 ++-- jvmfwk/source/elements.hxx | 4 ++-- linguistic/inc/iprcache.hxx | 4 ++-- lotuswordpro/source/filter/lwpbulletstylemgr.hxx | 4 ++-- lotuswordpro/source/filter/lwplayout.hxx | 8 ++++---- lotuswordpro/source/filter/xfilter/xfofficemeta.hxx | 4 ++-- oox/inc/drawingml/customshapeproperties.hxx | 5 ++--- oox/source/ole/olehelper.cxx | 3 +-- rsc/inc/rscerror.h | 3 +-- sc/inc/chartlock.hxx | 8 ++++---- sc/inc/chartpos.hxx | 5 ++--- sc/inc/dptabres.hxx | 4 ++-- sc/source/filter/html/htmlpars.cxx | 4 ++-- sc/source/filter/inc/fprogressbar.hxx | 4 ++-- sc/source/filter/inc/namebuff.hxx | 4 ++-- sc/source/filter/inc/xltracer.hxx | 4 ++-- sc/source/ui/inc/PivotLayoutDialog.hxx | 4 ++-- sc/source/ui/inc/TableFillingAndNavigationTools.hxx | 4 ++-- sc/source/ui/inc/conflictsdlg.hxx | 8 ++++---- sc/source/ui/inc/inputhdl.hxx | 4 ++-- scaddins/source/analysis/analysishelper.hxx | 14 +++++++------- scaddins/source/datefunc/datefunc.hxx | 4 ++-- scaddins/source/pricing/pricing.hxx | 4 ++-- 39 files changed, 89 insertions(+), 94 deletions(-)
New commits: commit 990102be61a47a14a73a25ee320ac1033250777e Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Mon Nov 7 14:37:16 2016 +0200 loplugin:unnecessaryvirtual in hwpfilter..rsc Change-Id: I2e9df8223d503b813b4c458747e8c44bb8ef8868 Reviewed-on: https://gerrit.libreoffice.org/30661 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/hwpfilter/source/formula.h b/hwpfilter/source/formula.h index 88febf1..642e226 100644 --- a/hwpfilter/source/formula.h +++ b/hwpfilter/source/formula.h @@ -31,7 +31,7 @@ class Node; using namespace ::com::sun::star::xml::sax; -class Formula +class Formula final { public: explicit Formula(char *_eq) @@ -40,7 +40,7 @@ public: eq = _eq; trim(); } - virtual ~Formula(){ } + ~Formula(){ } void setDocumentHandler(Reference < XDocumentHandler > const & xHandler ) { diff --git a/idlc/inc/astexpression.hxx b/idlc/inc/astexpression.hxx index e64b314..e092ffd 100644 --- a/idlc/inc/astexpression.hxx +++ b/idlc/inc/astexpression.hxx @@ -87,7 +87,7 @@ struct AstExprValue const sal_Char* SAL_CALL exprTypeToString(ExprType t); -class AstExpression +class AstExpression final { public: // Constructor(s) @@ -100,7 +100,7 @@ public: AstExpression(double d); AstExpression(OString* scopedName); - virtual ~AstExpression(); + ~AstExpression(); // Data Accessors AstExprValue* getExprValue() diff --git a/idlc/inc/aststack.hxx b/idlc/inc/aststack.hxx index c704e91..8793f91 100644 --- a/idlc/inc/aststack.hxx +++ b/idlc/inc/aststack.hxx @@ -23,11 +23,11 @@ class AstScope; -class AstStack +class AstStack final { public: AstStack(); - virtual ~AstStack(); + ~AstStack(); sal_uInt32 depth() { return m_top;} AstScope* top(); diff --git a/idlc/inc/fehelper.hxx b/idlc/inc/fehelper.hxx index 61bc516..9cec2f6 100644 --- a/idlc/inc/fehelper.hxx +++ b/idlc/inc/fehelper.hxx @@ -24,11 +24,11 @@ #include <vector> -class FeDeclarator +class FeDeclarator final { public: FeDeclarator(const OString& name); - virtual ~FeDeclarator(); + ~FeDeclarator(); const OString& getName() { return m_name; } bool checkType(AstDeclaration const * pType); @@ -39,18 +39,18 @@ private: typedef ::std::list< FeDeclarator* > FeDeclList; -class FeInheritanceHeader +class FeInheritanceHeader final { public: FeInheritanceHeader( NodeType nodeType, OString* pName, OString* pInherits, std::vector< OString > * typeParameters); - virtual ~FeInheritanceHeader() + ~FeInheritanceHeader() { if ( m_pName ) delete m_pName; - } + } NodeType getNodeType() { return m_nodeType; } diff --git a/idlc/inc/idlc.hxx b/idlc/inc/idlc.hxx index 468bec2..20665ba 100644 --- a/idlc/inc/idlc.hxx +++ b/idlc/inc/idlc.hxx @@ -37,11 +37,11 @@ class AstType; class Options; class ErrorHandler; -class Idlc +class Idlc final { public: Idlc(Options* pOptions); - virtual ~Idlc(); + ~Idlc(); void init(); diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index e7268f6..96d945f 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -76,7 +76,7 @@ public: virtual ~FormulaCompiler(); /** Mappings from strings to OpCodes and vice versa. */ - class FORMULA_DLLPUBLIC OpCodeMap + class FORMULA_DLLPUBLIC OpCodeMap final { OpCodeHashMap * mpHashMap; /// Hash map of symbols, OUString -> OpCode OUString * mpTable; /// Array of symbols, OpCode -> OUString, offset==OpCode @@ -103,7 +103,7 @@ public: { mbEnglish = FormulaGrammar::isEnglish( meGrammar); } - virtual ~OpCodeMap(); + ~OpCodeMap(); /** Copy mappings from r into this map, effectively replacing this map. diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx index a1f2501..fe4798e 100644 --- a/include/framework/framelistanalyzer.hxx +++ b/include/framework/framelistanalyzer.hxx @@ -34,7 +34,7 @@ namespace framework{ to switch into the backing mode, close the current active frame only or exit the whole application explicitly or implicitly. */ -class FWE_DLLPUBLIC FrameListAnalyzer +class FWE_DLLPUBLIC FrameListAnalyzer final { // types @@ -177,7 +177,7 @@ class FWE_DLLPUBLIC FrameListAnalyzer FrameListAnalyzer( const css::uno::Reference< css::frame::XFramesSupplier >& xSupplier , const css::uno::Reference< css::frame::XFrame >& xReferenceFrame , sal_uInt32 eDetectMode ); - virtual ~FrameListAnalyzer(); + ~FrameListAnalyzer(); // helper diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx index 3a618c2..4e434d8 100644 --- a/include/framework/menuconfiguration.hxx +++ b/include/framework/menuconfiguration.hxx @@ -94,14 +94,14 @@ public: } }; -class FWE_DLLPUBLIC MenuConfiguration +class FWE_DLLPUBLIC MenuConfiguration final { public: MenuConfiguration( // use const when giving a uno reference by reference const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~MenuConfiguration(); + ~MenuConfiguration(); css::uno::Reference< css::container::XIndexAccess > CreateMenuBarConfigurationFromXML( css::uno::Reference< css::io::XInputStream >& rInputStream ) diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx index 4c409d5..c39d985 100644 --- a/include/jvmaccess/unovirtualmachine.hxx +++ b/include/jvmaccess/unovirtualmachine.hxx @@ -36,14 +36,14 @@ class JVMACCESS_DLLPUBLIC UnoVirtualMachine: public salhelper::SimpleReferenceOb public: /** An exception indicating failure to create a UnoVirtualMachine. */ - class JVMACCESS_DLLPUBLIC CreationException + class JVMACCESS_DLLPUBLIC CreationException final { public: CreationException(); CreationException(CreationException const &); - virtual ~CreationException(); + ~CreationException(); CreationException & operator =(CreationException const &); }; diff --git a/include/jvmaccess/virtualmachine.hxx b/include/jvmaccess/virtualmachine.hxx index 4f80576..4b00255 100644 --- a/include/jvmaccess/virtualmachine.hxx +++ b/include/jvmaccess/virtualmachine.hxx @@ -48,14 +48,14 @@ public: public: /** An exception indicating failure to create an AttachGuard. */ - class JVMACCESS_DLLPUBLIC CreationException + class JVMACCESS_DLLPUBLIC CreationException final { public: CreationException(); CreationException(CreationException const &); - virtual ~CreationException(); + ~CreationException(); CreationException & operator =(CreationException const &); }; diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx index 0f53c42..7a51aad 100644 --- a/include/oox/core/recordparser.hxx +++ b/include/oox/core/recordparser.hxx @@ -49,11 +49,11 @@ struct RecordInputSource }; -class RecordParser +class RecordParser final { public: RecordParser(); - virtual ~RecordParser(); + ~RecordParser(); void setFragmentHandler( const ::rtl::Reference< FragmentHandler >& rxHandler ); diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index d4fdda2..84e4c48 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -113,7 +113,7 @@ public: sal_uInt32 inputLength = 0) override; }; -class Digest +class Digest final { public: enum DigestType @@ -136,7 +136,7 @@ private: public: Digest(DigestType eType); - virtual ~Digest(); + ~Digest(); void update(std::vector<sal_uInt8>& input); void finalize(std::vector<sal_uInt8>& digest); diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 4748dd1..978b71b 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -191,7 +191,7 @@ public: const css::uno::Reference< css::drawing::XShape > & getXShape() const { return mxShape; } - virtual void applyShapeReference( const Shape& rReferencedShape, bool bUseText = true ); + void applyShapeReference( const Shape& rReferencedShape, bool bUseText = true ); const ::std::vector<OUString>& getExtDrawings() { return maExtDrawings; } void addExtDrawingRelId( const OUString &rRelId ) { maExtDrawings.push_back( rRelId ); } diff --git a/include/oox/helper/grabbagstack.hxx b/include/oox/helper/grabbagstack.hxx index efcb68d..4821978 100644 --- a/include/oox/helper/grabbagstack.hxx +++ b/include/oox/helper/grabbagstack.hxx @@ -32,7 +32,7 @@ struct GrabBagStackElement }; /// Tool that is useful for construction of a nested Sequence/PropertyValue hierarchy -class OOX_DLLPUBLIC GrabBagStack +class OOX_DLLPUBLIC GrabBagStack final { private: std::stack<GrabBagStackElement> mStack; @@ -40,8 +40,7 @@ private: public: GrabBagStack(const OUString& aElementName); - - virtual ~GrabBagStack(); + ~GrabBagStack(); const OUString& getCurrentName() { return mCurrentElement.maElementName;} diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 472c649b8..39de876 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -192,14 +192,14 @@ enum ApiDefaultStateMode /** A base class with useful helper functions for something that is able to convert ActiveX and ComCtl form controls. */ -class OOX_DLLPUBLIC ControlConverter +class OOX_DLLPUBLIC ControlConverter final { public: explicit ControlConverter( const css::uno::Reference< css::frame::XModel >& rxDocModel, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr = true ); - virtual ~ControlConverter(); + ~ControlConverter(); // Generic conversion ----------------------------------------------------- diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index 395b2c7..df1c041 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -50,11 +50,11 @@ namespace ole { /** Common properties for all controls that are part of a VBA user form or of another container control in a VBA user form. */ -class VbaSiteModel +class VbaSiteModel final { public: explicit VbaSiteModel(); - virtual ~VbaSiteModel(); + ~VbaSiteModel(); /** Allows to set single properties specified by XML token identifier. */ void importProperty( sal_Int32 nPropId, const OUString& rValue ); diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx index 40f51bc..7e6bd94 100644 --- a/include/oox/ppt/timenode.hxx +++ b/include/oox/ppt/timenode.hxx @@ -46,13 +46,13 @@ namespace oox { namespace ppt { typedef std::shared_ptr< TimeNode > TimeNodePtr; typedef std::list< TimeNodePtr > TimeNodePtrList; - class TimeNode + class TimeNode final { public: typedef ::std::map< OUString, css::uno::Any > UserDataMap; TimeNode( sal_Int16 nNodeType ); - virtual ~TimeNode(); + ~TimeNode(); NodePropertyMap & getNodeProperties() { return maNodeProperties; } UserDataMap & getUserData() { return maUserData; } diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index 18d50f3..edf44cc 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -260,7 +260,7 @@ public: The class also determines useful default values for settings which have not been made. */ -class MergedSettings +class MergedSettings final { private: const MergedSettings& operator = (MergedSettings&) = delete; @@ -280,7 +280,7 @@ private: public: MergedSettings(); - virtual ~MergedSettings(); + ~MergedSettings(); /** the default is true. */ diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index b31d38e..f37f3af 100644 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx @@ -73,7 +73,7 @@ public: }; -class SpellCache +class SpellCache final { css::uno::Reference< css::linguistic2::XDictionaryListEventListener > xFlushLstnr; @@ -88,7 +88,7 @@ class SpellCache public: SpellCache(); - virtual ~SpellCache(); + ~SpellCache(); // called from FlushListener void Flush(); diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx index cfcb0a9..c424386 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx @@ -75,11 +75,11 @@ class LwpPara; class LwpIndentOverride; class LwpBulletOverride; -class LwpBulletStyleMgr +class LwpBulletStyleMgr final { public: LwpBulletStyleMgr(); - virtual ~LwpBulletStyleMgr(); + ~LwpBulletStyleMgr(); OUString RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver, LwpIndentOverride* pIndent); inline void SetFoundry(LwpFoundry* pFoundry); diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index 54ec8eb..70ab7cd 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -302,11 +302,11 @@ protected: virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_HEAD_LAYOUT;} }; -class LwpLayoutStyle +class LwpLayoutStyle final { public: LwpLayoutStyle(); - virtual ~LwpLayoutStyle(); + ~LwpLayoutStyle(); void Read(LwpObjectStream* pStrm); private: sal_uInt32 m_nStyleDefinition; @@ -314,11 +314,11 @@ private: sal_uInt16 m_nKey; }; -class LwpLayoutMisc +class LwpLayoutMisc final { public: LwpLayoutMisc(); - virtual ~LwpLayoutMisc(); + ~LwpLayoutMisc(); void Read(LwpObjectStream* pStrm); private: sal_Int32 m_nGridDistance; diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx index 19d9be4..3367f54 100644 --- a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx +++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx @@ -63,11 +63,11 @@ #include "xfglobal.hxx" -class XFOfficeMeta +class XFOfficeMeta final { public: XFOfficeMeta(){} - virtual ~XFOfficeMeta(){} + ~XFOfficeMeta(){} void SetCreator(const OUString& creator); void SetDescription(const OUString& dsr); diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx index 23feff1..912bfd2 100644 --- a/oox/inc/drawingml/customshapeproperties.hxx +++ b/oox/inc/drawingml/customshapeproperties.hxx @@ -104,12 +104,11 @@ struct Path2D }; -class CustomShapeProperties +class CustomShapeProperties final { public: - CustomShapeProperties(); - virtual ~CustomShapeProperties(); + ~CustomShapeProperties(); void pushToPropSet( const ::oox::core::FilterBase& rFilterBase, const css::uno::Reference < css::beans::XPropertySet > & xPropSet, diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 6747bbc..bb1ed9c 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -330,7 +330,7 @@ Reference< css::frame::XFrame > lcl_getFrame( const Reference< css::frame::XMod return xFrame; } -class OleFormCtrlExportHelper +class OleFormCtrlExportHelper final { ::oox::ole::EmbeddedControl maControl; ::oox::ole::ControlModelBase* mpModel; @@ -344,7 +344,6 @@ class OleFormCtrlExportHelper OUString maGUID; public: OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& xDocModel, const Reference< XControlModel >& xModel ); - virtual ~OleFormCtrlExportHelper() { } OUString getGUID() { OUString sResult; diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h index f0f9845..6f036ee 100644 --- a/rsc/inc/rscerror.h +++ b/rsc/inc/rscerror.h @@ -111,7 +111,7 @@ enum RscVerbosity RscVerbosityVerbose = 2 }; -class RscError +class RscError final { FILE * fListing; RscVerbosity m_verbosity; @@ -122,7 +122,6 @@ class RscError void ErrorFormat( const ERRTYPE& rError, RscTop * pClass, const RscId & aId ); public: - virtual ~RscError() {} sal_uInt32 nErrors; // Number of errors RscError( RscVerbosity _verbosity ) commit dda87c6a461174def7334d2c0aac87d4eb8ab7cf Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Mon Nov 7 14:17:15 2016 +0200 loplugin:unnecessaryvirtual in sc..scaddins Change-Id: I4a2d333984827f363ea76580993438d704f9738f Reviewed-on: https://gerrit.libreoffice.org/30660 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx index c9fd872..d950f81 100644 --- a/sc/inc/chartlock.hxx +++ b/sc/inc/chartlock.hxx @@ -31,11 +31,11 @@ class ScDocument; /** All current charts in the calc will be locked in constructor and unlocked in destructor. */ -class ScChartLockGuard +class ScChartLockGuard final { public: ScChartLockGuard( ScDocument* pDoc ); - virtual ~ScChartLockGuard(); + ~ScChartLockGuard(); void AlsoLockThisChart( const css::uno::Reference< css::frame::XModel >& xModel ); @@ -48,11 +48,11 @@ private: /** Use this to lock all charts in the calc for a little time. They will unlock automatically unless you call StartOrContinueLocking() again. */ -class ScTemporaryChartLock +class ScTemporaryChartLock final { public: ScTemporaryChartLock( ScDocument* pDoc ); - virtual ~ScTemporaryChartLock(); + ~ScTemporaryChartLock(); void StartOrContinueLocking(); void StopLocking(); diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index 7bf2e55..18c40ae 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -99,7 +99,7 @@ enum ScChartGlue { class ScDocument; -class ScChartPositioner // only parameter struct +class ScChartPositioner final // only parameter struct { ScRangeListRef aRangeListRef; ScDocument* pDocument; @@ -111,7 +111,6 @@ class ScChartPositioner // only parameter struct bool bRowHeaders; bool bDummyUpperLeft; -private: void CheckColRowHeaders(); void GlueState(); // summarised areas @@ -124,7 +123,7 @@ public: ScChartPositioner( ScDocument* pDoc, const ScRangeListRef& rRangeList ); ScChartPositioner( const ScChartPositioner& rPositioner ); - virtual ~ScChartPositioner(); + ~ScChartPositioner(); const ScRangeListRef& GetRangeList() const { return aRangeListRef; } void SetRangeList( const ScRange& rNew ); diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index a462ade..112525c 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -236,7 +236,7 @@ struct ScDPParentDimData typedef std::unordered_map < SCROW, ScDPParentDimData *, MemberHashIndexFunc> DimMemberHash; -class ResultMembers +class ResultMembers final { DimMemberHash maMemberHash; bool mbHasHideDetailsMember; @@ -246,7 +246,7 @@ public: bool IsHasHideDetailsMembers() const { return mbHasHideDetailsMember; } void SetHasHideDetailsMembers( bool b ) { mbHasHideDetailsMember = b; } ResultMembers(); - virtual ~ResultMembers(); + ~ResultMembers(); }; class LateInitParams diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 8ab7310..df3abb0 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -1768,7 +1768,7 @@ void ScHTMLEntry::Strip( const EditEngine& rEditEngine ) instance of this class ownes the contained table objects and deletes them on destruction. */ -class ScHTMLTableMap +class ScHTMLTableMap final { private: typedef std::shared_ptr< ScHTMLTable > ScHTMLTablePtr; @@ -1785,7 +1785,7 @@ private: public: explicit ScHTMLTableMap( ScHTMLTable& rParentTable ); - virtual ~ScHTMLTableMap(); + ~ScHTMLTableMap(); inline const_iterator begin() const { return maTables.begin(); } inline const_iterator end() const { return maTables.end(); } diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index dc2fd81..862a820 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -100,7 +100,7 @@ const sal_Int32 SCF_INV_SEGMENT = -1; // not allowed (second segment active): aProgress.Progress(); // not allowed (first segment not empty): aProgress.GetSegmentProgressBar( nSeg1 ); */ -class ScfProgressBar +class ScfProgressBar final { public: ScfProgressBar(const ScfProgressBar&) = delete; @@ -108,7 +108,7 @@ public: explicit ScfProgressBar( SfxObjectShell* pDocShell, const OUString& rText ); explicit ScfProgressBar( SfxObjectShell* pDocShell, sal_uInt16 nResId ); - virtual ~ScfProgressBar(); + ~ScfProgressBar(); /** Adds a new segment to the progress bar. @return the identifier of the segment. */ diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 71c8978..28167ac 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -127,7 +127,7 @@ public: const ScTokenArray* Find( const ScAddress& rRefPos ) const; }; -class RangeNameBufferWK3 +class RangeNameBufferWK3 final { private: struct Entry @@ -157,7 +157,7 @@ private: public: RangeNameBufferWK3(LOTUS_ROOT* pLotRoot); - virtual ~RangeNameBufferWK3(); + ~RangeNameBufferWK3(); void Add( const OUString& rName, const ScComplexRefData& rCRD ); inline void Add( const OUString& rName, const ScRange& aScRange ); bool FindRel( const OUString& rRef, sal_uInt16& rIndex ); diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index f3f1b1e..bc69f89 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -48,11 +48,11 @@ enum XclTracerId }; /** This class wraps an MSFilterTracer to create trace logs for import/export filters. */ -class XclTracer +class XclTracer final { public: explicit XclTracer( const OUString& rDocUrl ); - virtual ~XclTracer(); + ~XclTracer(); /** Returns true, if tracing is enabled. */ inline bool IsEnabled() const { return mbEnabled; } diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index e746df2..870cc8b 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -24,7 +24,7 @@ #include "PivotLayoutTreeListData.hxx" #include "PivotLayoutTreeListLabel.hxx" -class ScItemValue +class ScItemValue final { public: OUString maName; @@ -34,7 +34,7 @@ public: ScItemValue(OUString const & aName, SCCOL nColumn, PivotFunc nFunctionMask); ScItemValue(ScItemValue* pInputItemValue); - virtual ~ScItemValue(); + ~ScItemValue(); }; class ScPivotLayoutDialog : public ScAnyRefDlg diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index 2667ca8..0d8d066 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -92,7 +92,7 @@ public: void writeValue(double aValue); }; -class DataCellIterator +class DataCellIterator final { private: ScRange mInputRange; @@ -102,7 +102,7 @@ private: public: DataCellIterator(ScRange aInputRange, bool aByColumn); - virtual ~DataCellIterator(); + ~DataCellIterator(); bool hasNext(); ScAddress get(); diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index db53e09..bed2f73 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -74,7 +74,7 @@ public: // class ScConflictsFinder -class ScConflictsFinder +class ScConflictsFinder final { private: ScChangeTrack* mpTrack; @@ -91,14 +91,14 @@ private: public: ScConflictsFinder( ScChangeTrack* pTrack, sal_uLong nStartShared, sal_uLong nEndShared, sal_uLong nStartOwn, sal_uLong nEndOwn, ScConflictsList& rConflictsList ); - virtual ~ScConflictsFinder(); + ~ScConflictsFinder(); bool Find(); }; // class ScConflictsResolver -class ScConflictsResolver +class ScConflictsResolver final { private: ScChangeTrack* mpTrack; @@ -106,7 +106,7 @@ private: public: ScConflictsResolver( ScChangeTrack* pTrack, ScConflictsList& rConflictsList ); - virtual ~ScConflictsResolver(); + ~ScConflictsResolver(); void HandleAction( ScChangeAction* pAction, bool bIsSharedAction, bool bHandleContentAction, bool bHandleNonContentAction ); diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index e11cfb0..7a8e673 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -50,7 +50,7 @@ struct ESelection; // ScInputHandler -class ScInputHandler +class ScInputHandler final { private: VclPtr<ScInputWindow> pInputWin; @@ -165,7 +165,7 @@ public: const ScInputHandler& operator=(const ScInputHandler&) = delete; ScInputHandler(); - virtual ~ScInputHandler(); + ~ScInputHandler(); void SetMode( ScInputMode eNewMode, const OUString* pInitText = nullptr ); bool IsInputMode() const { return (eMode != SC_INPUT_NONE); } diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 6fe8038..13932cb 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -168,7 +168,7 @@ struct FuncDataBase }; -class FuncData +class FuncData final { private: OUString aIntName; @@ -185,7 +185,7 @@ private: public: FuncData( const FuncDataBase& rBaseData, ResMgr& ); - virtual ~FuncData(); + ~FuncData(); inline sal_uInt16 GetUINameID() const; inline sal_uInt16 GetDescrID() const; @@ -238,7 +238,7 @@ public: /// sorted list with unique sal_Int32 values -class SortedIndividualInt32List +class SortedIndividualInt32List final { private: std::vector<sal_Int32> maVector; @@ -258,7 +258,7 @@ protected: public: SortedIndividualInt32List(); - virtual ~SortedIndividualInt32List(); + ~SortedIndividualInt32List(); inline sal_uInt32 Count() const { return maVector.size(); } @@ -409,12 +409,12 @@ enum ComplListAppendHandl }; -class ComplexList +class ComplexList final { private: std::vector<Complex*> maVector; public: - virtual ~ComplexList(); + ~ComplexList(); inline const Complex* Get( sal_uInt32 nIndex ) const; @@ -504,7 +504,7 @@ private: std::vector<ConvertData*> maVector; public: ConvertDataList(); - virtual ~ConvertDataList(); + ~ConvertDataList(); double Convert( double fVal, const OUString& rFrom, const OUString& rTo ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); }; diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx index de1a0b4..a2c89fa 100644 --- a/scaddins/source/datefunc/datefunc.hxx +++ b/scaddins/source/datefunc/datefunc.hxx @@ -125,7 +125,7 @@ struct ScaFuncDataBase bool bWithOpt; // first parameter is internal }; -class ScaFuncData +class ScaFuncData final { private: OUString aIntName; // internal name (get***) @@ -140,7 +140,7 @@ private: public: ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rRscMgr ); - virtual ~ScaFuncData(); + ~ScaFuncData(); inline sal_uInt16 GetUINameID() const { return nUINameID; } inline sal_uInt16 GetDescrID() const { return nDescrID; } diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx index 97da8cc..dc6a053 100644 --- a/scaddins/source/pricing/pricing.hxx +++ b/scaddins/source/pricing/pricing.hxx @@ -134,7 +134,7 @@ struct ScaFuncDataBase bool bWithOpt; // first parameter is internal }; -class ScaFuncData +class ScaFuncData final { private: OUString aIntName; // internal name (get***) @@ -149,7 +149,7 @@ private: public: ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rRscMgr ); - virtual ~ScaFuncData(); + ~ScaFuncData(); inline sal_uInt16 GetUINameID() const { return nUINameID; } inline sal_uInt16 GetDescrID() const { return nDescrID; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits