From 7d8d7ebbc69015166f4dea22748e6c8586d51013 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 31 Oct 2017 14:39:47 +0200 Subject: loplugin:finalclasses in oox Change-Id: I12c274877a0975971863456e9abdcb811ee2bd80 Reviewed-on: https://gerrit.libreoffice.org/44133 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- oox/inc/drawingml/linepropertiescontext.hxx | 4 ++-- oox/inc/drawingml/misccontexts.hxx | 4 ++-- oox/inc/drawingml/objectdefaultcontext.hxx | 4 ++-- oox/inc/drawingml/shapestylecontext.hxx | 4 ++-- oox/inc/drawingml/spdefcontext.hxx | 4 ++-- oox/inc/drawingml/textbodycontext.hxx | 8 ++++---- oox/inc/drawingml/textbodypropertiescontext.hxx | 4 ++-- oox/inc/drawingml/textcharacterpropertiescontext.hxx | 4 ++-- oox/inc/drawingml/texteffectscontext.hxx | 11 +++++------ oox/inc/drawingml/textliststylecontext.hxx | 4 ++-- oox/inc/drawingml/textparagraphpropertiescontext.hxx | 4 ++-- oox/inc/drawingml/transform2dcontext.hxx | 4 ++-- 12 files changed, 29 insertions(+), 30 deletions(-) (limited to 'oox/inc/drawingml') diff --git a/oox/inc/drawingml/linepropertiescontext.hxx b/oox/inc/drawingml/linepropertiescontext.hxx index 5b33cdc28259..5f11d50c634b 100644 --- a/oox/inc/drawingml/linepropertiescontext.hxx +++ b/oox/inc/drawingml/linepropertiescontext.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { struct LineProperties; -class LinePropertiesContext : public ::oox::core::ContextHandler2 +class LinePropertiesContext final : public ::oox::core::ContextHandler2 { public: LinePropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, @@ -38,7 +38,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; -protected: +private: LineProperties& mrLineProperties; }; diff --git a/oox/inc/drawingml/misccontexts.hxx b/oox/inc/drawingml/misccontexts.hxx index d1d050223111..1646cc6072bd 100644 --- a/oox/inc/drawingml/misccontexts.hxx +++ b/oox/inc/drawingml/misccontexts.hxx @@ -226,7 +226,7 @@ protected: struct. The imported fill properties are converted automatically to the best fitting solid color. */ -class SimpleFillPropertiesContext : private FillProperties, public FillPropertiesContext +class SimpleFillPropertiesContext final : private FillProperties, public FillPropertiesContext { public: explicit SimpleFillPropertiesContext( @@ -234,7 +234,7 @@ public: Color& rColor ); virtual ~SimpleFillPropertiesContext() override; -protected: +private: Color& mrColor; }; diff --git a/oox/inc/drawingml/objectdefaultcontext.hxx b/oox/inc/drawingml/objectdefaultcontext.hxx index bfc55842a053..ea5474b02f09 100644 --- a/oox/inc/drawingml/objectdefaultcontext.hxx +++ b/oox/inc/drawingml/objectdefaultcontext.hxx @@ -26,13 +26,13 @@ namespace oox { namespace drawingml { class Theme; -class objectDefaultContext : public oox::core::ContextHandler2 +class objectDefaultContext final : public oox::core::ContextHandler2 { public: objectDefaultContext( ::oox::core::ContextHandler2Helper const & rParent, Theme& rTheme ); virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; -protected: +private: Theme& mrTheme; }; diff --git a/oox/inc/drawingml/shapestylecontext.hxx b/oox/inc/drawingml/shapestylecontext.hxx index fe4851a38392..96926ad6d678 100644 --- a/oox/inc/drawingml/shapestylecontext.hxx +++ b/oox/inc/drawingml/shapestylecontext.hxx @@ -25,7 +25,7 @@ namespace oox { namespace drawingml { -class ShapeStyleContext : public ::oox::core::ContextHandler2 +class ShapeStyleContext final : public ::oox::core::ContextHandler2 { public: ShapeStyleContext( ::oox::core::ContextHandler2Helper const & rParent, Shape& rShape ); @@ -33,7 +33,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; -protected: +private: Shape& mrShape; }; diff --git a/oox/inc/drawingml/spdefcontext.hxx b/oox/inc/drawingml/spdefcontext.hxx index 9d7e45839fec..acdc2537c57a 100644 --- a/oox/inc/drawingml/spdefcontext.hxx +++ b/oox/inc/drawingml/spdefcontext.hxx @@ -25,13 +25,13 @@ namespace oox { namespace drawingml { -class spDefContext : public oox::core::ContextHandler2 +class spDefContext final : public oox::core::ContextHandler2 { public: spDefContext( ::oox::core::ContextHandler2Helper const & rParent, Shape& rDefaultObject ); virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; -protected: +private: Shape& mrDefaultObject; }; diff --git a/oox/inc/drawingml/textbodycontext.hxx b/oox/inc/drawingml/textbodycontext.hxx index ad1bac8c47a0..a3439105493a 100644 --- a/oox/inc/drawingml/textbodycontext.hxx +++ b/oox/inc/drawingml/textbodycontext.hxx @@ -28,19 +28,19 @@ namespace oox { namespace drawingml { -class TextBodyContext : public ::oox::core::ContextHandler2 +class TextBodyContext final : public ::oox::core::ContextHandler2 { public: TextBodyContext( ::oox::core::ContextHandler2Helper const & rParent, TextBody& rTextBody ); virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; -protected: +private: TextBody& mrTextBody; }; // CT_RegularTextRun -class RegularTextRunContext : public ::oox::core::ContextHandler2 +class RegularTextRunContext final : public ::oox::core::ContextHandler2 { public: RegularTextRunContext( ::oox::core::ContextHandler2Helper const & rParent, TextRunPtr const & pRunPtr ); @@ -49,7 +49,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; virtual void onCharacters( const OUString& aChars ) override; -protected: +private: TextRunPtr mpRunPtr; bool mbIsInText; }; diff --git a/oox/inc/drawingml/textbodypropertiescontext.hxx b/oox/inc/drawingml/textbodypropertiescontext.hxx index 7ca81ac45cb4..0ec5fe455185 100644 --- a/oox/inc/drawingml/textbodypropertiescontext.hxx +++ b/oox/inc/drawingml/textbodypropertiescontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { struct TextBodyProperties; -class TextBodyPropertiesContext : public ::oox::core::ContextHandler2 +class TextBodyPropertiesContext final : public ::oox::core::ContextHandler2 { public: TextBodyPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, @@ -35,7 +35,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; -protected: +private: TextBodyProperties& mrTextBodyProp; }; diff --git a/oox/inc/drawingml/textcharacterpropertiescontext.hxx b/oox/inc/drawingml/textcharacterpropertiescontext.hxx index c07c1fee24c6..fb492a168c68 100644 --- a/oox/inc/drawingml/textcharacterpropertiescontext.hxx +++ b/oox/inc/drawingml/textcharacterpropertiescontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { struct TextCharacterProperties; -class TextCharacterPropertiesContext : public ::oox::core::ContextHandler2 +class TextCharacterPropertiesContext final : public ::oox::core::ContextHandler2 { public: TextCharacterPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, @@ -36,7 +36,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; -protected: +private: TextCharacterProperties& mrTextCharacterProperties; }; diff --git a/oox/inc/drawingml/texteffectscontext.hxx b/oox/inc/drawingml/texteffectscontext.hxx index 853d9dff57ef..2676121a3c82 100644 --- a/oox/inc/drawingml/texteffectscontext.hxx +++ b/oox/inc/drawingml/texteffectscontext.hxx @@ -20,7 +20,7 @@ namespace oox { namespace drawingml { -class TextEffectsContext : public oox::core::ContextHandler2 +class TextEffectsContext final : public oox::core::ContextHandler2 { public: TextEffectsContext(oox::core::ContextHandler2Helper const & rParent, @@ -33,14 +33,13 @@ public: virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const oox::AttributeList& rAttribs) override; -protected: - std::vector& mrTextEffectsProperties; - std::unique_ptr mpGrabBagStack; - sal_Int32 mnCurrentElement; - private: void processAttributes(const AttributeList& rAttribs); void pushAttributeToGrabBag (sal_Int32 aAttributeId, const OUString& rElementName, const AttributeList& rAttribs); + + std::vector& mrTextEffectsProperties; + std::unique_ptr mpGrabBagStack; + sal_Int32 mnCurrentElement; }; } } diff --git a/oox/inc/drawingml/textliststylecontext.hxx b/oox/inc/drawingml/textliststylecontext.hxx index 736157030af8..6f7d1a0d1b77 100644 --- a/oox/inc/drawingml/textliststylecontext.hxx +++ b/oox/inc/drawingml/textliststylecontext.hxx @@ -25,7 +25,7 @@ namespace oox { namespace drawingml { -class TextListStyleContext : public ::oox::core::ContextHandler2 +class TextListStyleContext final : public ::oox::core::ContextHandler2 { public: TextListStyleContext( ::oox::core::ContextHandler2Helper const & rParent, TextListStyle& rTextListStyle ); @@ -33,7 +33,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; -protected: +private: TextListStyle& mrTextListStyle; }; diff --git a/oox/inc/drawingml/textparagraphpropertiescontext.hxx b/oox/inc/drawingml/textparagraphpropertiescontext.hxx index 24a40c136ba0..2de92b5b05ab 100644 --- a/oox/inc/drawingml/textparagraphpropertiescontext.hxx +++ b/oox/inc/drawingml/textparagraphpropertiescontext.hxx @@ -30,7 +30,7 @@ namespace oox { namespace drawingml { -class TextParagraphPropertiesContext : public ::oox::core::ContextHandler2 +class TextParagraphPropertiesContext final : public ::oox::core::ContextHandler2 { public: TextParagraphPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, @@ -40,7 +40,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; -protected: +private: TextParagraphProperties& mrTextParagraphProperties; TextSpacing maLineSpacing; BulletList& mrBulletList; diff --git a/oox/inc/drawingml/transform2dcontext.hxx b/oox/inc/drawingml/transform2dcontext.hxx index df502d341484..eb772ee7419e 100644 --- a/oox/inc/drawingml/transform2dcontext.hxx +++ b/oox/inc/drawingml/transform2dcontext.hxx @@ -28,14 +28,14 @@ namespace drawingml { class Shape; /** context to import a CT_Transform2D */ -class Transform2DContext : public ::oox::core::ContextHandler2 +class Transform2DContext final : public ::oox::core::ContextHandler2 { public: Transform2DContext( ::oox::core::ContextHandler2Helper const & rParent, const ::oox::AttributeList& rAttributes, Shape& rShape, bool btxXfrm = false ) throw(); virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; -protected: +private: Shape& mrShape; bool mbtxXfrm; }; -- cgit