diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-22 10:36:24 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-23 07:17:50 +0000 |
commit | 29a9e97db65bcf5914aed9bf8cb8e8f38c3c5fc0 (patch) | |
tree | d4c30fc0519eb34bf27c47515a28908bf426a999 /include/xmloff | |
parent | c895cb32fa8d1cf7fa82cebbde9d8259e68e66f6 (diff) |
loplugin field-can-be-private in include/vcl..xmlscript
Change-Id: Ia03f7cccb256d825daa4dc6f4c0598448e46e6cf
Reviewed-on: https://gerrit.libreoffice.org/31069
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/xmloff')
-rw-r--r-- | include/xmloff/XMLCharContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLEventsImportContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLShapeStyleContext.hxx | 4 | ||||
-rw-r--r-- | include/xmloff/controlpropertyhdl.hxx | 1 | ||||
-rw-r--r-- | include/xmloff/formlayerexport.hxx | 1 | ||||
-rw-r--r-- | include/xmloff/styleexp.hxx | 10 | ||||
-rw-r--r-- | include/xmloff/txtparae.hxx | 5 | ||||
-rw-r--r-- | include/xmloff/xmlexp.hxx | 4 |
8 files changed, 9 insertions, 20 deletions
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index dd49c77c6fda..873502597c71 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -27,8 +27,8 @@ class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext { XMLCharContext(const XMLCharContext&) = delete; void operator =(const XMLCharContext&) = delete; -protected: sal_Int16 m_nControl; +protected: sal_uInt16 m_nCount; sal_Unicode m_c; public: diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx index e2a3ec51acf4..edbb27aee733 100644 --- a/include/xmloff/XMLEventsImportContext.hxx +++ b/include/xmloff/XMLEventsImportContext.hxx @@ -53,10 +53,10 @@ typedef ::std::vector< EventNameValuesPair > EventsVector; */ class XMLOFF_DLLPUBLIC XMLEventsImportContext : public SvXMLImportContext { -protected: // the event XNameReplace; may be empty css::uno::Reference<css::container::XNameReplace> xEvents; +protected: // if no XNameReplace is given, use this vector to collect events EventsVector aCollectEvents; diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index 690753784409..8163a9e49c28 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -32,12 +32,12 @@ class SvXMLImport; class XMLOFF_DLLPUBLIC XMLShapeStyleContext: public XMLPropStyleContext { -protected: OUString m_sControlDataStyleName; - OUString m_sListStyleName; bool m_bIsNumRuleAlreadyConverted; protected: + OUString m_sListStyleName; + virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, const OUString& rValue ) override; diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx index e043b167c7e2..39d5f73c4bbd 100644 --- a/include/xmloff/controlpropertyhdl.hxx +++ b/include/xmloff/controlpropertyhdl.hxx @@ -112,7 +112,6 @@ namespace xmloff class XMLOFF_DLLPUBLIC OControlPropertyHandlerFactory : public XMLPropertyHandlerFactory { - protected: mutable std::unique_ptr<XMLConstantsPropertyHandler> m_pTextAlignHandler; mutable std::unique_ptr<OControlBorderHandler> m_pControlBorderStyleHandler; mutable std::unique_ptr<OControlBorderHandler> m_pControlBorderColorHandler; diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx index cf031219f9e3..1b5e1cd6a672 100644 --- a/include/xmloff/formlayerexport.hxx +++ b/include/xmloff/formlayerexport.hxx @@ -52,7 +52,6 @@ namespace xmloff class XMLOFF_DLLPUBLIC OFormLayerXMLExport :public ::salhelper::SimpleReferenceObject { - protected: // impl class std::unique_ptr<OFormLayerXMLExport_Impl> m_pImpl; diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx index f311175e7f20..5f215069d06a 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -52,23 +52,17 @@ class SvXMLExport; class XMLOFF_DLLPUBLIC XMLStyleExport : public salhelper::SimpleReferenceObject { SvXMLExport& rExport; -protected: const OUString sIsPhysical; const OUString sIsAutoUpdate; const OUString sFollowStyle; const OUString sNumberingStyleName; const OUString sOutlineLevel; - - SvXMLExport& GetExport() { return rExport; } - const SvXMLExport& GetExport() const { return rExport; } - -private: - const OUString sPoolStyleName; - SvXMLAutoStylePoolP *pAutoStylePool; protected: + SvXMLExport& GetExport() { return rExport; } + const SvXMLExport& GetExport() const { return rExport; } bool exportStyle( const css::uno::Reference< css::style::XStyle > & rStyle, diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 7855fde089ee..070c392cc7bc 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -121,7 +121,7 @@ public: bool& rPrevCharIsSpace, FieldmarkType& openFieldMark); -protected: +private: // Implement Title/Description Elements UI (#i73249#) const OUString sTitle; @@ -141,7 +141,6 @@ protected: const OUString sFootnote; const OUString sFootnoteCounting; const OUString sFrame; - const OUString sFrameStyleName; const OUString sGraphicFilter; const OUString sGraphicRotation; const OUString sGraphicURL; @@ -202,6 +201,8 @@ protected: const OUString sTextFieldEnd; const OUString sTextFieldStartEnd; +protected: + const OUString sFrameStyleName; SinglePropertySetInfoCache aCharStyleNamesPropInfoCache; SvXMLAutoStylePoolP& GetAutoStylePool() { return rAutoStylePool; } diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 1ee7ba625178..29022f44f12c 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -160,12 +160,8 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6< SvXMLExportFlags mnExportFlags; SvXMLErrorFlags mnErrorFlags; -public: - const OUString msWS; // " " -private: - // Shapes in Writer cannot be named via context menu (#i51726#) SvtModuleOptions::EFactory meModelType; SAL_DLLPRIVATE void DetermineModelType_(); |