[Libreoffice-commits] core.git: include/oox
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Oct 29 18:31:18 UTC 2019
include/oox/core/fasttokenhandler.hxx | 2 -
include/oox/core/filterdetect.hxx | 4 +-
include/oox/core/relationshandler.hxx | 2 -
include/oox/crypto/AgileEngine.hxx | 2 -
include/oox/crypto/CryptTools.hxx | 6 +--
include/oox/crypto/Standard2007Engine.hxx | 2 -
include/oox/drawingml/connectorshapecontext.hxx | 2 -
include/oox/drawingml/graphicshapecontext.hxx | 8 ++--
include/oox/drawingml/themefragmenthandler.hxx | 2 -
include/oox/export/chartexport.hxx | 2 -
include/oox/helper/binaryinputstream.hxx | 4 +-
include/oox/helper/binaryoutputstream.hxx | 2 -
include/oox/helper/progressbar.hxx | 4 +-
include/oox/helper/zipstorage.hxx | 2 -
include/oox/ole/axbinaryreader.hxx | 2 -
include/oox/ole/axbinarywriter.hxx | 2 -
include/oox/ole/axcontrol.hxx | 44 +++++++++++-------------
include/oox/ole/axcontrolfragment.hxx | 4 +-
include/oox/ole/olestorage.hxx | 2 -
include/oox/ole/vbacontrol.hxx | 2 -
include/oox/ole/vbainputstream.hxx | 2 -
include/oox/ppt/customshowlistcontext.hxx | 2 -
include/oox/ppt/layoutfragmenthandler.hxx | 2 -
include/oox/ppt/pptgraphicshapecontext.hxx | 2 -
include/oox/ppt/pptimport.hxx | 2 -
include/oox/ppt/pptshapecontext.hxx | 2 -
include/oox/ppt/pptshapegroupcontext.hxx | 2 -
include/oox/ppt/pptshapepropertiescontext.hxx | 2 -
include/oox/ppt/slidetimingcontext.hxx | 2 -
include/oox/ppt/slidetransitioncontext.hxx | 2 -
include/oox/ppt/soundactioncontext.hxx | 2 -
include/oox/ppt/timenodelistcontext.hxx | 2 -
include/oox/shape/ShapeFilterBase.hxx | 2 -
include/oox/vml/vmlinputstream.hxx | 2 -
include/oox/vml/vmlshape.hxx | 26 +++++++-------
include/oox/vml/vmlshapecontext.hxx | 10 ++---
include/oox/vml/vmltextboxcontext.hxx | 4 +-
37 files changed, 83 insertions(+), 85 deletions(-)
New commits:
commit 5ef60d5af78bfa9bc297df7d83042e53a9a04e0f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Oct 29 10:50:43 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Oct 29 19:30:12 2019 +0100
loplugin:finalclasses in oox
Change-Id: I95f69d99194f91851b2ef86bebf20006fa32fef3
Reviewed-on: https://gerrit.libreoffice.org/81656
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx
index 5972e07a71a2..62f260fd5f5d 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -39,7 +39,7 @@ namespace core {
/** Wrapper implementing the com.sun.star.xml.sax.XFastTokenHandler API interface
that provides access to the tokens generated from the internal token name list.
*/
-class OOX_DLLPUBLIC FastTokenHandler :
+class OOX_DLLPUBLIC FastTokenHandler final :
public ::cppu::WeakImplHelper< css::lang::XServiceInfo,
css::xml::sax::XFastTokenHandler >,
public sax_fastparser::FastTokenHandlerBase
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index e826705cc926..ac3194e81acd 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -55,7 +55,7 @@ namespace core {
It takes a reference to the filter string object via its constructor, and
puts the name of the detected filter to it, if it successfully finds one.
*/
-class FilterDetectDocHandler : public ::cppu::WeakImplHelper< css::xml::sax::XFastDocumentHandler >
+class FilterDetectDocHandler final : public ::cppu::WeakImplHelper< css::xml::sax::XFastDocumentHandler >
{
public:
explicit FilterDetectDocHandler( const css::uno::Reference< css::uno::XComponentContext >& rxContext, OUString& rFilter, const OUString& rFileName );
@@ -94,7 +94,7 @@ private:
};
-class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper<css::document::XExtendedFilterDetection, css::lang::XServiceInfo>
+class OOX_DLLPUBLIC FilterDetect final : public ::cppu::WeakImplHelper<css::document::XExtendedFilterDetection, css::lang::XServiceInfo>
{
public:
/// @throws css::uno::RuntimeException
diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx
index f4cb10302f17..5f284f4a6657 100644
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -35,7 +35,7 @@ namespace core {
class XmlFilterBase;
-class RelationsFragment : public FragmentHandler
+class RelationsFragment final : public FragmentHandler
{
public:
explicit RelationsFragment(
diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx
index 0395d42d357e..796f030b3bce 100644
--- a/include/oox/crypto/AgileEngine.hxx
+++ b/include/oox/crypto/AgileEngine.hxx
@@ -74,7 +74,7 @@ enum class AgileEncryptionPreset
AES_256_SHA512,
};
-class OOX_DLLPUBLIC AgileEngine : public CryptoEngine
+class OOX_DLLPUBLIC AgileEngine final : public CryptoEngine
{
private:
AgileEncryptionInfo mInfo;
diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx
index 1fded8d32149..5bd7119c548c 100644
--- a/include/oox/crypto/CryptTools.hxx
+++ b/include/oox/crypto/CryptTools.hxx
@@ -75,7 +75,7 @@ public:
virtual ~Crypto();
};
-class OOX_DLLPUBLIC Decrypt : public Crypto
+class OOX_DLLPUBLIC Decrypt final : public Crypto
{
public:
Decrypt(std::vector<sal_uInt8>& key, std::vector<sal_uInt8>& iv, CryptoType type);
@@ -93,7 +93,7 @@ public:
};
-class OOX_DLLPUBLIC Encrypt : public Crypto
+class OOX_DLLPUBLIC Encrypt final : public Crypto
{
public:
Encrypt(std::vector<sal_uInt8>& key, std::vector<sal_uInt8>& iv, CryptoType type);
@@ -104,7 +104,7 @@ public:
sal_uInt32 inputLength = 0);
};
-class OOX_DLLPUBLIC CryptoHash : public Crypto
+class OOX_DLLPUBLIC CryptoHash final : public Crypto
{
sal_Int32 const mnHashSize;
public:
diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx
index 88c45a46889b..7583447319c6 100644
--- a/include/oox/crypto/Standard2007Engine.hxx
+++ b/include/oox/crypto/Standard2007Engine.hxx
@@ -25,7 +25,7 @@ namespace oox {
namespace oox {
namespace core {
-class OOX_DLLPUBLIC Standard2007Engine : public CryptoEngine
+class OOX_DLLPUBLIC Standard2007Engine final : public CryptoEngine
{
msfilter::StandardEncryptionInfo mInfo;
diff --git a/include/oox/drawingml/connectorshapecontext.hxx b/include/oox/drawingml/connectorshapecontext.hxx
index 15d07e2366d2..4b897942394e 100644
--- a/include/oox/drawingml/connectorshapecontext.hxx
+++ b/include/oox/drawingml/connectorshapecontext.hxx
@@ -31,7 +31,7 @@ namespace oox { namespace core { class ContextHandler2Helper; } }
namespace oox { namespace drawingml {
-class OOX_DLLPUBLIC ConnectorShapeContext : public ShapeContext
+class OOX_DLLPUBLIC ConnectorShapeContext final : public ShapeContext
{
public:
ConnectorShapeContext( ::oox::core::ContextHandler2Helper const & rParent, const ShapePtr& pMasterShapePtr, const ShapePtr& pGroupShapePtr );
diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx
index 21790636e678..14b49f23615c 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -42,7 +42,7 @@ public:
};
-class OOX_DLLPUBLIC GraphicalObjectFrameContext : public ShapeContext
+class OOX_DLLPUBLIC GraphicalObjectFrameContext final : public ShapeContext
{
public:
GraphicalObjectFrameContext( ::oox::core::ContextHandler2Helper& rParent, const ShapePtr& pMasterShapePtr, const ShapePtr& pShapePtr, bool bEmbedShapesInChart );
@@ -56,7 +56,7 @@ private:
};
-class OleObjectGraphicDataContext : public ShapeContext
+class OleObjectGraphicDataContext final : public ShapeContext
{
public:
OleObjectGraphicDataContext( ::oox::core::ContextHandler2Helper const & rParent, const ShapePtr& pShapePtr );
@@ -68,7 +68,7 @@ private:
};
-class DiagramGraphicDataContext
+class DiagramGraphicDataContext final
: public ShapeContext
{
public:
@@ -86,7 +86,7 @@ private:
struct ChartShapeInfo;
-class ChartGraphicDataContext : public ShapeContext
+class ChartGraphicDataContext final : public ShapeContext
{
public:
explicit ChartGraphicDataContext(
diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx
index 25df0882cf09..b83541e7d154 100644
--- a/include/oox/drawingml/themefragmenthandler.hxx
+++ b/include/oox/drawingml/themefragmenthandler.hxx
@@ -35,7 +35,7 @@ namespace drawingml {
class Theme;
-class OOX_DLLPUBLIC ThemeFragmentHandler : public ::oox::core::FragmentHandler2
+class OOX_DLLPUBLIC ThemeFragmentHandler final : public ::oox::core::FragmentHandler2
{
public:
explicit ThemeFragmentHandler(
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index 304bd620d1af..ac22a18b8957 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -90,7 +90,7 @@ struct AxisIdPair{
{}
};
-class OOX_DLLPUBLIC ChartExport : public DrawingML {
+class OOX_DLLPUBLIC ChartExport final : public DrawingML {
public:
// first: data sequence for label, second: data sequence for values.
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 2e7f2e55012a..c73a5978db0a 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -281,7 +281,7 @@ private:
The binary data in the stream is assumed to be in little-endian format.
*/
-class OOX_DLLPUBLIC SequenceInputStream : public SequenceSeekableStream, public BinaryInputStream
+class OOX_DLLPUBLIC SequenceInputStream final : public SequenceSeekableStream, public BinaryInputStream
{
public:
/** Constructs the wrapper object for the passed data sequence.
@@ -324,7 +324,7 @@ private:
The stream MUST NOT be changed from outside as long as this stream wrapper
is used to read from it.
*/
-class RelativeInputStream : public BinaryInputStream
+class RelativeInputStream final : public BinaryInputStream
{
public:
/** Constructs the wrapper object for the passed stream.
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 7f7cea6a2115..9ef49331e994 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -168,7 +168,7 @@ private:
construction, the stream points to the beginning of the passed data
sequence. The data sequence is expanded automatically while writing to it.
*/
-class OOX_DLLPUBLIC SequenceOutputStream : public BinaryOutputStream
+class OOX_DLLPUBLIC SequenceOutputStream final : public BinaryOutputStream
{
public:
/** Constructs the wrapper object for the passed data sequence.
diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx
index 88ddb99ff919..a19696b7596c 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -79,7 +79,7 @@ public:
/** A simple progress bar.
*/
-class OOX_DLLPUBLIC ProgressBar : public IProgressBar
+class OOX_DLLPUBLIC ProgressBar final : public IProgressBar
{
public:
explicit ProgressBar(
@@ -102,7 +102,7 @@ private:
/** A progress bar containing several independent segments.
*/
-class OOX_DLLPUBLIC SegmentProgressBar : public ISegmentProgressBar
+class OOX_DLLPUBLIC SegmentProgressBar final : public ISegmentProgressBar
{
public:
explicit SegmentProgressBar(
diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx
index cea49fbd39bf..bd5cf28335bd 100644
--- a/include/oox/helper/zipstorage.hxx
+++ b/include/oox/helper/zipstorage.hxx
@@ -38,7 +38,7 @@ namespace oox {
/** Implements stream access for ZIP storages containing XML streams. */
-class ZipStorage : public StorageBase
+class ZipStorage final : public StorageBase
{
public:
explicit ZipStorage(
diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx
index f9e3ddea24ff..4ab1c504ab85 100644
--- a/include/oox/ole/axbinaryreader.hxx
+++ b/include/oox/ole/axbinaryreader.hxx
@@ -44,7 +44,7 @@ namespace ole {
possible to construct this wrapper with an unseekable input stream without
losing any functionality.
*/
-class AxAlignedInputStream : public BinaryInputStream
+class AxAlignedInputStream final : public BinaryInputStream
{
public:
explicit AxAlignedInputStream( BinaryInputStream& rInStrm );
diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx
index 92c33e659405..55cb652a6c7c 100644
--- a/include/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
@@ -31,7 +31,7 @@ namespace ole {
Unlike it's reader class counterpart it is NOT possible to construct this
wrapper with an unseekable output stream.
*/
-class AxAlignedOutputStream : public BinaryOutputStream
+class AxAlignedOutputStream final : public BinaryOutputStream
{
public:
explicit AxAlignedOutputStream( BinaryOutputStream& rOutStrm );
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index b53988e2f908..0be97b5043f3 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -428,7 +428,7 @@ private:
/** Model for a ComCtl scroll bar. */
-class ComCtlScrollBarModel : public ComCtlModelBase
+class ComCtlScrollBarModel final : public ComCtlModelBase
{
public:
explicit ComCtlScrollBarModel( sal_uInt16 nVersion );
@@ -436,10 +436,9 @@ public:
virtual ApiControlType getControlType() const override;
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override;
-protected:
+private:
virtual void importControlData( BinaryInputStream& rInStrm ) override;
-private:
sal_uInt32 mnScrollBarFlags; ///< Special flags for scroll bar model.
sal_Int32 mnLargeChange; ///< Increment step size (thumb).
sal_Int32 mnSmallChange; ///< Increment step size (buttons).
@@ -450,7 +449,7 @@ private:
/** Model for a ComCtl progress bar. */
-class ComCtlProgressBarModel : public ComCtlModelBase
+class ComCtlProgressBarModel final : public ComCtlModelBase
{
public:
explicit ComCtlProgressBarModel( sal_uInt16 nVersion );
@@ -458,10 +457,9 @@ public:
virtual ApiControlType getControlType() const override;
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override;
-protected:
+private:
virtual void importControlData( BinaryInputStream& rInStrm ) override;
-private:
float mfMin; ///< Minimum of the value range.
float mfMax; ///< Maximum of the value range.
sal_uInt16 mnVertical; ///< 0 = horizontal, 1 = vertical.
@@ -503,7 +501,7 @@ private:
/** Model for a Forms 2.0 command button. */
-class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel
+class OOX_DLLPUBLIC AxCommandButtonModel final : public AxFontDataModel
{
public:
explicit AxCommandButtonModel();
@@ -531,7 +529,7 @@ public: // direct access needed for legacy VML drawing controls
/** Model for a Forms 2.0 label. */
-class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel
+class OOX_DLLPUBLIC AxLabelModel final : public AxFontDataModel
{
public:
explicit AxLabelModel();
@@ -558,7 +556,7 @@ public: // direct access needed for legacy VML drawing controls
/** Model for a Forms 2.0 image. */
-class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase
+class OOX_DLLPUBLIC AxImageModel final : public AxControlModelBase
{
public:
explicit AxImageModel();
@@ -584,7 +582,7 @@ private:
bool mbPicTiling; ///< True = picture is repeated.
};
-class OOX_DLLPUBLIC AxTabStripModel : public AxFontDataModel
+class OOX_DLLPUBLIC AxTabStripModel final : public AxFontDataModel
{
public:
explicit AxTabStripModel();
@@ -641,7 +639,7 @@ public: // direct access needed for legacy VML drawing controls
/** Model for a Forms 2.0 toggle button. */
-class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxToggleButtonModel final : public AxMorphDataModelBase
{
public:
explicit AxToggleButtonModel();
@@ -654,7 +652,7 @@ public:
/** Model for a Forms 2.0 check box. */
-class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxCheckBoxModel final : public AxMorphDataModelBase
{
public:
explicit AxCheckBoxModel();
@@ -667,7 +665,7 @@ public:
/** Model for a Forms 2.0 option button. */
-class OOX_DLLPUBLIC AxOptionButtonModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxOptionButtonModel final : public AxMorphDataModelBase
{
public:
explicit AxOptionButtonModel();
@@ -696,7 +694,7 @@ public:
/** Model for a numeric field (legacy drawing controls only). */
-class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxNumericFieldModel final : public AxMorphDataModelBase
{
public:
explicit AxNumericFieldModel();
@@ -722,7 +720,7 @@ public:
/** Model for a Forms 2.0 combo box. */
-class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxComboBoxModel final : public AxMorphDataModelBase
{
public:
explicit AxComboBoxModel();
@@ -735,7 +733,7 @@ public:
/** Model for a Forms 2.0 spin button. */
-class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase
+class OOX_DLLPUBLIC AxSpinButtonModel final : public AxControlModelBase
{
public:
explicit AxSpinButtonModel();
@@ -763,7 +761,7 @@ public: // direct access needed for legacy VML drawing controls
/** Model for a Forms 2.0 scroll bar. */
-class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase
+class OOX_DLLPUBLIC AxScrollBarModel final : public AxControlModelBase
{
public:
explicit AxScrollBarModel();
@@ -833,7 +831,7 @@ public: // direct access needed for legacy VML drawing controls
/** Model for a Forms 2.0 frame control. */
-class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxFrameModel final : public AxContainerModelBase
{
public:
explicit AxFrameModel();
@@ -842,7 +840,7 @@ public:
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override;
};
-class OOX_DLLPUBLIC AxPageModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxPageModel final : public AxContainerModelBase
{
public:
explicit AxPageModel();
@@ -851,7 +849,7 @@ public:
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override;
};
-class OOX_DLLPUBLIC AxMultiPageModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxMultiPageModel final : public AxContainerModelBase
{
public:
explicit AxMultiPageModel();
@@ -866,7 +864,7 @@ public:
/** Model for a Forms 2.0 user form. */
-class OOX_DLLPUBLIC AxUserFormModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxUserFormModel final : public AxContainerModelBase
{
public:
explicit AxUserFormModel();
@@ -875,7 +873,7 @@ public:
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override;
};
-class HtmlSelectModel : public AxListBoxModel
+class HtmlSelectModel final : public AxListBoxModel
{
css::uno::Sequence< OUString > msListData;
css::uno::Sequence< sal_Int16 > msIndices;
@@ -885,7 +883,7 @@ public:
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override;
};
-class HtmlTextBoxModel : public AxTextBoxModel
+class HtmlTextBoxModel final : public AxTextBoxModel
{
public:
explicit HtmlTextBoxModel();
diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx
index cc11252aa418..49c71d4bfca1 100644
--- a/include/oox/ole/axcontrolfragment.hxx
+++ b/include/oox/ole/axcontrolfragment.hxx
@@ -37,7 +37,7 @@ class EmbeddedControl;
/** Context handler for ActiveX form control model properties. */
-class AxControlPropertyContext : public ::oox::core::ContextHandler2
+class AxControlPropertyContext final : public ::oox::core::ContextHandler2
{
public:
explicit AxControlPropertyContext(
@@ -54,7 +54,7 @@ private:
/** Fragment handler for an embedded ActiveX form control fragment. */
-class AxControlFragment : public ::oox::core::FragmentHandler2
+class AxControlFragment final : public ::oox::core::FragmentHandler2
{
public:
explicit AxControlFragment(
diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx
index ab8c249a652f..e9999668ca12 100644
--- a/include/oox/ole/olestorage.hxx
+++ b/include/oox/ole/olestorage.hxx
@@ -41,7 +41,7 @@ namespace ole {
/** Implements stream access for binary OLE storages. */
-class OOX_DLLPUBLIC OleStorage : public StorageBase
+class OOX_DLLPUBLIC OleStorage final : public StorageBase
{
public:
explicit OleStorage(
diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx
index 911b14c324cb..80244bc025f4 100644
--- a/include/oox/ole/vbacontrol.hxx
+++ b/include/oox/ole/vbacontrol.hxx
@@ -184,7 +184,7 @@ private:
};
-class VbaUserForm : public VbaFormControl
+class VbaUserForm final : public VbaFormControl
{
public:
explicit VbaUserForm(
diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx
index f002ce816025..e03429ec66f9 100644
--- a/include/oox/ole/vbainputstream.hxx
+++ b/include/oox/ole/vbainputstream.hxx
@@ -32,7 +32,7 @@ namespace ole {
/** A non-seekable input stream that implements run-length decompression. */
-class VbaInputStream : public BinaryInputStream
+class VbaInputStream final : public BinaryInputStream
{
public:
explicit VbaInputStream( BinaryInputStream& rInStrm );
diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx
index 216e43fe9d36..f49924deeba8 100644
--- a/include/oox/ppt/customshowlistcontext.hxx
+++ b/include/oox/ppt/customshowlistcontext.hxx
@@ -40,7 +40,7 @@ namespace oox { namespace ppt {
};
/** CT_ */
- class CustomShowListContext : public ::oox::core::FragmentHandler2
+ class CustomShowListContext final : public ::oox::core::FragmentHandler2
{
std::vector< CustomShow >& mrCustomShowList;
diff --git a/include/oox/ppt/layoutfragmenthandler.hxx b/include/oox/ppt/layoutfragmenthandler.hxx
index 838ba947d1a5..1e4c0603cf10 100644
--- a/include/oox/ppt/layoutfragmenthandler.hxx
+++ b/include/oox/ppt/layoutfragmenthandler.hxx
@@ -31,7 +31,7 @@ namespace oox { namespace core { class XmlFilterBase; } }
namespace oox { namespace ppt {
-class LayoutFragmentHandler : public SlideFragmentHandler
+class LayoutFragmentHandler final : public SlideFragmentHandler
{
public:
LayoutFragmentHandler(::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath,
diff --git a/include/oox/ppt/pptgraphicshapecontext.hxx b/include/oox/ppt/pptgraphicshapecontext.hxx
index 14e57633e0c1..f2d4e4d63177 100644
--- a/include/oox/ppt/pptgraphicshapecontext.hxx
+++ b/include/oox/ppt/pptgraphicshapecontext.hxx
@@ -31,7 +31,7 @@ namespace oox { namespace core { class ContextHandler2Helper; } }
namespace oox { namespace ppt {
-class PPTGraphicShapeContext : public ::oox::drawingml::GraphicShapeContext
+class PPTGraphicShapeContext final : public ::oox::drawingml::GraphicShapeContext
{
SlidePersistPtr mpSlidePersistPtr;
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index c5ff1b1e5a0c..2ea62da02c1b 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -49,7 +49,7 @@ namespace oox {
namespace oox { namespace ppt {
-class PowerPointImport : public oox::core::XmlFilterBase
+class PowerPointImport final : public oox::core::XmlFilterBase
{
public:
/// @throws css::uno::RuntimeException
diff --git a/include/oox/ppt/pptshapecontext.hxx b/include/oox/ppt/pptshapecontext.hxx
index 6996fe730bd6..334904931fe2 100644
--- a/include/oox/ppt/pptshapecontext.hxx
+++ b/include/oox/ppt/pptshapecontext.hxx
@@ -31,7 +31,7 @@ namespace oox { namespace core { class ContextHandler2Helper; } }
namespace oox { namespace ppt {
-class PPTShapeContext : public ::oox::drawingml::ShapeContext
+class PPTShapeContext final : public ::oox::drawingml::ShapeContext
{
SlidePersistPtr mpSlidePersistPtr;
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx
index 1043b3fa8177..76b743ee16af 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -34,7 +34,7 @@ namespace oox {
namespace oox { namespace ppt {
-class PPTShapeGroupContext : public ::oox::drawingml::ShapeGroupContext
+class PPTShapeGroupContext final : public ::oox::drawingml::ShapeGroupContext
{
SlidePersistPtr const mpSlidePersistPtr;
ShapeLocation const meShapeLocation;
diff --git a/include/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx
index 7e2039a7c794..06d4cec1461b 100644
--- a/include/oox/ppt/pptshapepropertiescontext.hxx
+++ b/include/oox/ppt/pptshapepropertiescontext.hxx
@@ -32,7 +32,7 @@ namespace oox {
namespace oox { namespace ppt {
-class PPTShapePropertiesContext : public ::oox::drawingml::ShapePropertiesContext
+class PPTShapePropertiesContext final : public ::oox::drawingml::ShapePropertiesContext
{
public:
PPTShapePropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, ::oox::drawingml::Shape& rShape );
diff --git a/include/oox/ppt/slidetimingcontext.hxx b/include/oox/ppt/slidetimingcontext.hxx
index f1c428682db2..4cdd4998e37d 100644
--- a/include/oox/ppt/slidetimingcontext.hxx
+++ b/include/oox/ppt/slidetimingcontext.hxx
@@ -29,7 +29,7 @@ namespace oox { class AttributeList; }
namespace oox { namespace ppt {
-class SlideTimingContext : public ::oox::core::FragmentHandler2
+class SlideTimingContext final : public ::oox::core::FragmentHandler2
{
public:
SlideTimingContext( ::oox::core::FragmentHandler2 const & rParent, TimeNodePtrList & aTimeNodeList ) throw();
diff --git a/include/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx
index f6b2e7a91d56..501780fb96eb 100644
--- a/include/oox/ppt/slidetransitioncontext.hxx
+++ b/include/oox/ppt/slidetransitioncontext.hxx
@@ -32,7 +32,7 @@ namespace oox {
namespace oox { namespace ppt {
- class SlideTransitionContext : public ::oox::core::FragmentHandler2
+ class SlideTransitionContext final : public ::oox::core::FragmentHandler2
{
public:
SlideTransitionContext( ::oox::core::FragmentHandler2 const & rParent,
diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx
index 99435959c472..686e00e19956 100644
--- a/include/oox/ppt/soundactioncontext.hxx
+++ b/include/oox/ppt/soundactioncontext.hxx
@@ -33,7 +33,7 @@ namespace oox {
namespace oox { namespace ppt {
-class SoundActionContext : public ::oox::core::FragmentHandler2
+class SoundActionContext final : public ::oox::core::FragmentHandler2
{
public:
SoundActionContext( ::oox::core::FragmentHandler2 const & rParent, PropertyMap & aProperties ) throw();
diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index 00815a40a668..b4f5e3ca5539 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -51,7 +51,7 @@ namespace oox { namespace ppt {
/** FastParser context for XML_tnLst, XML_subTnLst and XML_childTnLst */
-class TimeNodeListContext : public ::oox::core::FragmentHandler2
+class TimeNodeListContext final : public ::oox::core::FragmentHandler2
{
public:
TimeNodeListContext( ::oox::core::FragmentHandler2 const & rParent, TimeNodePtrList & aList ) throw();
diff --git a/include/oox/shape/ShapeFilterBase.hxx b/include/oox/shape/ShapeFilterBase.hxx
index b0ddbff4e217..b5b90ddafa37 100644
--- a/include/oox/shape/ShapeFilterBase.hxx
+++ b/include/oox/shape/ShapeFilterBase.hxx
@@ -36,7 +36,7 @@ typedef std::shared_ptr< TableStyleList > TableStyleListPtr;
namespace oox {
namespace shape {
-class OOX_DLLPUBLIC ShapeFilterBase : public core::XmlFilterBase
+class OOX_DLLPUBLIC ShapeFilterBase final : public core::XmlFilterBase
{
public:
typedef std::shared_ptr<ShapeFilterBase> Pointer_t;
diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx
index 85c8116634e4..f9b40ec71d77 100644
--- a/include/oox/vml/vmlinputstream.hxx
+++ b/include/oox/vml/vmlinputstream.hxx
@@ -54,7 +54,7 @@ namespace vml {
3) Line breaks represented by a single <br> element (without matching
</br> element) are replaced by a literal LF character.
*/
-class InputStream : public ::cppu::WeakImplHelper< css::io::XInputStream >
+class InputStream final : public ::cppu::WeakImplHelper< css::io::XInputStream >
{
public:
explicit InputStream(
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index cb60a13c6356..dc4db50c27fe 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -317,11 +317,11 @@ private:
/** A rectangular shape object. */
-class RectangleShape : public SimpleShape
+class RectangleShape final : public SimpleShape
{
public:
explicit RectangleShape( Drawing& rDrawing );
-protected:
+private:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual css::uno::Reference<css::drawing::XShape>
implConvertAndInsert(
@@ -331,7 +331,7 @@ protected:
/** An oval shape object. */
-class EllipseShape : public SimpleShape
+class EllipseShape final : public SimpleShape
{
public:
explicit EllipseShape( Drawing& rDrawing );
@@ -339,12 +339,12 @@ public:
/** A polygon shape object. */
-class PolyLineShape : public SimpleShape
+class PolyLineShape final : public SimpleShape
{
public:
explicit PolyLineShape( Drawing& rDrawing );
-protected:
+private:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual css::uno::Reference< css::drawing::XShape >
implConvertAndInsert(
@@ -353,12 +353,12 @@ protected:
};
/** A Line shape object. */
-class LineShape : public SimpleShape
+class LineShape final : public SimpleShape
{
public:
explicit LineShape( Drawing& rDrawing );
-protected:
+private:
/** Returns the absolute shape rectangle. */
virtual css::awt::Rectangle getAbsRectangle() const override;
/** Returns the rectangle relative to the parent coordinate system. */
@@ -367,12 +367,12 @@ protected:
/** Bezier shape object that supports to, from, control1 and control2
attribute or path attribute specification */
-class BezierShape : public SimpleShape
+class BezierShape final : public SimpleShape
{
public:
explicit BezierShape( Drawing& rDrawing );
-protected:
+private:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual css::uno::Reference< css::drawing::XShape >
implConvertAndInsert(
@@ -398,12 +398,12 @@ protected:
/** A complex shape object. This can be a picture shape, a custom shape, an OLE
object, or an ActiveX form control. */
-class ComplexShape : public CustomShape
+class ComplexShape final : public CustomShape
{
public:
explicit ComplexShape( Drawing& rDrawing );
-protected:
+private:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual css::uno::Reference< css::drawing::XShape >
implConvertAndInsert(
@@ -413,7 +413,7 @@ protected:
/** A group shape that extends the basic shape by a container of child shapes. */
-class GroupShape : public ShapeBase
+class GroupShape final : public ShapeBase
{
public:
explicit GroupShape( Drawing& rDrawing );
@@ -432,7 +432,7 @@ public:
/** Returns the shape with the passed identifier from the child shapes. */
virtual const ShapeBase* getChildById( const OUString& rShapeId ) const override;
-protected:
+private:
/** Creates the corresponding XShape and inserts it into the passed container. */
virtual css::uno::Reference< css::drawing::XShape >
implConvertAndInsert(
diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx
index 7251c1656f68..c07bcf12e84f 100644
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -45,7 +45,7 @@ class RectangleShape;
class ShapeContainer;
-class ShapeLayoutContext : public ::oox::core::ContextHandler2
+class ShapeLayoutContext final : public ::oox::core::ContextHandler2
{
public:
explicit ShapeLayoutContext(
@@ -60,7 +60,7 @@ private:
};
-class ClientDataContext : public ::oox::core::ContextHandler2
+class ClientDataContext final : public ::oox::core::ContextHandler2
{
public:
explicit ClientDataContext(
@@ -147,7 +147,7 @@ private:
};
-class GroupShapeContext : public ShapeContext
+class GroupShapeContext final : public ShapeContext
{
public:
explicit GroupShapeContext(::oox::core::ContextHandler2Helper const& rParent,
@@ -162,7 +162,7 @@ private:
};
-class RectangleShapeContext : public ShapeContext
+class RectangleShapeContext final : public ShapeContext
{
public:
explicit RectangleShapeContext(::oox::core::ContextHandler2Helper const& rParent,
@@ -173,7 +173,7 @@ public:
onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
};
-class ControlShapeContext : public ShapeContextBase
+class ControlShapeContext final : public ShapeContextBase
{
public:
explicit ControlShapeContext(
diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx
index f40eae2676df..b9d29ed7b35f 100644
--- a/include/oox/vml/vmltextboxcontext.hxx
+++ b/include/oox/vml/vmltextboxcontext.hxx
@@ -35,7 +35,7 @@ namespace oox {
namespace vml {
-class TextPortionContext : public ::oox::core::ContextHandler2
+class TextPortionContext final : public ::oox::core::ContextHandler2
{
public:
explicit TextPortionContext(
@@ -60,7 +60,7 @@ private:
};
-class TextBoxContext : public ::oox::core::ContextHandler2
+class TextBoxContext final : public ::oox::core::ContextHandler2
{
public:
explicit TextBoxContext(
More information about the Libreoffice-commits
mailing list