diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index dd63a83fc149..348cd75f6ebb 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -29,7 +29,6 @@ class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext XMLCharContext(const XMLCharContext&) = delete; void operator =(const XMLCharContext&) = delete; sal_Int16 m_nControl; -protected: sal_uInt16 m_nCount; sal_Unicode m_c; public: diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index 59b7c91e6b5e..f58442ca22d0 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -33,10 +33,9 @@ class XMLOFF_DLLPUBLIC XMLShapeStyleContext: public XMLPropStyleContext { OUString m_sControlDataStyleName; bool m_bIsNumRuleAlreadyConverted; - -protected: OUString m_sListStyleName; +protected: virtual void SetAttribute( sal_Int32 nElement, const OUString& rValue ) override; public: diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx index 92b0ddb7684b..6efa1be23577 100644 --- a/include/xmlscript/xml_helper.hxx +++ b/include/xmlscript/xml_helper.hxx @@ -88,10 +88,9 @@ public: virtual OUString SAL_CALL getValueByIndex( sal_Int16 nPos ) override; virtual OUString SAL_CALL getValueByName( OUString const & rName ) override; -protected: +private: ::std::vector< css::uno::Reference< css::xml::sax::XAttributeList > > _subElems; -private: OUString const _name; ::std::vector< OUString > _attrNames; ::std::vector< OUString > _attrValues; diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index 4540559116d7..ab791151180f 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -71,11 +71,11 @@ public: class AddressWalkerWriter : public AddressWalker { -public: ScDocShell* mpDocShell; ScDocument& mrDocument; formula::FormulaGrammar::Grammar meGrammar; +public: AddressWalkerWriter(const ScAddress& aInitialAddress, ScDocShell* pDocShell, ScDocument& rDocument, formula::FormulaGrammar::Grammar eGrammar ); diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index 7779564db716..77bdb57012de 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -61,9 +61,9 @@ namespace sc class ScDocFunc { -protected: ScDocShell& rDocShell; +protected: bool AdjustRowHeight( const ScRange& rRange, bool bPaint, bool bApi ); void CreateOneName( ScRangeName& rList, SCCOL nPosX, SCROW nPosY, SCTAB nTab, diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index cc1af1367550..93a5ffe6360f 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -66,6 +66,7 @@ class ShutdownIcon : public ShutdownIconServiceBase bool m_bSystemDialogs; std::unique_ptr m_pFileDlg; css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::frame::XDesktop2 > m_xDesktop; static rtl::Reference pShutdownIcon; // one instance @@ -135,8 +136,6 @@ class ShutdownIcon : public ShutdownIconServiceBase const css::uno::Any& aValue ) override; virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) override; - css::uno::Reference< css::frame::XDesktop2 > m_xDesktop; - #ifdef _WIN32 static void EnableAutostartW32( const OUString &aShortcutName ); static OUString GetAutostartFolderNameW32(); diff --git a/svx/inc/sdr/properties/cellproperties.hxx b/svx/inc/sdr/properties/cellproperties.hxx index 46e7b280fcd0..24106080a1d2 100644 --- a/svx/inc/sdr/properties/cellproperties.hxx +++ b/svx/inc/sdr/properties/cellproperties.hxx @@ -70,9 +70,8 @@ public: void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; - sdr::table::CellRef mxCell; - private: + sdr::table::CellRef mxCell; const CellTextProvider maTextProvider; }; diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx index ce8e94a158be..82d77772eff2 100644 --- a/sw/inc/accessibilityoptions.hxx +++ b/sw/inc/accessibilityoptions.hxx @@ -18,11 +18,11 @@ */ #pragma once -struct SwAccessibilityOptions +class SwAccessibilityOptions { bool bIsAlwaysAutoColor :1; bool bIsStopAnimatedGraphics :1; - +public: SwAccessibilityOptions() : bIsAlwaysAutoColor(false), bIsStopAnimatedGraphics(false) {} diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 1fb861748f20..8976452a0dc4 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -59,7 +59,7 @@ class SvtAccessibilityOptions; class SwPagePreviewLayout; class SwTextFrame; -struct SwAccessibilityOptions; +class SwAccessibilityOptions; namespace vcl { class Region; } class SwPostItMgr; class SdrPaintWindow; diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index 9a02e881e10e..3d58f5fcd09d 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -86,8 +86,6 @@ class SW_DLLPUBLIC SwDrawTextInfo // inside second half of bound rect, used for Accessibility bool m_bPosMatchesBounds :1; -public: - #ifdef DBG_UTIL // These flags should control that the appropriate Set-function has been // called before calling the Get-function of a member @@ -107,6 +105,8 @@ public: bool m_bDrawSp: 1; #endif +public: + /// constructor for simple strings SwDrawTextInfo( SwViewShell const *pSh, OutputDevice &rOut, const OUString &rText, sal_Int32 const nIdx, sal_Int32 const nLen, diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 00d837259b94..4b6f7ad5c2a6 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -647,7 +647,7 @@ inline void SwHTMLWriter::OutCSS1_Property( std::string_view pProp, // positions in the document. // In dtor all data is restored and the created PaM is deleted again. -struct HTMLSaveData +class HTMLSaveData { SwHTMLWriter& rWrt; std::shared_ptr pOldPam; @@ -661,6 +661,7 @@ struct HTMLSaveData bool bOldOutFooter : 1; bool bOldOutFlyFrame : 1; +public: HTMLSaveData( SwHTMLWriter&, SwNodeOffset nStt, SwNodeOffset nEnd, bool bSaveNum=true, const SwFrameFormat *pFrameFormat=nullptr ); diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 0b6f67b1da23..8105a6fd4e33 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -539,7 +539,6 @@ public: class SwInsTableDlg; class AbstractInsTableDlg_Impl : public AbstractInsTableDlg { -protected: std::shared_ptr m_xDlg; public: explicit AbstractInsTableDlg_Impl(std::shared_ptr p) @@ -620,7 +619,6 @@ public: class SwMultiTOXTabDialog; class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog { -protected: std::shared_ptr m_xDlg; public: explicit AbstractMultiTOXTabDialog_Impl(std::shared_ptr p) diff --git a/vcl/source/filter/idxf/dxfentrd.hxx b/vcl/source/filter/idxf/dxfentrd.hxx index c4cf22fac0f9..f1a267727db7 100644 --- a/vcl/source/filter/idxf/dxfentrd.hxx +++ b/vcl/source/filter/idxf/dxfentrd.hxx @@ -360,18 +360,19 @@ struct DXFEdgeTypeLine : public DXFEdgeType virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; -struct DXFEdgeTypeCircularArc : public DXFEdgeType +class DXFEdgeTypeCircularArc : public DXFEdgeType { DXFVector aCenter; // 10,20 double fRadius; // 40 double fStartAngle; // 50 double fEndAngle; // 51 sal_Int32 nIsCounterClockwiseFlag; // 73 +public: DXFEdgeTypeCircularArc(); virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; -struct DXFEdgeTypeEllipticalArc : public DXFEdgeType +class DXFEdgeTypeEllipticalArc : public DXFEdgeType { DXFVector aCenter; // 10,20 DXFVector aEndPoint; // 11,21 @@ -379,19 +380,19 @@ struct DXFEdgeTypeEllipticalArc : public DXFEdgeType double fStartAngle; // 50 double fEndAngle; // 51 sal_Int32 nIsCounterClockwiseFlag; // 73 - +public: DXFEdgeTypeEllipticalArc(); virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; -struct DXFEdgeTypeSpline : public DXFEdgeType +class DXFEdgeTypeSpline : public DXFEdgeType { sal_Int32 nDegree; // 94 sal_Int32 nRational; // 73 sal_Int32 nPeriodic; // 74 sal_Int32 nKnotCount; // 75 sal_Int32 nControlCount; // 76 - +public: DXFEdgeTypeSpline(); virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx index aa7b84e0a083..d40ca89ae68b 100644 --- a/writerfilter/source/dmapper/LoggedResources.hxx +++ b/writerfilter/source/dmapper/LoggedResources.hxx @@ -101,6 +101,7 @@ protected: virtual void lcl_endGlossaryEntry() {} virtual void lcl_checkId(const sal_Int32) {} +private: #ifdef DBG_UTIL LoggedResourcesHelper mHelper; #endif @@ -119,6 +120,7 @@ protected: virtual void lcl_attribute(Id name, Value& val) = 0; virtual void lcl_sprm(Sprm& sprm) = 0; +private: #ifdef DBG_UTIL LoggedResourcesHelper mHelper; #endif @@ -135,6 +137,7 @@ public: protected: virtual void lcl_entry(writerfilter::Reference::Pointer_t ref) = 0; +private: #ifdef DBG_UTIL LoggedResourcesHelper mHelper; #endif diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx index 4a710bcc55df..729103484d0f 100644 --- a/xmloff/source/chart/contexts.hxx +++ b/xmloff/source/chart/contexts.hxx @@ -35,7 +35,6 @@ namespace com::sun::star::xml::sax { class SchXMLDocContext : public virtual SvXMLImportContext { -protected: SchXMLImportHelper& mrImportHelper; public: diff --git a/xmloff/source/core/SvXMLAttrCollection.hxx b/xmloff/source/core/SvXMLAttrCollection.hxx index a99b149650a7..5b44aeb1b782 100644 --- a/xmloff/source/core/SvXMLAttrCollection.hxx +++ b/xmloff/source/core/SvXMLAttrCollection.hxx @@ -18,10 +18,10 @@ class SvXMLAttrCollection { -public: SvXMLNamespaceMap aNamespaceMap; std::vector aAttrs; +public: bool operator==(const SvXMLAttrCollection &rCmp) const; bool AddAttr( const OUString& rLName, const OUString& rValue ); diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index e13edcc8c8c2..6e2ed1676ac2 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -39,7 +39,6 @@ namespace xmloff //= OElementExport class OElementExport : public OPropertyExport { - protected: css::uno::Sequence< css::script::ScriptEventDescriptor > m_aEvents; diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index bf91ac02136c..01de34976024 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -437,7 +437,6 @@ namespace xmloff friend class OListOptionImport; friend class OComboItemImport; - protected: std::vector m_aListSource; std::vector< OUString >