summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/inc/chartlock.hxx8
-rw-r--r--sc/inc/chartpos.hxx5
-rw-r--r--sc/inc/dptabres.hxx4
-rw-r--r--sc/source/filter/html/htmlpars.cxx4
-rw-r--r--sc/source/filter/inc/fprogressbar.hxx4
-rw-r--r--sc/source/filter/inc/namebuff.hxx4
-rw-r--r--sc/source/filter/inc/xltracer.hxx4
-rw-r--r--sc/source/ui/inc/PivotLayoutDialog.hxx4
-rw-r--r--sc/source/ui/inc/TableFillingAndNavigationTools.hxx4
-rw-r--r--sc/source/ui/inc/conflictsdlg.hxx8
-rw-r--r--sc/source/ui/inc/inputhdl.hxx4
-rw-r--r--scaddins/source/analysis/analysishelper.hxx14
-rw-r--r--scaddins/source/datefunc/datefunc.hxx4
-rw-r--r--scaddins/source/pricing/pricing.hxx4
14 files changed, 37 insertions, 38 deletions
diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx
index c9fd872e8414..d950f816d543 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 7bf2e556cfc9..18c40aee8e53 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 a462ade90d8f..112525cabe81 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 8ab731057ca3..df3abb0346e0 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 dc2fd81a6a3d..862a820d0ed7 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 71c8978a3c44..28167ac2b684 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 f3f1b1e4bd07..bc69f89a0485 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 e746df2d23b2..870cc8b04b58 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 2667ca854c39..0d8d066f94ff 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 db53e0915cf2..bed2f73a2707 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 e11cfb096f06..7a8e67352250 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 6fe803897f12..13932cbdaf1a 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 de1a0b4543d0..a2c89fa2486b 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 97da8cc747a1..dc6a053c5cf6 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; }