Kaydet (Commit) 692d35b8 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:finalclasses in xmloff

Change-Id: I10ffefd29b858548472a459314c7d5632324bca2
Reviewed-on: https://gerrit.libreoffice.org/43069Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 85a9b4b3
...@@ -85,10 +85,8 @@ private: ...@@ -85,10 +85,8 @@ private:
bool mbExportTables; bool mbExportTables;
bool mbWriter; bool mbWriter;
protected:
SvXMLExport& GetExport() { return mrExport; } SvXMLExport& GetExport() { return mrExport; }
const SvXMLExport& GetExport() const { return mrExport; } const SvXMLExport& GetExport() const { return mrExport; }
private:
SAL_DLLPRIVATE void ImpExportText( const css::uno::Reference < css::table::XCell >& xCell ); SAL_DLLPRIVATE void ImpExportText( const css::uno::Reference < css::table::XCell >& xCell );
......
...@@ -32,9 +32,8 @@ class XMLBackgroundImageExport ...@@ -32,9 +32,8 @@ class XMLBackgroundImageExport
{ {
SvXMLExport& rExport; SvXMLExport& rExport;
protected:
SvXMLExport& GetExport() { return rExport; } SvXMLExport& GetExport() { return rExport; }
public: public:
XMLBackgroundImageExport( SvXMLExport& rExport ); XMLBackgroundImageExport( SvXMLExport& rExport );
......
...@@ -29,8 +29,6 @@ class XMLBase64Export ...@@ -29,8 +29,6 @@ class XMLBase64Export
{ {
SvXMLExport& rExport; SvXMLExport& rExport;
protected:
SvXMLExport& GetExport() { return rExport; } SvXMLExport& GetExport() { return rExport; }
public: public:
......
...@@ -68,7 +68,7 @@ public: ...@@ -68,7 +68,7 @@ public:
/// the container containing the image map elements /// the container containing the image map elements
const css::uno::Reference< css::container::XIndexContainer> & rContainer); const css::uno::Reference< css::container::XIndexContainer> & rContainer);
protected: private:
/** /**
* Export a single, named map entry. * Export a single, named map entry.
......
...@@ -74,7 +74,7 @@ public: ...@@ -74,7 +74,7 @@ public:
virtual ~XMLIndexBibliographyConfigurationContext() override; virtual ~XMLIndexBibliographyConfigurationContext() override;
protected: private:
virtual void StartElement( virtual void StartElement(
const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override; const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override;
......
...@@ -30,7 +30,6 @@ class SdXMLImport; ...@@ -30,7 +30,6 @@ class SdXMLImport;
class SdXMLNumberFormatImportContext : public SvXMLNumFormatContext class SdXMLNumberFormatImportContext : public SvXMLNumFormatContext
{ {
private:
friend class SdXMLNumberFormatMemberImportContext; friend class SdXMLNumberFormatMemberImportContext;
bool mbTimeStyle; bool mbTimeStyle;
...@@ -42,7 +41,6 @@ private: ...@@ -42,7 +41,6 @@ private:
bool compareStyle( const SdXMLFixedDataStyle* pStyle, sal_Int16& nIndex ) const; bool compareStyle( const SdXMLFixedDataStyle* pStyle, sal_Int16& nIndex ) const;
protected:
void add( OUString const & rNumberStyle, bool bLong, bool bTextual, bool bDecimal02, OUString const & rText ); void add( OUString const & rNumberStyle, bool bLong, bool bTextual, bool bDecimal02, OUString const & rText );
public: public:
......
...@@ -36,8 +36,6 @@ class XMLTextColumnsExport ...@@ -36,8 +36,6 @@ class XMLTextColumnsExport
const OUString sAutomaticDistance; const OUString sAutomaticDistance;
const OUString sSeparatorLineStyle; const OUString sSeparatorLineStyle;
protected:
SvXMLExport& GetExport() { return rExport; } SvXMLExport& GetExport() { return rExport; }
public: public:
......
...@@ -834,7 +834,7 @@ public: ...@@ -834,7 +834,7 @@ public:
const OUString& sLocalName, const OUString& sLocalName,
sal_uInt16 nToken); sal_uInt16 nToken);
protected: private:
/// process attribute values /// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken, virtual void ProcessAttribute( sal_uInt16 nAttrToken,
const OUString& sAttrValue ) override; const OUString& sAttrValue ) override;
...@@ -1097,7 +1097,7 @@ public: ...@@ -1097,7 +1097,7 @@ public:
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& sLocalName); const OUString& sLocalName);
protected: private:
/// process attributes (fill aValues) /// process attributes (fill aValues)
virtual void StartElement( virtual void StartElement(
const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
......
...@@ -25,7 +25,6 @@ class SchXMLExport; ...@@ -25,7 +25,6 @@ class SchXMLExport;
class SchXMLAutoStylePoolP : public SvXMLAutoStylePoolP class SchXMLAutoStylePoolP : public SvXMLAutoStylePoolP
{ {
protected:
SchXMLExport& mrSchXMLExport; SchXMLExport& mrSchXMLExport;
virtual void exportStyleAttributes( virtual void exportStyleAttributes(
......
...@@ -572,9 +572,6 @@ public: ...@@ -572,9 +572,6 @@ public:
class SdXMLCustomShapeContext : public SdXMLShapeContext class SdXMLCustomShapeContext : public SdXMLShapeContext
{ {
protected:
OUString maCustomShapeEngine; OUString maCustomShapeEngine;
OUString maCustomShapeData; OUString maCustomShapeData;
......
...@@ -39,7 +39,6 @@ namespace xmloff ...@@ -39,7 +39,6 @@ namespace xmloff
*/ */
class OAttribListMerger : public OAttribListMerger_Base class OAttribListMerger : public OAttribListMerger_Base
{ {
protected:
typedef std::vector< css::uno::Reference< css::xml::sax::XAttributeList > > AttributeListArray; typedef std::vector< css::uno::Reference< css::xml::sax::XAttributeList > > AttributeListArray;
AttributeListArray m_aLists; AttributeListArray m_aLists;
...@@ -58,7 +57,7 @@ namespace xmloff ...@@ -58,7 +57,7 @@ namespace xmloff
virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) override; virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) override;
virtual OUString SAL_CALL getValueByName( const OUString& aName ) 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 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); bool seekToName(const OUString& _rName, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex);
}; };
......
...@@ -51,7 +51,6 @@ namespace xmloff ...@@ -51,7 +51,6 @@ namespace xmloff
*/ */
class OElementNameMap : public OControlElement class OElementNameMap : public OControlElement
{ {
protected:
typedef std::map<OUString, ElementType> MapString2Element; typedef std::map<OUString, ElementType> MapString2Element;
static MapString2Element s_sElementTranslations; static MapString2Element s_sElementTranslations;
...@@ -302,7 +301,6 @@ namespace xmloff ...@@ -302,7 +301,6 @@ namespace xmloff
//= OReferredControlImport //= OReferredControlImport
class OReferredControlImport : public OControlImport class OReferredControlImport : public OControlImport
{ {
protected:
OUString m_sReferringControls; // the list of ids of controls referring to the one being imported OUString m_sReferringControls; // the list of ids of controls referring to the one being imported
public: public:
...@@ -614,7 +612,6 @@ namespace xmloff ...@@ -614,7 +612,6 @@ namespace xmloff
//= OColumnWrapperImport //= OColumnWrapperImport
class OColumnWrapperImport : public SvXMLImportContext class OColumnWrapperImport : public SvXMLImportContext
{ {
protected:
css::uno::Reference< css::xml::sax::XAttributeList > css::uno::Reference< css::xml::sax::XAttributeList >
m_xOwnAttributes; m_xOwnAttributes;
css::uno::Reference< css::container::XNameContainer > css::uno::Reference< css::container::XNameContainer >
...@@ -632,7 +629,7 @@ namespace xmloff ...@@ -632,7 +629,7 @@ namespace xmloff
const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override;
virtual void StartElement( virtual void StartElement(
const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override;
protected: private:
OControlImport* implCreateChildContext( OControlImport* implCreateChildContext(
sal_uInt16 _nPrefix, const OUString& _rLocalName, sal_uInt16 _nPrefix, const OUString& _rLocalName,
OControlElement::ElementType _eType); OControlElement::ElementType _eType);
...@@ -668,7 +665,7 @@ namespace xmloff ...@@ -668,7 +665,7 @@ namespace xmloff
const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer
); );
protected: private:
// SvXMLImportContext overridables // SvXMLImportContext overridables
virtual SvXMLImportContextRef CreateChildContext( virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 _nPrefix, const OUString& _rLocalName, sal_uInt16 _nPrefix, const OUString& _rLocalName,
......
...@@ -47,7 +47,6 @@ namespace xmloff ...@@ -47,7 +47,6 @@ namespace xmloff
*/ */
class OEventDescriptorMapper : public OEventDescriptorMapper_Base class OEventDescriptorMapper : public OEventDescriptorMapper_Base
{ {
protected:
typedef std::map< OUString, css::uno::Sequence < css::beans::PropertyValue > > MapString2PropertyValueSequence; typedef std::map< OUString, css::uno::Sequence < css::beans::PropertyValue > > MapString2PropertyValueSequence;
MapString2PropertyValueSequence m_aMappedEvents; MapString2PropertyValueSequence m_aMappedEvents;
......
...@@ -36,7 +36,6 @@ namespace xmloff ...@@ -36,7 +36,6 @@ namespace xmloff
//= OFormEventsImportContext //= OFormEventsImportContext
class OFormEventsImportContext : public XMLEventsImportContext class OFormEventsImportContext : public XMLEventsImportContext
{ {
protected:
IEventAttacher& m_rEventAttacher; IEventAttacher& m_rEventAttacher;
public: public:
......
...@@ -37,7 +37,6 @@ namespace xmloff ...@@ -37,7 +37,6 @@ namespace xmloff
*/ */
class FormCellBindingHelper class FormCellBindingHelper
{ {
protected:
css::uno::Reference< css::beans::XPropertySet > css::uno::Reference< css::beans::XPropertySet >
m_xControlModel; // the model we work for m_xControlModel; // the model we work for
css::uno::Reference< css::sheet::XSpreadsheetDocument > css::uno::Reference< css::sheet::XSpreadsheetDocument >
...@@ -66,7 +65,6 @@ namespace xmloff ...@@ -66,7 +65,6 @@ namespace xmloff
const css::uno::Reference< css::frame::XModel >& _rxDocument const css::uno::Reference< css::frame::XModel >& _rxDocument
); );
public:
/** gets a cell binding for the given address /** gets a cell binding for the given address
@precond @precond
isCellBindingAllowed returns <TRUE/> isCellBindingAllowed returns <TRUE/>
...@@ -178,7 +176,7 @@ namespace xmloff ...@@ -178,7 +176,7 @@ namespace xmloff
const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource
); );
protected: private:
/** creates an address object from a string representation of a cell address /** creates an address object from a string representation of a cell address
*/ */
bool convertStringAddress( bool convertStringAddress(
......
...@@ -65,7 +65,6 @@ namespace xmloff ...@@ -65,7 +65,6 @@ namespace xmloff
{ {
friend class OFormLayerXMLExport; friend class OFormLayerXMLExport;
protected:
SvXMLExport& m_rContext; SvXMLExport& m_rContext;
SvXMLNumFmtExport* m_pControlNumberStyles; SvXMLNumFmtExport* m_pControlNumberStyles;
...@@ -123,7 +122,7 @@ namespace xmloff ...@@ -123,7 +122,7 @@ namespace xmloff
explicit OFormLayerXMLExport_Impl(SvXMLExport& _rContext); explicit OFormLayerXMLExport_Impl(SvXMLExport& _rContext);
virtual ~OFormLayerXMLExport_Impl(); virtual ~OFormLayerXMLExport_Impl();
protected: private:
/** exports one single grid column /** exports one single grid column
*/ */
void exportGridColumn( void exportGridColumn(
...@@ -231,7 +230,6 @@ namespace xmloff ...@@ -231,7 +230,6 @@ namespace xmloff
*/ */
void exportAutoStyles(); void exportAutoStyles();
protected:
static bool impl_isFormPageContainingForms( static bool impl_isFormPageContainingForms(
const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage, const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage,
css::uno::Reference< css::container::XIndexAccess >& _rxForms); css::uno::Reference< css::container::XIndexAccess >& _rxForms);
......
...@@ -51,7 +51,6 @@ namespace xmloff ...@@ -51,7 +51,6 @@ namespace xmloff
{ {
friend class OFormLayerXMLImport; friend class OFormLayerXMLImport;
protected:
SvXMLImport& m_rImporter; SvXMLImport& m_rImporter;
OAttribute2Property m_aAttributeMetaData; OAttribute2Property m_aAttributeMetaData;
...@@ -60,7 +59,6 @@ namespace xmloff ...@@ -60,7 +59,6 @@ namespace xmloff
m_xCurrentPageFormsSupp; m_xCurrentPageFormsSupp;
rtl::Reference<SvXMLStylesContext> m_xAutoStyles; rtl::Reference<SvXMLStylesContext> m_xAutoStyles;
protected:
typedef std::map< OUString, css::uno::Reference< css::beans::XPropertySet > > MapString2PropertySet; typedef std::map< OUString, css::uno::Reference< css::beans::XPropertySet > > MapString2PropertySet;
typedef std::map<css::uno::Reference<css::drawing::XDrawPage>, MapString2PropertySet, ODrawPageCompare> MapDrawPage2Map; typedef std::map<css::uno::Reference<css::drawing::XDrawPage>, MapString2PropertySet, ODrawPageCompare> MapDrawPage2Map;
...@@ -131,7 +129,7 @@ namespace xmloff ...@@ -131,7 +129,7 @@ namespace xmloff
~OFormLayerXMLImport_Impl() override; ~OFormLayerXMLImport_Impl() override;
protected: private:
explicit OFormLayerXMLImport_Impl(SvXMLImport& _rImporter); explicit OFormLayerXMLImport_Impl(SvXMLImport& _rImporter);
/** start importing the forms of the given page /** start importing the forms of the given page
......
...@@ -47,7 +47,7 @@ namespace xmloff ...@@ -47,7 +47,7 @@ namespace xmloff
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
protected: private:
void implImportBool( void implImportBool(
const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttributes, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttributes,
OfficeFormsAttributes _eAttribute, OfficeFormsAttributes _eAttribute,
......
...@@ -157,7 +157,6 @@ namespace xmloff ...@@ -157,7 +157,6 @@ namespace xmloff
*/ */
class OPropertyElementsContext : public SvXMLImportContext class OPropertyElementsContext : public SvXMLImportContext
{ {
protected:
OPropertyImportRef m_xPropertyImporter; // to add the properties OPropertyImportRef m_xPropertyImporter; // to add the properties
public: public:
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
class XMLPageMasterExportPropMapper : public SvXMLExportPropertyMapper class XMLPageMasterExportPropMapper : public SvXMLExportPropertyMapper
{ {
protected:
XMLBackgroundImageExport aBackgroundImageExport; XMLBackgroundImageExport aBackgroundImageExport;
XMLTextColumnsExport aTextColumnsExport; XMLTextColumnsExport aTextColumnsExport;
XMLFootnoteSeparatorExport aFootnoteSeparatorExport; XMLFootnoteSeparatorExport aFootnoteSeparatorExport;
......
...@@ -104,7 +104,6 @@ public: ...@@ -104,7 +104,6 @@ public:
class XMLPMPropHdl_Print : public XMLPropertyHandler class XMLPMPropHdl_Print : public XMLPropertyHandler
{ {
protected:
OUString sAttrValue; OUString sAttrValue;
public: public:
......
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
virtual void SAL_CALL initialize( virtual void SAL_CALL initialize(
const css::uno::Sequence<css::uno::Any> & rArguments ) override; const css::uno::Sequence<css::uno::Any> & rArguments ) override;
protected: private:
/// export the events off all autotexts /// export the events off all autotexts
virtual ErrCode exportDoc( virtual ErrCode exportDoc(
......
...@@ -71,7 +71,7 @@ public: ...@@ -71,7 +71,7 @@ public:
const css::uno::Reference<css::beans::XPropertySet> & rPropSet, const css::uno::Reference<css::beans::XPropertySet> & rPropSet,
bool bAutoStyles); bool bAutoStyles);
protected: private:
/// export attributes of table-of-content index marks /// export attributes of table-of-content index marks
void ExportTOCMarkAttributes( void ExportTOCMarkAttributes(
......
...@@ -132,7 +132,7 @@ public: ...@@ -132,7 +132,7 @@ public:
void ExportMasterDocHeadingDummies(); void ExportMasterDocHeadingDummies();
protected: private:
SvXMLExport& GetExport() { return rExport; } SvXMLExport& GetExport() { return rExport; }
XMLTextParagraphExport& GetParaExport() { return rParaExport; } XMLTextParagraphExport& GetParaExport() { return rParaExport; }
......
...@@ -67,7 +67,7 @@ public: ...@@ -67,7 +67,7 @@ public:
virtual ~XMLSectionImportContext() override; virtual ~XMLSectionImportContext() override;
protected: private:
virtual void StartElement( virtual void StartElement(
const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
......
...@@ -47,7 +47,7 @@ class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper ...@@ -47,7 +47,7 @@ class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper
XMLPropertyState* pCharPropHeightState, XMLPropertyState* pCharPropHeightState,
XMLPropertyState* pCharDiffHeightState ); XMLPropertyState* pCharDiffHeightState );
protected: private:
// SvXMLUnitConverter& mrUnitConverter; // SvXMLUnitConverter& mrUnitConverter;
// const Reference< xml::sax::XDocumentHandler > & mrHandler; // const Reference< xml::sax::XDocumentHandler > & mrHandler;
XMLTextDropCapExport maDropCapExport; XMLTextDropCapExport maDropCapExport;
......
...@@ -45,10 +45,9 @@ public: ...@@ -45,10 +45,9 @@ public:
virtual void EndElement() override; virtual void EndElement() override;
virtual void ExportContent() override; virtual void ExportContent() override;
protected: private:
void AddContent( rtl::Reference<XMLAxisOOoContext> const & pContent ); void AddContent( rtl::Reference<XMLAxisOOoContext> const & pContent );
private:
XMLAxisContextVector m_aChildContexts; XMLAxisContextVector m_aChildContexts;
}; };
......
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
css::uno::Reference<css::xforms::XDataTypeRepository> const & rRepository, css::uno::Reference<css::xforms::XDataTypeRepository> const & rRepository,
const OUString& sTypeName ); const OUString& sTypeName );
protected: private:
// create mxDataType (if not already present) // create mxDataType (if not already present)
void CreateDataType(); void CreateDataType();
......
...@@ -185,7 +185,6 @@ class LibrariesElement : public LibElementBase ...@@ -185,7 +185,6 @@ class LibrariesElement : public LibElementBase
{ {
friend class LibraryElement; friend class LibraryElement;
protected:
std::vector< LibDescriptor > mLibDescriptors; std::vector< LibDescriptor > mLibDescriptors;
public: public:
...@@ -204,7 +203,6 @@ public: ...@@ -204,7 +203,6 @@ public:
class LibraryElement : public LibElementBase class LibraryElement : public LibElementBase
{ {
protected:
std::vector< OUString > mElements; std::vector< OUString > mElements;
public: public:
......
...@@ -95,7 +95,6 @@ private: ...@@ -95,7 +95,6 @@ private:
sal_uInt16 mnCurLevel; sal_uInt16 mnCurLevel;
protected:
DECL_LINK(RadioButtonHdl, Button*, void); DECL_LINK(RadioButtonHdl, Button*, void);
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment