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 --- include/oox/dump/dffdumper.hxx | 6 ++---- include/oox/dump/dumperbase.hxx | 8 ++++---- include/oox/dump/xlsbdumper.hxx | 3 +-- include/oox/ppt/backgroundproperties.hxx | 4 ++-- include/oox/ppt/pptshape.hxx | 7 ++----- include/oox/ppt/presentationfragmenthandler.hxx | 7 ++----- include/oox/ppt/slidemastertextstylescontext.hxx | 4 ++-- 7 files changed, 15 insertions(+), 24 deletions(-) (limited to 'include') diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 56c8b87d3dd6..19d69bb6fd9a 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -31,14 +31,14 @@ namespace oox { namespace dump { -class DffStreamObject : public SequenceRecordObjectBase +class DffStreamObject final : public SequenceRecordObjectBase { public: sal_uInt16 getVer() const { return mnInstVer & 0x000F; } sal_uInt16 getInst() const { return (mnInstVer & 0xFFF0) >> 4; } bool isContainer() const { return getVer() == 15; } -protected: +private: DffStreamObject() {} using SequenceRecordObjectBase::construct; @@ -47,13 +47,11 @@ protected: virtual void implWriteExtHeader() override; virtual void implDumpRecordBody() override; -private: sal_uInt32 dumpDffSimpleColor( const String& rName ); void dumpDffOpt(); sal_uInt16 dumpDffOptPropHeader(); -private: sal_uInt16 mnInstVer; sal_Int32 mnRealSize; }; diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 1343b533038d..dcde6ff1808f 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -1543,7 +1543,7 @@ void InputObjectBase::dumpHexPair( const String& rName, sal_Unicode cSep ) } -class BinaryStreamObject : public InputObjectBase +class BinaryStreamObject final : public InputObjectBase { public: explicit BinaryStreamObject( @@ -1551,7 +1551,7 @@ public: const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); -protected: +private: void dumpBinaryStream( bool bShowOffset = true ); virtual void implDump() override; @@ -1587,7 +1587,7 @@ protected: }; -class TextLineStreamObject : public TextStreamObjectBase +class TextLineStreamObject final : public TextStreamObjectBase { public: explicit TextLineStreamObject( @@ -1601,7 +1601,7 @@ public: const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc ); -protected: +private: virtual void implDumpText( TextInputStream& rTextStrm ) override; void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); }; diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx index ea553ab87087..f031aef54b52 100644 --- a/include/oox/dump/xlsbdumper.hxx +++ b/include/oox/dump/xlsbdumper.hxx @@ -46,9 +46,8 @@ namespace dump { namespace xlsb { -class RecordObjectBase : public SequenceRecordObjectBase +class RecordObjectBase final : public SequenceRecordObjectBase { -protected: explicit RecordObjectBase(); virtual ~RecordObjectBase() override; diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx index c1cb3c13fc64..4651b14da482 100644 --- a/include/oox/ppt/backgroundproperties.hxx +++ b/include/oox/ppt/backgroundproperties.hxx @@ -30,13 +30,13 @@ namespace oox { namespace drawingml { struct FillProperties; } } namespace oox { namespace ppt { -class BackgroundPropertiesContext : public ::oox::core::FragmentHandler2 +class BackgroundPropertiesContext final : public ::oox::core::FragmentHandler2 { public: BackgroundPropertiesContext( ::oox::core::FragmentHandler2 const & rParent, ::oox::drawingml::FillProperties& rFillProperties ); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; -protected: +private: ::oox::drawingml::FillProperties& mrFillProperties; }; diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index 5ae47157ab2a..b1ffc3f91ffa 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -44,12 +44,13 @@ namespace oox { namespace oox { namespace ppt { -class PPTShape : public oox::drawingml::Shape +class PPTShape final : public oox::drawingml::Shape { OUString msModelId; // fallback dgs smartart shape reference ShapeLocation meShapeLocation; // placeholdershapes (mnSubType != 0) on Master are never displayed bool mbReferenced; // placeholdershapes on Layout are displayed only, if they are not referenced // placeholdershapes on Slide are displayed always + oox::drawingml::ShapePtr mpPlaceholder; public: @@ -79,10 +80,6 @@ public: std::vector< oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly = false ); static oox::drawingml::TextListStylePtr getSubTypeTextListStyle( const SlidePersist& rSlidePersist, sal_Int32 nSubType ); - -protected: - - oox::drawingml::ShapePtr mpPlaceholder; }; } } diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index 637e70643be7..18dfe2c35fe1 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -38,7 +38,7 @@ namespace oox { namespace core { class XmlFilterBase; } } namespace oox { namespace ppt { -class PresentationFragmentHandler : public ::oox::core::FragmentHandler2 +class PresentationFragmentHandler final : public ::oox::core::FragmentHandler2 { public: PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath ) throw(); @@ -46,12 +46,9 @@ public: virtual void finalizeImport() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; -protected: +private: void importSlide( const ::oox::core::FragmentHandlerRef& rSlideFragmentHandler, const oox::ppt::SlidePersistPtr& rPersist ); - -private: - void importSlide(sal_uInt32 nSlide, bool bFirstSlide, bool bImportNotes); void saveThemeToGrabBag(oox::drawingml::ThemePtr pThemePtr, const OUString& sTheme); diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx index 109732f8302a..7acab9888158 100644 --- a/include/oox/ppt/slidemastertextstylescontext.hxx +++ b/include/oox/ppt/slidemastertextstylescontext.hxx @@ -29,14 +29,14 @@ namespace oox { class AttributeList; } namespace oox { namespace ppt { -class SlideMasterTextStylesContext : public oox::core::FragmentHandler2 +class SlideMasterTextStylesContext final : public oox::core::FragmentHandler2 { public: SlideMasterTextStylesContext( ::oox::core::FragmentHandler2 const & rParent, SlidePersistPtr const & pSlidePersistPtr ); virtual ~SlideMasterTextStylesContext() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; -protected: +private: SlidePersistPtr mpSlidePersistPtr; }; -- cgit