diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-04 09:34:10 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-04 12:26:08 +0200 |
commit | 4791e6061518c49dcce937d7fafa57f5b9bef77f (patch) | |
tree | e6e1c3322698c02afc854cd119f11cf0c441c313 /writerfilter | |
parent | 79c392a45a7827d6c5af4c7e1da07c6eb3f91f2e (diff) |
loplugin:finalclasses in writerfilter
Change-Id: I590de2fd15c630d5ea5e706ce9421ee8bfe19db7
Reviewed-on: https://gerrit.libreoffice.org/43116
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/inc/ooxml/QNameToString.hxx | 1 | ||||
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.hxx | 9 | ||||
-rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 12 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLPropertySet.hxx | 9 |
6 files changed, 9 insertions, 26 deletions
diff --git a/writerfilter/inc/ooxml/QNameToString.hxx b/writerfilter/inc/ooxml/QNameToString.hxx index 603204a1dbed..7e6a0b9ec4e2 100644 --- a/writerfilter/inc/ooxml/QNameToString.hxx +++ b/writerfilter/inc/ooxml/QNameToString.hxx @@ -40,7 +40,6 @@ class QNameToString Map mMap; -protected: /** Generated. */ diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 63c4c787fbc8..bbaae80c5241 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -121,11 +121,6 @@ typedef std::shared_ptr< StyleSheetTable > StyleSheetTablePtr; class TableStyleSheetEntry : public StyleSheetEntry { -private: - typedef std::map<TblStyleType, PropertyMapPtr> TblStylePrs; - - TblStylePrs m_aStyles; - public: // Adds a new tblStylePr to the table style entry. This method // fixes some possible properties conflicts, like borders ones. @@ -141,7 +136,9 @@ public: TableStyleSheetEntry( StyleSheetEntry& aEntry ); virtual ~TableStyleSheetEntry( ) override; -protected: +private: + typedef std::map<TblStyleType, PropertyMapPtr> TblStylePrs; + TblStylePrs m_aStyles; PropertyMapPtr GetLocalPropertiesFromMask( sal_Int32 nMask ); }; diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index 36527b7a5223..44dec903a42e 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -90,8 +90,6 @@ class WriterFilter : public cppu::WeakImplHelper lang::XServiceInfo > { - -protected: uno::Reference<uno::XComponentContext> m_xContext; uno::Reference<lang::XComponent> m_xSrcDoc, m_xDstDoc; diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx index 48412cd64ffd..968b16dea3e9 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx @@ -66,7 +66,7 @@ class OOXMLDocumentImpl : public OOXMLDocument OUString m_rBaseURL; css::uno::Sequence<css::beans::PropertyValue> maMediaDescriptor; -protected: +private: void resolveFastSubStream(Stream & rStream, OOXMLStream::StreamType_t nType); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 2b52eb16c0a2..a89644dc6e2d 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -308,11 +308,11 @@ public: explicit OOXMLFastContextHandlerPropertyTable(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerPropertyTable() override; -protected: +private: OOXMLTable mTable; virtual void lcl_endFastElement(Token_t Element) override; - }; +}; class OOXMLFastContextHandlerValue : public OOXMLFastContextHandler @@ -333,7 +333,7 @@ public: virtual void setDefaultHexValue() override; virtual void setDefaultStringValue() override; -protected: +private: OOXMLValue::Pointer_t mpValue; }; @@ -346,7 +346,7 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override; -protected: +private: OOXMLTable mTable; css::uno::Reference<css::xml::sax::XFastContextHandler> mCurrentChild; @@ -431,11 +431,11 @@ protected: class OOXMLFastContextHandlerShape: public OOXMLFastContextHandlerProperties { -private: bool m_bShapeSent; bool m_bShapeStarted; /// Is it necessary to pop the stack in the dtor? bool m_bShapeContextPushed; + css::uno::Reference<css::xml::sax::XFastShapeContextHandler> mrShapeContext; public: explicit OOXMLFastContextHandlerShape(OOXMLFastContextHandler * pContext); @@ -459,8 +459,6 @@ public: bool isShapeSent( ) { return m_bShapeSent; } protected: - css::uno::Reference<css::xml::sax::XFastShapeContextHandler> mrShapeContext; - virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override; virtual void lcl_endFastElement(Token_t Element) override; diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx index 1a9021d4f157..c6b664f59b90 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx @@ -74,7 +74,6 @@ public: class OOXMLBinaryValue : public OOXMLValue { -protected: mutable OOXMLBinaryObjectReference::Pointer_t mpBinaryObj; public: explicit OOXMLBinaryValue(OOXMLBinaryObjectReference::Pointer_t const & pBinaryObj); @@ -89,7 +88,6 @@ public: class OOXMLBooleanValue : public OOXMLValue { -protected: bool mbValue; explicit OOXMLBooleanValue(bool bValue); public: @@ -108,7 +106,6 @@ public: class OOXMLStringValue : public OOXMLValue { -protected: OUString mStr; public: explicit OOXMLStringValue(const OUString & rStr); @@ -124,7 +121,6 @@ public: class OOXMLInputStreamValue : public OOXMLValue { -protected: css::uno::Reference<css::io::XInputStream> mxInputStream; public: @@ -199,7 +195,6 @@ public: class OOXMLIntegerValue : public OOXMLValue { -protected: sal_Int32 mnValue; explicit OOXMLIntegerValue(sal_Int32 nValue); public: @@ -216,7 +211,6 @@ public: class OOXMLHexValue : public OOXMLValue { -protected: sal_uInt32 mnValue; public: explicit OOXMLHexValue(sal_uInt32 nValue); @@ -264,7 +258,6 @@ typedef OOXMLNthPtMeasureValue<2> OOXMLHpsMeasureValue; class OOXMLMeasurementOrPercentValue : public OOXMLValue { -protected: int mnValue; public: explicit OOXMLMeasurementOrPercentValue(const char * pValue); @@ -281,7 +274,6 @@ public: class OOXMLShapeValue : public OOXMLValue { -protected: css::uno::Reference<css::drawing::XShape> mrShape; public: explicit OOXMLShapeValue(css::uno::Reference<css::drawing::XShape> const & rShape); @@ -296,7 +288,6 @@ public: class OOXMLStarMathValue : public OOXMLValue { -protected: css::uno::Reference< css::embed::XEmbeddedObject > component; public: explicit OOXMLStarMathValue( css::uno::Reference< css::embed::XEmbeddedObject > const & component ); |