From 692d35b89a9f6de4099d180e79aa39ded1214922 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 3 Oct 2017 11:10:07 +0200 Subject: loplugin:finalclasses in xmloff Change-Id: I10ffefd29b858548472a459314c7d5632324bca2 Reviewed-on: https://gerrit.libreoffice.org/43069 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/xmloff/table/XMLTableExport.hxx | 2 -- xmloff/inc/XMLBackgroundImageExport.hxx | 3 +-- xmloff/inc/XMLBase64Export.hxx | 2 -- xmloff/inc/XMLImageMapExport.hxx | 2 +- xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx | 2 +- xmloff/inc/XMLNumberStylesImport.hxx | 2 -- xmloff/inc/XMLTextColumnsExport.hxx | 2 -- xmloff/inc/txtfldi.hxx | 4 ++-- xmloff/source/chart/SchXMLAutoStylePoolP.hxx | 1 - xmloff/source/draw/ximpshap.hxx | 3 --- xmloff/source/forms/attriblistmerge.hxx | 3 +-- xmloff/source/forms/elementimport.hxx | 7 ++----- xmloff/source/forms/eventexport.hxx | 1 - xmloff/source/forms/eventimport.hxx | 1 - xmloff/source/forms/formcellbinding.hxx | 4 +--- xmloff/source/forms/layerexport.hxx | 4 +--- xmloff/source/forms/layerimport.hxx | 4 +--- xmloff/source/forms/officeforms.hxx | 2 +- xmloff/source/forms/propertyimport.hxx | 1 - xmloff/source/style/PageMasterExportPropMapper.hxx | 1 - xmloff/source/style/PageMasterPropHdl.hxx | 1 - xmloff/source/text/XMLAutoTextEventExport.hxx | 2 +- xmloff/source/text/XMLIndexMarkExport.hxx | 2 +- xmloff/source/text/XMLSectionExport.hxx | 2 +- xmloff/source/text/XMLSectionImportContext.hxx | 2 +- xmloff/source/text/txtexppr.hxx | 2 +- xmloff/source/transform/ChartPlotAreaOOoTContext.hxx | 3 +-- xmloff/source/xforms/SchemaRestrictionContext.hxx | 2 +- xmlscript/source/xmllib_imexp/imp_share.hxx | 2 -- xmlsecurity/inc/macrosecurity.hxx | 1 - 30 files changed, 19 insertions(+), 51 deletions(-) diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx index a98546421c00..1d6655e50712 100644 --- a/include/xmloff/table/XMLTableExport.hxx +++ b/include/xmloff/table/XMLTableExport.hxx @@ -85,10 +85,8 @@ private: bool mbExportTables; bool mbWriter; -protected: SvXMLExport& GetExport() { return mrExport; } const SvXMLExport& GetExport() const { return mrExport; } -private: SAL_DLLPRIVATE void ImpExportText( const css::uno::Reference < css::table::XCell >& xCell ); diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx index 0eb74683f28f..a6dca781ff26 100644 --- a/xmloff/inc/XMLBackgroundImageExport.hxx +++ b/xmloff/inc/XMLBackgroundImageExport.hxx @@ -32,9 +32,8 @@ class XMLBackgroundImageExport { SvXMLExport& rExport; -protected: - SvXMLExport& GetExport() { return rExport; } + public: XMLBackgroundImageExport( SvXMLExport& rExport ); diff --git a/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx index a33c00b2296d..f148148bcbe0 100644 --- a/xmloff/inc/XMLBase64Export.hxx +++ b/xmloff/inc/XMLBase64Export.hxx @@ -29,8 +29,6 @@ class XMLBase64Export { SvXMLExport& rExport; -protected: - SvXMLExport& GetExport() { return rExport; } public: diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx index db7ab92b27f0..9351682dbee1 100644 --- a/xmloff/inc/XMLImageMapExport.hxx +++ b/xmloff/inc/XMLImageMapExport.hxx @@ -68,7 +68,7 @@ public: /// the container containing the image map elements const css::uno::Reference< css::container::XIndexContainer> & rContainer); -protected: +private: /** * Export a single, named map entry. diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx index 83461d1a25c2..40845cb94c88 100644 --- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx +++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx @@ -74,7 +74,7 @@ public: virtual ~XMLIndexBibliographyConfigurationContext() override; -protected: +private: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override; diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx index 0dbdc9f94fe8..7f745ec9189d 100644 --- a/xmloff/inc/XMLNumberStylesImport.hxx +++ b/xmloff/inc/XMLNumberStylesImport.hxx @@ -30,7 +30,6 @@ class SdXMLImport; class SdXMLNumberFormatImportContext : public SvXMLNumFormatContext { -private: friend class SdXMLNumberFormatMemberImportContext; bool mbTimeStyle; @@ -42,7 +41,6 @@ private: bool compareStyle( const SdXMLFixedDataStyle* pStyle, sal_Int16& nIndex ) const; -protected: void add( OUString const & rNumberStyle, bool bLong, bool bTextual, bool bDecimal02, OUString const & rText ); public: diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx index 11f206a15ff8..8652b6771ad0 100644 --- a/xmloff/inc/XMLTextColumnsExport.hxx +++ b/xmloff/inc/XMLTextColumnsExport.hxx @@ -36,8 +36,6 @@ class XMLTextColumnsExport const OUString sAutomaticDistance; const OUString sSeparatorLineStyle; -protected: - SvXMLExport& GetExport() { return rExport; } public: diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index f2812dbb52cb..5e66297a53d7 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -834,7 +834,7 @@ public: const OUString& sLocalName, sal_uInt16 nToken); -protected: +private: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ) override; @@ -1097,7 +1097,7 @@ public: sal_uInt16 nPrfx, const OUString& sLocalName); -protected: +private: /// process attributes (fill aValues) virtual void StartElement( const css::uno::Reference & xAttrList) override; diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx index be92f991c424..fd769c6a302c 100644 --- a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx +++ b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx @@ -25,7 +25,6 @@ class SchXMLExport; class SchXMLAutoStylePoolP : public SvXMLAutoStylePoolP { -protected: SchXMLExport& mrSchXMLExport; virtual void exportStyleAttributes( diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index f1dbfde62ce6..9a887d08bb93 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -572,9 +572,6 @@ public: class SdXMLCustomShapeContext : public SdXMLShapeContext { - -protected: - OUString maCustomShapeEngine; OUString maCustomShapeData; diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index b17e86b021de..e3d352a9d1f8 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -39,7 +39,6 @@ namespace xmloff */ class OAttribListMerger : public OAttribListMerger_Base { - protected: typedef std::vector< css::uno::Reference< css::xml::sax::XAttributeList > > AttributeListArray; AttributeListArray m_aLists; @@ -58,7 +57,7 @@ namespace xmloff virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) override; virtual OUString SAL_CALL getValueByName( const OUString& aName ) override; - protected: + private: bool seekToIndex(sal_Int16 _nGlobalIndex, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); bool seekToName(const OUString& _rName, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); }; diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index cf81af025784..79d223948391 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -51,7 +51,6 @@ namespace xmloff */ class OElementNameMap : public OControlElement { - protected: typedef std::map MapString2Element; static MapString2Element s_sElementTranslations; @@ -302,7 +301,6 @@ namespace xmloff //= OReferredControlImport class OReferredControlImport : public OControlImport { - protected: OUString m_sReferringControls; // the list of ids of controls referring to the one being imported public: @@ -614,7 +612,6 @@ namespace xmloff //= OColumnWrapperImport class OColumnWrapperImport : public SvXMLImportContext { - protected: css::uno::Reference< css::xml::sax::XAttributeList > m_xOwnAttributes; css::uno::Reference< css::container::XNameContainer > @@ -632,7 +629,7 @@ namespace xmloff const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; - protected: + private: OControlImport* implCreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType); @@ -668,7 +665,7 @@ namespace xmloff const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer ); - protected: + private: // SvXMLImportContext overridables virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx index 3f609d896ed8..5004d7af43c8 100644 --- a/xmloff/source/forms/eventexport.hxx +++ b/xmloff/source/forms/eventexport.hxx @@ -47,7 +47,6 @@ namespace xmloff */ class OEventDescriptorMapper : public OEventDescriptorMapper_Base { - protected: typedef std::map< OUString, css::uno::Sequence < css::beans::PropertyValue > > MapString2PropertyValueSequence; MapString2PropertyValueSequence m_aMappedEvents; diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx index cf1f2fbcb6c1..3cb8012058b2 100644 --- a/xmloff/source/forms/eventimport.hxx +++ b/xmloff/source/forms/eventimport.hxx @@ -36,7 +36,6 @@ namespace xmloff //= OFormEventsImportContext class OFormEventsImportContext : public XMLEventsImportContext { - protected: IEventAttacher& m_rEventAttacher; public: diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx index 346669500501..06016ae8eab4 100644 --- a/xmloff/source/forms/formcellbinding.hxx +++ b/xmloff/source/forms/formcellbinding.hxx @@ -37,7 +37,6 @@ namespace xmloff */ class FormCellBindingHelper { - protected: css::uno::Reference< css::beans::XPropertySet > m_xControlModel; // the model we work for css::uno::Reference< css::sheet::XSpreadsheetDocument > @@ -66,7 +65,6 @@ namespace xmloff const css::uno::Reference< css::frame::XModel >& _rxDocument ); - public: /** gets a cell binding for the given address @precond isCellBindingAllowed returns @@ -178,7 +176,7 @@ namespace xmloff const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ); - protected: + private: /** creates an address object from a string representation of a cell address */ bool convertStringAddress( diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx index 0577a801a095..5a2ae2e7f8ad 100644 --- a/xmloff/source/forms/layerexport.hxx +++ b/xmloff/source/forms/layerexport.hxx @@ -65,7 +65,6 @@ namespace xmloff { friend class OFormLayerXMLExport; - protected: SvXMLExport& m_rContext; SvXMLNumFmtExport* m_pControlNumberStyles; @@ -123,7 +122,7 @@ namespace xmloff explicit OFormLayerXMLExport_Impl(SvXMLExport& _rContext); virtual ~OFormLayerXMLExport_Impl(); - protected: + private: /** exports one single grid column */ void exportGridColumn( @@ -231,7 +230,6 @@ namespace xmloff */ void exportAutoStyles(); - protected: static bool impl_isFormPageContainingForms( const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage, css::uno::Reference< css::container::XIndexAccess >& _rxForms); diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx index d54c970f35e1..a6fbad3c7292 100644 --- a/xmloff/source/forms/layerimport.hxx +++ b/xmloff/source/forms/layerimport.hxx @@ -51,7 +51,6 @@ namespace xmloff { friend class OFormLayerXMLImport; - protected: SvXMLImport& m_rImporter; OAttribute2Property m_aAttributeMetaData; @@ -60,7 +59,6 @@ namespace xmloff m_xCurrentPageFormsSupp; rtl::Reference m_xAutoStyles; - protected: typedef std::map< OUString, css::uno::Reference< css::beans::XPropertySet > > MapString2PropertySet; typedef std::map, MapString2PropertySet, ODrawPageCompare> MapDrawPage2Map; @@ -131,7 +129,7 @@ namespace xmloff ~OFormLayerXMLImport_Impl() override; - protected: + private: explicit OFormLayerXMLImport_Impl(SvXMLImport& _rImporter); /** start importing the forms of the given page diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index 027f095b877c..2567f665219a 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -47,7 +47,7 @@ namespace xmloff virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override; virtual void EndElement() override; - protected: + private: void implImportBool( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttributes, OfficeFormsAttributes _eAttribute, diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index 9d497e01497b..c0ee5be0f4b2 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -157,7 +157,6 @@ namespace xmloff */ class OPropertyElementsContext : public SvXMLImportContext { - protected: OPropertyImportRef m_xPropertyImporter; // to add the properties public: diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx index 21739c866b83..f8975289c8e6 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.hxx +++ b/xmloff/source/style/PageMasterExportPropMapper.hxx @@ -27,7 +27,6 @@ class XMLPageMasterExportPropMapper : public SvXMLExportPropertyMapper { -protected: XMLBackgroundImageExport aBackgroundImageExport; XMLTextColumnsExport aTextColumnsExport; XMLFootnoteSeparatorExport aFootnoteSeparatorExport; diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx index 11df3a7364df..603154d4e9c9 100644 --- a/xmloff/source/style/PageMasterPropHdl.hxx +++ b/xmloff/source/style/PageMasterPropHdl.hxx @@ -104,7 +104,6 @@ public: class XMLPMPropHdl_Print : public XMLPropertyHandler { -protected: OUString sAttrValue; public: diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx index bea57fd47ddc..ec2987fd96f1 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.hxx +++ b/xmloff/source/text/XMLAutoTextEventExport.hxx @@ -60,7 +60,7 @@ public: virtual void SAL_CALL initialize( const css::uno::Sequence & rArguments ) override; -protected: +private: /// export the events off all autotexts virtual ErrCode exportDoc( diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx index f83ec7ab061e..afce35c158b2 100644 --- a/xmloff/source/text/XMLIndexMarkExport.hxx +++ b/xmloff/source/text/XMLIndexMarkExport.hxx @@ -71,7 +71,7 @@ public: const css::uno::Reference & rPropSet, bool bAutoStyles); -protected: +private: /// export attributes of table-of-content index marks void ExportTOCMarkAttributes( diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index b4e49dac7439..c2291e373652 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -132,7 +132,7 @@ public: void ExportMasterDocHeadingDummies(); -protected: +private: SvXMLExport& GetExport() { return rExport; } XMLTextParagraphExport& GetParaExport() { return rParaExport; } diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx index f4e558036d76..8e15a9fcb92d 100644 --- a/xmloff/source/text/XMLSectionImportContext.hxx +++ b/xmloff/source/text/XMLSectionImportContext.hxx @@ -67,7 +67,7 @@ public: virtual ~XMLSectionImportContext() override; -protected: +private: virtual void StartElement( const css::uno::Reference & xAttrList) override; diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index e64940d5fda7..d02e8c28ea2d 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -47,7 +47,7 @@ class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper XMLPropertyState* pCharPropHeightState, XMLPropertyState* pCharDiffHeightState ); -protected: +private: // SvXMLUnitConverter& mrUnitConverter; // const Reference< xml::sax::XDocumentHandler > & mrHandler; XMLTextDropCapExport maDropCapExport; diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx index 6073f5efbf54..93388283dacb 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx @@ -45,10 +45,9 @@ public: virtual void EndElement() override; virtual void ExportContent() override; -protected: +private: void AddContent( rtl::Reference const & pContent ); -private: XMLAxisContextVector m_aChildContexts; }; diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx index 8f6bbd0db2d3..17e2af255123 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.hxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx @@ -47,7 +47,7 @@ public: css::uno::Reference const & rRepository, const OUString& sTypeName ); -protected: +private: // create mxDataType (if not already present) void CreateDataType(); diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx index 3e01797dac94..636c10c3a370 100644 --- a/xmlscript/source/xmllib_imexp/imp_share.hxx +++ b/xmlscript/source/xmllib_imexp/imp_share.hxx @@ -185,7 +185,6 @@ class LibrariesElement : public LibElementBase { friend class LibraryElement; -protected: std::vector< LibDescriptor > mLibDescriptors; public: @@ -204,7 +203,6 @@ public: class LibraryElement : public LibElementBase { -protected: std::vector< OUString > mElements; public: diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx index e02537c07c44..6a3198284368 100644 --- a/xmlsecurity/inc/macrosecurity.hxx +++ b/xmlsecurity/inc/macrosecurity.hxx @@ -95,7 +95,6 @@ private: sal_uInt16 mnCurLevel; -protected: DECL_LINK(RadioButtonHdl, Button*, void); public: -- cgit