summaryrefslogtreecommitdiff
path: root/include/oox/ppt
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-10-31 14:39:47 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-11-01 07:15:27 +0100
commit7d8d7ebbc69015166f4dea22748e6c8586d51013 (patch)
treed3186b4d049bc6c5c32a2df05aaf6a2c4cdca94c /include/oox/ppt
parentee1d6af9b73256e13975ec4e95aff6d69a00fed9 (diff)
loplugin:finalclasses in oox
Change-Id: I12c274877a0975971863456e9abdcb811ee2bd80 Reviewed-on: https://gerrit.libreoffice.org/44133 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/oox/ppt')
-rw-r--r--include/oox/ppt/backgroundproperties.hxx4
-rw-r--r--include/oox/ppt/pptshape.hxx7
-rw-r--r--include/oox/ppt/presentationfragmenthandler.hxx7
-rw-r--r--include/oox/ppt/slidemastertextstylescontext.hxx4
4 files changed, 8 insertions, 14 deletions
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;
};