[Libreoffice-commits] core.git: include/oox oox/inc oox/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Nov 1 06:15:54 UTC 2017
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 +--
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 +--
oox/source/drawingml/diagram/datamodelcontext.hxx | 4 +--
oox/source/drawingml/effectpropertiescontext.hxx | 7 ++---
oox/source/drawingml/hyperlinkcontext.hxx | 4 +--
oox/source/drawingml/texttabstoplistcontext.hxx | 24 +++++++++----------
oox/source/shape/LockedCanvasContext.hxx | 5 +--
oox/source/shape/WpgContext.hxx | 4 +--
oox/source/shape/WpsContext.hxx | 4 +--
26 files changed, 69 insertions(+), 81 deletions(-)
New commits:
commit 7d8d7ebbc69015166f4dea22748e6c8586d51013
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Oct 31 14:39:47 2017 +0200
loplugin:finalclasses in oox
Change-Id: I12c274877a0975971863456e9abdcb811ee2bd80
Reviewed-on: https://gerrit.libreoffice.org/44133
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
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;
};
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<css::beans::PropertyValue>& mrTextEffectsProperties;
- std::unique_ptr<oox::GrabBagStack> mpGrabBagStack;
- sal_Int32 mnCurrentElement;
-
private:
void processAttributes(const AttributeList& rAttribs);
void pushAttributeToGrabBag (sal_Int32 aAttributeId, const OUString& rElementName, const AttributeList& rAttribs);
+
+ std::vector<css::beans::PropertyValue>& mrTextEffectsProperties;
+ std::unique_ptr<oox::GrabBagStack> 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;
};
diff --git a/oox/source/drawingml/diagram/datamodelcontext.hxx b/oox/source/drawingml/diagram/datamodelcontext.hxx
index 36298d047689..b41fe6c2dfd3 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.hxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.hxx
@@ -28,7 +28,7 @@
namespace oox { namespace drawingml {
// CT_DataModel
-class DataModelContext : public ::oox::core::ContextHandler2
+class DataModelContext final : public ::oox::core::ContextHandler2
{
public:
DataModelContext( ::oox::core::ContextHandler2Helper const & rParent, const DiagramDataPtr & pDataModelPtr );
@@ -36,7 +36,7 @@ public:
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
-protected:
+private:
DiagramDataPtr mpDataModel;
};
diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/source/drawingml/effectpropertiescontext.hxx
index b0688c2838aa..540dd0187639 100644
--- a/oox/source/drawingml/effectpropertiescontext.hxx
+++ b/oox/source/drawingml/effectpropertiescontext.hxx
@@ -17,7 +17,7 @@ namespace oox { namespace drawingml {
struct EffectProperties;
struct Effect;
-class EffectPropertiesContext : public ::oox::core::ContextHandler2
+class EffectPropertiesContext final : public ::oox::core::ContextHandler2
{
public:
EffectPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent,
@@ -27,11 +27,10 @@ public:
virtual ::oox::core::ContextHandlerRef
onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
-protected:
- EffectProperties& mrEffectProperties;
-
private:
static void saveUnsupportedAttribs( Effect& rEffect, const AttributeList& rAttribs );
+
+ EffectProperties& mrEffectProperties;
};
} }
diff --git a/oox/source/drawingml/hyperlinkcontext.hxx b/oox/source/drawingml/hyperlinkcontext.hxx
index 49e9ade5273c..027147b9a923 100644
--- a/oox/source/drawingml/hyperlinkcontext.hxx
+++ b/oox/source/drawingml/hyperlinkcontext.hxx
@@ -28,7 +28,7 @@ namespace oox { class PropertyMap; }
namespace oox {
namespace drawingml {
-class HyperLinkContext : public ::oox::core::ContextHandler2
+class HyperLinkContext final : public ::oox::core::ContextHandler2
{
public:
HyperLinkContext(
@@ -39,7 +39,7 @@ public:
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
-protected:
+private:
PropertyMap& maProperties;
};
diff --git a/oox/source/drawingml/texttabstoplistcontext.hxx b/oox/source/drawingml/texttabstoplistcontext.hxx
index 5f7716cd93e9..2b4537d6e4a8 100644
--- a/oox/source/drawingml/texttabstoplistcontext.hxx
+++ b/oox/source/drawingml/texttabstoplistcontext.hxx
@@ -28,18 +28,18 @@
namespace oox { namespace drawingml {
- class TextTabStopListContext : public ::oox::core::ContextHandler2
- {
- public:
- TextTabStopListContext( ::oox::core::ContextHandler2Helper const & rParent,
- ::std::vector< css::style::TabStop > & aTabList );
- virtual ~TextTabStopListContext() override;
-
- virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
-
-protected:
- ::std::vector< css::style::TabStop > & maTabList;
- };
+class TextTabStopListContext final : public ::oox::core::ContextHandler2
+{
+public:
+ TextTabStopListContext( ::oox::core::ContextHandler2Helper const & rParent,
+ ::std::vector< css::style::TabStop > & aTabList );
+ virtual ~TextTabStopListContext() override;
+
+ virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
+
+private:
+ ::std::vector< css::style::TabStop > & maTabList;
+};
} }
diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx
index 1952a5024ea2..3a6d3ca6a303 100644
--- a/oox/source/shape/LockedCanvasContext.hxx
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -19,7 +19,7 @@ namespace shape
{
/// Locked canvas is kind of a container for drawingml shapes: it can even contain group shapes.
-class LockedCanvasContext : public oox::core::ContextHandler2
+class LockedCanvasContext final : public oox::core::ContextHandler2
{
public:
explicit LockedCanvasContext(oox::core::ContextHandler2Helper const& rParent);
@@ -32,8 +32,7 @@ public:
return mpShape;
}
-protected:
-
+private:
oox::drawingml::ShapePtr mpShape;
};
diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx
index c22d6e7a7f05..2fa6ca02ba9f 100644
--- a/oox/source/shape/WpgContext.hxx
+++ b/oox/source/shape/WpgContext.hxx
@@ -19,7 +19,7 @@ namespace shape
{
/// Wpg is the drawingML equivalent of v:group.
-class WpgContext : public oox::core::ContextHandler2
+class WpgContext final : public oox::core::ContextHandler2
{
public:
explicit WpgContext(oox::core::ContextHandler2Helper const& rParent);
@@ -32,7 +32,7 @@ public:
return mpShape;
}
-protected:
+private:
oox::drawingml::ShapePtr mpShape;
};
diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx
index e40c8166d1f5..73589aaed487 100644
--- a/oox/source/shape/WpsContext.hxx
+++ b/oox/source/shape/WpsContext.hxx
@@ -19,7 +19,7 @@ namespace shape
{
/// Wps is the drawingML equivalent of v:shape.
-class WpsContext : public oox::core::ContextHandler2
+class WpsContext final : public oox::core::ContextHandler2
{
public:
WpsContext(oox::core::ContextHandler2Helper const& rParent, css::uno::Reference<css::drawing::XShape> xShape);
@@ -32,7 +32,7 @@ public:
return mpShape;
}
-protected:
+private:
oox::drawingml::ShapePtr mpShape;
css::uno::Reference<css::drawing::XShape> mxShape;
};
More information about the Libreoffice-commits
mailing list