[Libreoffice-commits] core.git: sc/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 21 18:03:31 UTC 2021


 sc/source/filter/inc/addressconverter.hxx    |    2 +-
 sc/source/filter/inc/autofilterbuffer.hxx    |   16 ++++++++--------
 sc/source/filter/inc/autofiltercontext.hxx   |   25 ++++++++++---------------
 sc/source/filter/inc/chartsheetfragment.hxx  |    5 ++---
 sc/source/filter/inc/colrowst.hxx            |    2 +-
 sc/source/filter/inc/commentsbuffer.hxx      |    4 ++--
 sc/source/filter/inc/commentsfragment.hxx    |    6 ++----
 sc/source/filter/inc/condformatbuffer.hxx    |   12 ++++++------
 sc/source/filter/inc/condformatcontext.hxx   |   11 +++++------
 sc/source/filter/inc/connectionsbuffer.hxx   |    4 ++--
 sc/source/filter/inc/connectionsfragment.hxx |    9 ++++-----
 sc/source/filter/inc/defnamesbuffer.hxx      |    4 ++--
 sc/source/filter/inc/drawingbase.hxx         |    2 +-
 sc/source/filter/inc/drawingfragment.hxx     |   24 +++++++++++-------------
 sc/source/filter/inc/excdoc.hxx              |    4 ++--
 sc/source/filter/inc/excelchartconverter.hxx |    2 +-
 sc/source/filter/inc/excelfilter.hxx         |    2 +-
 sc/source/filter/inc/excelvbaproject.hxx     |    5 ++---
 18 files changed, 63 insertions(+), 76 deletions(-)

New commits:
commit 1d3e95415e218dfe44ab85d9df501ce9fcd86ccb
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jun 21 15:03:37 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jun 21 20:02:51 2021 +0200

    loplugin:finalclasses in sc/.../filter/inc
    
    Change-Id: Ibaaff4cf3c7a60714f73c7f1b40a5e857060f26c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117589
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index 1a9dc0835aee..af1bc340c47b 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -92,7 +92,7 @@ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRangeList
 
 /** Converter for cell addresses and cell ranges for OOXML and BIFF filters.
  */
-class AddressConverter : public WorkbookHelper
+class AddressConverter final : public WorkbookHelper
 {
 public:
     explicit            AddressConverter( const WorkbookHelper& rHelper );
diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx
index 0f9135be7123..788be95615c1 100644
--- a/sc/source/filter/inc/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -72,7 +72,7 @@ public:
 /** Settings for a discrete filter, specifying a list of values to be shown in
     the filtered range.
  */
-class DiscreteFilter : public FilterSettingsBase
+class DiscreteFilter final : public FilterSettingsBase
 {
 public:
     explicit            DiscreteFilter( const WorkbookHelper& rHelper );
@@ -93,7 +93,7 @@ private:
 };
 
 /** Settings for a top-10 filter. */
-class Top10Filter : public FilterSettingsBase
+class Top10Filter final : public FilterSettingsBase
 {
 public:
     explicit            Top10Filter( const WorkbookHelper& rHelper );
@@ -113,7 +113,7 @@ private:
 };
 
 /** Settings for a color filter. */
-class ColorFilter : public FilterSettingsBase
+class ColorFilter final : public FilterSettingsBase
 {
 public:
     explicit ColorFilter(const WorkbookHelper& rHelper);
@@ -152,7 +152,7 @@ struct FilterCriterionModel
 /** Settings for a custom filter, specifying one or two comparison operators
     associated with some values.
  */
-class CustomFilter : public FilterSettingsBase
+class CustomFilter final : public FilterSettingsBase
 {
 public:
     explicit            CustomFilter( const WorkbookHelper& rHelper );
@@ -179,7 +179,7 @@ private:
 /** A column in a filtered range. Contains an object with specific filter
     settings for the cells in the column.
  */
-class FilterColumn : public WorkbookHelper
+class FilterColumn final : public WorkbookHelper
 {
 public:
     explicit            FilterColumn( const WorkbookHelper& rHelper );
@@ -208,7 +208,7 @@ private:
 
 // class SortCondition
 
-class SortCondition : public WorkbookHelper
+class SortCondition final : public WorkbookHelper
 {
 public:
     explicit SortCondition( const WorkbookHelper& rHelper );
@@ -222,7 +222,7 @@ public:
 
 // class AutoFilter
 
-class AutoFilter : public WorkbookHelper
+class AutoFilter final : public WorkbookHelper
 {
 public:
     explicit            AutoFilter( const WorkbookHelper& rHelper );
@@ -254,7 +254,7 @@ private:
     SortConditionVector maSortConditions;
 };
 
-class AutoFilterBuffer : public WorkbookHelper
+class AutoFilterBuffer final : public WorkbookHelper
 {
 public:
     explicit            AutoFilterBuffer( const WorkbookHelper& rHelper );
diff --git a/sc/source/filter/inc/autofiltercontext.hxx b/sc/source/filter/inc/autofiltercontext.hxx
index a008d0c4ea7c..f6eadab801bc 100644
--- a/sc/source/filter/inc/autofiltercontext.hxx
+++ b/sc/source/filter/inc/autofiltercontext.hxx
@@ -28,89 +28,84 @@ class AutoFilter;
 class FilterColumn;
 class FilterSettingsBase;
 
-class FilterSettingsContext : public WorksheetContextBase
+class FilterSettingsContext final : public WorksheetContextBase
 {
 public:
     explicit            FilterSettingsContext( WorksheetContextBase& rParent, FilterSettingsBase& rFilterSettings );
 
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onStartElement( const AttributeList& rAttribs ) override;
 
     virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override;
     virtual void        onStartRecord( SequenceInputStream& rStrm ) override;
 
-private:
     FilterSettingsBase& mrFilterSettings;
 };
 
-class FilterColumnContext : public WorksheetContextBase
+class FilterColumnContext final : public WorksheetContextBase
 {
 public:
     explicit            FilterColumnContext( WorksheetContextBase& rParent, FilterColumn& rFilterColumn );
 
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onStartElement( const AttributeList& rAttribs ) override;
 
     virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override;
     virtual void        onStartRecord( SequenceInputStream& rStrm ) override;
 
-private:
     FilterColumn&       mrFilterColumn;
 };
 
 // class SortConditionContext
 
-class SortConditionContext : public WorksheetContextBase
+class SortConditionContext final : public WorksheetContextBase
 {
 public:
     explicit            SortConditionContext( WorksheetContextBase& rFragment, SortCondition& rSortCondition );
 
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onStartElement( const AttributeList& rAttribs ) override;
 
     virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override;
     virtual void        onStartRecord( SequenceInputStream& rStrm ) override;
 
-private:
     SortCondition&      mrSortCondition;
 };
 
 // class SortStateContext
 
-class SortStateContext : public WorksheetContextBase
+class SortStateContext final : public WorksheetContextBase
 {
 public:
     explicit            SortStateContext( WorksheetContextBase& rFragment, AutoFilter& rAutoFilter );
 
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onStartElement( const AttributeList& rAttribs ) override;
 
     virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override;
     virtual void        onStartRecord( SequenceInputStream& rStrm ) override;
 
-private:
     AutoFilter&         mrAutoFilter;
 };
 
 // class AutoFilterContext
 
-class AutoFilterContext : public WorksheetContextBase
+class AutoFilterContext final : public WorksheetContextBase
 {
 public:
     explicit            AutoFilterContext( WorksheetFragmentBase& rFragment, AutoFilter& rAutoFilter );
 
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onStartElement( const AttributeList& rAttribs ) override;
 
     virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override;
     virtual void        onStartRecord( SequenceInputStream& rStrm ) override;
 
-private:
     AutoFilter&         mrAutoFilter;
 };
 
diff --git a/sc/source/filter/inc/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx
index 5e1e3f41cc99..c2cce27c2cc8 100644
--- a/sc/source/filter/inc/chartsheetfragment.hxx
+++ b/sc/source/filter/inc/chartsheetfragment.hxx
@@ -23,14 +23,14 @@
 
 namespace oox::xls {
 
-class ChartsheetFragment : public WorksheetFragmentBase
+class ChartsheetFragment final : public WorksheetFragmentBase
 {
 public:
     explicit            ChartsheetFragment(
                             const WorksheetHelper& rHelper,
                             const OUString& rFragmentPath );
 
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onCharacters( const OUString& rChars ) override;
 
@@ -40,7 +40,6 @@ protected:
     virtual void        initializeImport() override;
     virtual void        finalizeImport() override;
 
-private:
     /** Imports the relation identifier for the DrawingML part. */
     void                importDrawing( const AttributeList& rAttribs );
     /** Imports the DRAWING record containing the relation identifier for the DrawingML part. */
diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx
index 3baa5b6ec471..963ea9682257 100644
--- a/sc/source/filter/inc/colrowst.hxx
+++ b/sc/source/filter/inc/colrowst.hxx
@@ -35,7 +35,7 @@ namespace o3tl {
 }
 
 
-class XclImpColRowSettings : protected XclImpRoot
+class XclImpColRowSettings final : protected XclImpRoot
 {
 public:
     explicit            XclImpColRowSettings( const XclImpRoot& rRoot );
diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx
index ae2edd35e0ec..c30d6765d6f6 100644
--- a/sc/source/filter/inc/commentsbuffer.hxx
+++ b/sc/source/filter/inc/commentsbuffer.hxx
@@ -42,7 +42,7 @@ struct CommentModel
     explicit            CommentModel();
 };
 
-class Comment : public WorksheetHelper
+class Comment final : public WorksheetHelper
 {
 public:
     explicit            Comment( const WorksheetHelper& rHelper );
@@ -66,7 +66,7 @@ private:
 
 typedef std::shared_ptr< Comment > CommentRef;
 
-class CommentsBuffer : public WorksheetHelper
+class CommentsBuffer final : public WorksheetHelper
 {
 public:
     explicit            CommentsBuffer( const WorksheetHelper& rHelper );
diff --git a/sc/source/filter/inc/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx
index fc3f35766e1d..4acf4b0d88ad 100644
--- a/sc/source/filter/inc/commentsfragment.hxx
+++ b/sc/source/filter/inc/commentsfragment.hxx
@@ -24,13 +24,13 @@
 
 namespace oox::xls {
 
-class CommentsFragment : public WorksheetFragmentBase
+class CommentsFragment final : public WorksheetFragmentBase
 {
 public:
     explicit            CommentsFragment(
                             const WorksheetHelper& rHelper,
                             const OUString& rFragmentPath );
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onCharacters( const OUString& rChars ) override;
     virtual void        onEndElement() override;
@@ -40,13 +40,11 @@ protected:
 
     virtual const ::oox::core::RecordInfo* getRecordInfos() const override;
 
-private:
     /** Imports comment data from the comment element. */
     void                importComment( const AttributeList& rAttribs );
     /** Imports comment data from the COMMENT record. */
     void                importComment( SequenceInputStream& rStrm );
 
-private:
     CommentRef          mxComment;
 };
 
diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index b3f337dfa516..92c7463a5b6a 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -91,7 +91,7 @@ struct ColorScaleRuleModelEntry
         mbNum(false) {}
 };
 
-class ColorScaleRule : public WorksheetHelper
+class ColorScaleRule final : public WorksheetHelper
 {
 public:
     ColorScaleRule( const CondFormat& rFormat );
@@ -108,7 +108,7 @@ private:
     sal_uInt32 mnCol;
 };
 
-class DataBarRule : public WorksheetHelper
+class DataBarRule final : public WorksheetHelper
 {
 public:
     DataBarRule( const CondFormat& rFormat );
@@ -127,7 +127,7 @@ private:
     std::unique_ptr<ColorScaleRuleModelEntry> mpLowerLimit;
 };
 
-class IconSetRule : public WorksheetHelper
+class IconSetRule final : public WorksheetHelper
 {
 public:
     IconSetRule( const WorksheetHelper& rParent );
@@ -146,7 +146,7 @@ private:
 };
 
 /** Represents a single rule in a conditional formatting. */
-class CondFormatRule : public WorksheetHelper
+class CondFormatRule final : public WorksheetHelper
 {
 public:
     explicit            CondFormatRule( const CondFormat& rCondFormat, ScConditionalFormat* pFormat );
@@ -196,7 +196,7 @@ struct CondFormatModel
 class CondFormatBuffer;
 
 /** Represents a conditional formatting object with a list of affected cell ranges. */
-class CondFormat : public WorksheetHelper
+class CondFormat final : public WorksheetHelper
 {
 friend class CondFormatBuffer;
 public:
@@ -289,7 +289,7 @@ private:
 typedef std::shared_ptr< CondFormat > CondFormatRef;
 typedef std::shared_ptr< ExtCfDataBarRule > ExtCfDataBarRuleRef;
 
-class CondFormatBuffer : public WorksheetHelper
+class CondFormatBuffer final : public WorksheetHelper
 {
 public:
     explicit            CondFormatBuffer( const WorksheetHelper& rHelper );
diff --git a/sc/source/filter/inc/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx
index 1ab9057f9264..4da08a5bbf10 100644
--- a/sc/source/filter/inc/condformatcontext.hxx
+++ b/sc/source/filter/inc/condformatcontext.hxx
@@ -26,7 +26,7 @@ namespace oox::xls {
 
 class CondFormatContext;
 
-class ColorScaleContext : public WorksheetContextBase
+class ColorScaleContext final : public WorksheetContextBase
 {
 public:
     explicit ColorScaleContext( CondFormatContext& rFragment, CondFormatRuleRef const & xRule );
@@ -38,7 +38,7 @@ private:
     CondFormatRuleRef mxRule;
 };
 
-class DataBarContext : public WorksheetContextBase
+class DataBarContext final : public WorksheetContextBase
 {
 public:
     explicit DataBarContext( CondFormatContext& rFormat, CondFormatRuleRef const & xRule );
@@ -50,7 +50,7 @@ private:
     CondFormatRuleRef mxRule;
 };
 
-class IconSetContext : public WorksheetContextBase
+class IconSetContext final : public WorksheetContextBase
 {
 public:
     explicit IconSetContext( WorksheetContextBase& rParent, IconSetRule* pIconSet );
@@ -65,12 +65,12 @@ private:
     OUString maChars;
 };
 
-class CondFormatContext : public WorksheetContextBase
+class CondFormatContext final : public WorksheetContextBase
 {
 public:
     explicit            CondFormatContext( WorksheetFragmentBase& rFragment );
 
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onStartElement( const AttributeList& rAttribs ) override;
     virtual void        onCharacters( const OUString& rChars ) override;
@@ -80,7 +80,6 @@ protected:
     virtual void        onStartRecord( SequenceInputStream& rStrm ) override;
     virtual void        onEndRecord() override;
 
-private:
     CondFormatRef       mxCondFmt;
     CondFormatRuleRef   mxRule;
 };
diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx
index 108c05db90f1..9308da5a36b5 100644
--- a/sc/source/filter/inc/connectionsbuffer.hxx
+++ b/sc/source/filter/inc/connectionsbuffer.hxx
@@ -92,7 +92,7 @@ struct ConnectionModel
 };
 
 /** An external data connection (database, web query, etc.). */
-class Connection : public WorkbookHelper
+class Connection final : public WorkbookHelper
 {
 public:
     explicit            Connection( const WorkbookHelper& rHelper );
@@ -128,7 +128,7 @@ private:
 
 typedef std::shared_ptr< Connection > ConnectionRef;
 
-class ConnectionsBuffer : public WorkbookHelper
+class ConnectionsBuffer final : public WorkbookHelper
 {
 public:
     explicit            ConnectionsBuffer( const WorkbookHelper& rHelper );
diff --git a/sc/source/filter/inc/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx
index 827361a6415a..8eaec1c410f6 100644
--- a/sc/source/filter/inc/connectionsfragment.hxx
+++ b/sc/source/filter/inc/connectionsfragment.hxx
@@ -25,30 +25,29 @@ namespace oox::xls {
 
 class Connection;
 
-class ConnectionContext : public WorkbookContextBase
+class ConnectionContext final : public WorkbookContextBase
 {
 public:
     explicit            ConnectionContext( WorkbookFragmentBase& rParent, Connection& rConnection );
 
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onStartElement( const AttributeList& rAttribs ) override;
 
     virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override;
     virtual void        onStartRecord( SequenceInputStream& rStrm ) override;
 
-private:
     Connection&         mrConnection;
 };
 
-class ConnectionsFragment : public WorkbookFragmentBase
+class ConnectionsFragment final : public WorkbookFragmentBase
 {
 public:
     explicit            ConnectionsFragment(
                             const WorkbookHelper& rHelper,
                             const OUString& rFragmentPath );
 
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override;
 
diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx
index 3200bd5dc8de..c6a553a999b6 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -83,7 +83,7 @@ protected:
     OUString            maCalcName;     /// Final name used in the Calc document.
 };
 
-class DefinedName : public DefinedNameBase
+class DefinedName final : public DefinedNameBase
 {
 public:
     explicit            DefinedName( const WorkbookHelper& rHelper );
@@ -131,7 +131,7 @@ private:
 
 typedef std::shared_ptr< DefinedName > DefinedNameRef;
 
-class DefinedNamesBuffer : public WorkbookHelper
+class DefinedNamesBuffer final : public WorkbookHelper
 {
 public:
     explicit            DefinedNamesBuffer( const WorkbookHelper& rHelper );
diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx
index e7d47200cf1b..f42700959f94 100644
--- a/sc/source/filter/inc/drawingbase.hxx
+++ b/sc/source/filter/inc/drawingbase.hxx
@@ -63,7 +63,7 @@ struct AnchorClientDataModel
 
 /** Contains the position of a shape in the spreadsheet. Supports different
     shape anchor modes (absolute, one-cell, two-cell). */
-class ShapeAnchor : public WorksheetHelper
+class ShapeAnchor final : public WorksheetHelper
 {
 public:
     enum AnchorType
diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx
index f7315da448c6..f93a13bc2059 100644
--- a/sc/source/filter/inc/drawingfragment.hxx
+++ b/sc/source/filter/inc/drawingfragment.hxx
@@ -38,7 +38,7 @@ namespace oox::xls {
 
 // DrawingML
 
-class ShapeMacroAttacher : public ::oox::ole::VbaMacroAttacherBase
+class ShapeMacroAttacher final : public ::oox::ole::VbaMacroAttacherBase
 {
 public:
     explicit            ShapeMacroAttacher( const OUString& rMacroName,
@@ -51,7 +51,7 @@ private:
     css::uno::Reference< css::drawing::XShape > mxShape;
 };
 
-class Shape : public ::oox::drawingml::Shape, public WorksheetHelper
+class Shape final : public ::oox::drawingml::Shape, public WorksheetHelper
 {
 public:
     explicit            Shape(
@@ -59,17 +59,16 @@ public:
                             const AttributeList& rAttribs,
                             const char* pcServiceName );
 
-protected:
+private:
     virtual void        finalizeXShape(
                             ::oox::core::XmlFilterBase& rFilter,
                             const css::uno::Reference< css::drawing::XShapes >& rxShapes ) override;
 
-private:
     OUString     maMacroName;
 };
 
 /** Context handler for creation of shapes embedded in group shapes. */
-class GroupShapeContext : public ::oox::drawingml::ShapeGroupContext, public WorksheetHelper
+class GroupShapeContext final : public ::oox::drawingml::ShapeGroupContext, public WorksheetHelper
 {
 public:
     explicit            GroupShapeContext(
@@ -87,7 +86,7 @@ public:
                             const ::oox::drawingml::ShapePtr& rxParentShape,
                             ::oox::drawingml::ShapePtr* pxShape = nullptr );
 
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef
                         onCreateContext(
                             sal_Int32 nElement,
@@ -95,19 +94,18 @@ protected:
 };
 
 /** Fragment handler for a complete sheet drawing. */
-class DrawingFragment : public WorksheetFragmentBase
+class DrawingFragment final : public WorksheetFragmentBase
 {
 public:
     explicit            DrawingFragment(
                             const WorksheetHelper& rHelper,
                             const OUString& rFragmentPath );
 
-protected:
+private:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
     virtual void        onCharacters( const OUString& rChars ) override;
     virtual void        onEndElement() override;
 
-private:
     typedef ::std::unique_ptr< ShapeAnchor > ShapeAnchorRef;
 
     css::uno::Reference< css::drawing::XShapes >
@@ -118,7 +116,7 @@ private:
 
 // VML
 
-class VmlControlMacroAttacher : public ::oox::ole::VbaMacroAttacherBase
+class VmlControlMacroAttacher final : public ::oox::ole::VbaMacroAttacherBase
 {
 public:
     explicit            VmlControlMacroAttacher( const OUString& rMacroName,
@@ -135,7 +133,7 @@ private:
     sal_Int32           mnDropStyle;
 };
 
-class VmlDrawing : public ::oox::vml::Drawing, public WorksheetHelper
+class VmlDrawing final : public ::oox::vml::Drawing, public WorksheetHelper
 {
 public:
     explicit            VmlDrawing( const WorksheetHelper& rHelper );
@@ -189,14 +187,14 @@ private:
     ::oox::vml::TextFontModel maListBoxFont;
 };
 
-class VmlDrawingFragment : public ::oox::vml::DrawingFragment, public WorksheetHelper
+class VmlDrawingFragment final : public ::oox::vml::DrawingFragment, public WorksheetHelper
 {
 public:
     explicit            VmlDrawingFragment(
                             const WorksheetHelper& rHelper,
                             const OUString& rFragmentPath );
 
-protected:
+private:
     virtual void        finalizeImport() override;
 };
 
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index 128bcc2bdcd6..40748b38f63e 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -35,7 +35,7 @@ class XclExpChangeTrack;
 
 class XclExpCellTable;
 
-class ExcTable : public XclExpRecordBase, public XclExpRoot
+class ExcTable final : public XclExpRecordBase, public XclExpRoot
 {
 private:
     typedef XclExpRecordList< ExcBundlesheetBase >  ExcBoundsheetList;
@@ -71,7 +71,7 @@ public:
     void                        WriteXml( XclExpXmlStream& );
 };
 
-class ExcDocument : protected XclExpRoot
+class ExcDocument final : protected XclExpRoot
 {
 friend class ExcTable;
 
diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx
index 156dee2af519..1d3d58922929 100644
--- a/sc/source/filter/inc/excelchartconverter.hxx
+++ b/sc/source/filter/inc/excelchartconverter.hxx
@@ -24,7 +24,7 @@
 
 namespace oox::xls {
 
-class ExcelChartConverter : public ::oox::drawingml::chart::ChartConverter, public WorkbookHelper
+class ExcelChartConverter final : public ::oox::drawingml::chart::ChartConverter, public WorkbookHelper
 {
 public:
     explicit            ExcelChartConverter( const WorkbookHelper& rHelper );
diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx
index be6783560551..2aeb675cd7b1 100644
--- a/sc/source/filter/inc/excelfilter.hxx
+++ b/sc/source/filter/inc/excelfilter.hxx
@@ -25,7 +25,7 @@ namespace oox::xls {
 
 class WorkbookGlobals;
 
-class ExcelFilter : public ::oox::core::XmlFilterBase
+class ExcelFilter final : public ::oox::core::XmlFilterBase
 {
 public:
     /// @throws css::uno::RuntimeException
diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx
index 249286042a92..7c10472912d8 100644
--- a/sc/source/filter/inc/excelvbaproject.hxx
+++ b/sc/source/filter/inc/excelvbaproject.hxx
@@ -28,18 +28,17 @@ namespace com::sun::star {
 namespace oox::xls {
 
 /** Special implementation of the VBA project for the Excel filters. */
-class ExcelVbaProject : public ::oox::ole::VbaProject
+class ExcelVbaProject final : public ::oox::ole::VbaProject
 {
 public:
     explicit            ExcelVbaProject(
                             const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const css::uno::Reference< css::sheet::XSpreadsheetDocument >& rxDocument );
 
-protected:
+private:
     /** Adds dummy modules for sheets without imported code name. */
     virtual void        prepareImport() override;
 
-private:
     css::uno::Reference< css::sheet::XSpreadsheetDocument >
                         mxDocument;
 };


More information about the Libreoffice-commits mailing list