summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/formula/FormulaCompiler.hxx4
-rw-r--r--include/framework/framelistanalyzer.hxx4
-rw-r--r--include/framework/menuconfiguration.hxx4
-rw-r--r--include/jvmaccess/unovirtualmachine.hxx4
-rw-r--r--include/jvmaccess/virtualmachine.hxx4
-rw-r--r--include/oox/core/recordparser.hxx4
-rw-r--r--include/oox/crypto/CryptTools.hxx4
-rw-r--r--include/oox/drawingml/shape.hxx2
-rw-r--r--include/oox/helper/grabbagstack.hxx5
-rw-r--r--include/oox/ole/axcontrol.hxx4
-rw-r--r--include/oox/ole/vbacontrol.hxx4
-rw-r--r--include/oox/ppt/timenode.hxx4
12 files changed, 23 insertions, 24 deletions
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index e7268f62e85b..96d945f220b7 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 a1f2501bc08c..fe4798eafa56 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 3a618c26fa8b..4e434d81e068 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 4c409d53d418..c39d985a0cf6 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 4f805763459f..4b0025587093 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 0f53c423b72e..7a51aad48aac 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 d4fdda2c1cfb..84e4c485cb9d 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 4748dd10ae2d..978b71b52cae 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 efcb68dd8ea1..4821978ac31a 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 472c649b839f..39de87698a86 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 395b2c7e2588..df1c0410c7cd 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 40f51bc54964..7e6bd94b672c 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; }