accessibility/inc/standard/vclxaccessiblebox.hxx | 28 +++++----- chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx | 2 chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx | 2 chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx | 1 chart2/source/inc/BaseCoordinateSystem.hxx | 4 - chart2/source/inc/WrappedPropertySet.hxx | 2 cui/source/inc/QrCodeGenDialog.hxx | 2 cui/source/inc/scriptdlg.hxx | 1 dbaccess/source/core/inc/TableDeco.hxx | 2 dbaccess/source/core/inc/column.hxx | 2 dbaccess/source/core/inc/databasecontext.hxx | 1 dbaccess/source/core/inc/table.hxx | 2 dbaccess/source/ui/dlg/dbfindex.hxx | 2 dbaccess/source/ui/inc/TableWindowData.hxx | 2 dbaccess/source/ui/inc/indexcollection.hxx | 1 drawinglayer/source/tools/emfpbrush.hxx | 2 drawinglayer/source/tools/emfppath.hxx | 3 - extensions/source/dbpilots/commonpagesdbp.hxx | 1 extensions/source/propctrlr/propcontroller.hxx | 3 - forms/source/inc/limitedformats.hxx | 1 i18npool/inc/indexentrysupplier_default.hxx | 3 - include/comphelper/MasterPropertySet.hxx | 2 include/comphelper/accessiblewrapper.hxx | 2 include/comphelper/containermultiplexer.hxx | 1 include/comphelper/logging.hxx | 1 include/comphelper/stl_types.hxx | 1 include/filter/msfilter/escherex.hxx | 6 +- include/filter/msfilter/svdfppt.hxx | 5 + 28 files changed, 39 insertions(+), 46 deletions(-)
New commits: commit 9c2e77152c3b824153ef5451ababe58dc5ce981c Author: Noel Grandin <[email protected]> AuthorDate: Wed Nov 23 16:02:12 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Nov 23 20:49:03 2022 +0100 loplugin:unusedfields make some fields private this is one of the secondary analyses this plugin performs Change-Id: Iaa4424c2396470c6f1df85b0290fbffdda35fa08 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143177 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index 9b1c5aadbc45..9abebf6f3b19 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -110,7 +110,22 @@ public: virtual css::uno::Any SAL_CALL getMinimumValue( ) override; virtual css::uno::Any SAL_CALL getMinimumIncrement( ) override; + protected: + virtual ~VCLXAccessibleBox() override = default; + + /** Returns true when the object is valid. + */ + virtual bool IsValid() const = 0; + + virtual void ProcessWindowChildEvent (const VclWindowEvent& rVclWindowEvent) override; + virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; + + virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; + + sal_Int64 implGetAccessibleChildCount(); + +private: /** Specifies whether the box is a combo box or a list box. List boxes have multi selection. */ @@ -140,19 +155,6 @@ protected: same life time. */ bool m_bHasListChild; - - virtual ~VCLXAccessibleBox() override = default; - - /** Returns true when the object is valid. - */ - virtual bool IsValid() const = 0; - - virtual void ProcessWindowChildEvent (const VclWindowEvent& rVclWindowEvent) override; - virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; - - virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; - - sal_Int64 implGetAccessibleChildCount(); }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index 7eee90a2c209..be9457d0ffd7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -45,7 +45,7 @@ protected: virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; virtual css::uno::Any convertOuterToInnerValue( const css::uno::Any& rOuterValue ) const override; -protected: +private: ReferenceSizePropertyProvider* m_pRefSizePropProvider; }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index 983b6b5c4414..6ac43e9f7635 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -43,7 +43,7 @@ public: void setDimensionAndAxisIndex( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); -protected: +private: sal_Int32 m_nDimensionIndex; sal_Int32 m_nAxisIndex; std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index b69ab70f64f3..2b265c7d6541 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -38,7 +38,6 @@ struct InsertAxisOrGridDialogData \************************************************************************/ class SchAxisDlg : public weld::GenericDialogController { -protected: std::unique_ptr<weld::CheckButton> m_xCbPrimaryX; std::unique_ptr<weld::CheckButton> m_xCbPrimaryY; std::unique_ptr<weld::CheckButton> m_xCbPrimaryZ; diff --git a/chart2/source/inc/BaseCoordinateSystem.hxx b/chart2/source/inc/BaseCoordinateSystem.hxx index 89c5eca50e13..2a308d5c25ed 100644 --- a/chart2/source/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/inc/BaseCoordinateSystem.hxx @@ -118,10 +118,8 @@ protected: void fireModifyEvent(); -protected: - rtl::Reference<ModifyEventForwarder> m_xModifyEventForwarder; - private: + rtl::Reference<ModifyEventForwarder> m_xModifyEventForwarder; sal_Int32 m_nDimensionCount; typedef std::vector< std::vector< rtl::Reference< ::chart::Axis > > > tAxisVecVecType; tAxisVecVecType m_aAllAxis; //outer sequence is the dimension; inner sequence is the axis index that indicates main or secondary axis diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 30ac421b3f5c..3dc6e6a82dc3 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -103,7 +103,7 @@ protected: //methods const WrappedProperty* getWrappedProperty( const OUString& rOuterName ); const WrappedProperty* getWrappedProperty( sal_Int32 nHandle ); -protected: //member +private: css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;//outer PropertySetInfo std::unique_ptr<::cppu::OPropertyArrayHelper> m_pPropertyArrayHelper;//holds all possible outer properties diff --git a/cui/source/inc/QrCodeGenDialog.hxx b/cui/source/inc/QrCodeGenDialog.hxx index 165bc6d75f4a..2c205c6a85d4 100644 --- a/cui/source/inc/QrCodeGenDialog.hxx +++ b/cui/source/inc/QrCodeGenDialog.hxx @@ -26,10 +26,10 @@ public: virtual short run() override; protected: - css::uno::Reference<css::frame::XModel> m_xModel; void Apply(); private: + css::uno::Reference<css::frame::XModel> m_xModel; std::unique_ptr<weld::Entry> m_xEdittext; std::unique_ptr<weld::RadioButton> m_xECC[4]; std::unique_ptr<weld::SpinButton> m_xSpinBorder; diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 0644ea4425e4..b1b014771dae 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -76,7 +76,6 @@ public: class SvxScriptOrgDialog : public SfxDialogController { -protected: weld::Window* m_pParent; OUString m_sLanguage; static Selection_hash m_lastSelection; diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index e40fac80290c..93a974dac4a4 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -61,7 +61,6 @@ namespace dbaccess ,public ODBTableDecorator_PROP { void fillPrivileges() const; - protected: css::uno::Reference< css::container::XContainerListener > m_xColumnMediator; css::uno::Reference< css::sdbcx::XColumnsSupplier > m_xTable; css::uno::Reference< css::container::XNameAccess > m_xColumnDefinitions; @@ -75,6 +74,7 @@ namespace dbaccess // note: this thing uses the ref-count of "this", see OCollection::acquire()! std::unique_ptr<::connectivity::sdbcx::OCollection> m_pColumns; + protected: // IColumnFactory virtual rtl::Reference<OColumn> createColumn(const OUString& _rName) const override; virtual css::uno::Reference< css::beans::XPropertySet > createColumnDescriptor() override; diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index ca533b5b1793..eae96fba3fd6 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -128,7 +128,6 @@ namespace dbaccess { OContainerMediator* m_pMediator; - protected: // comes from the driver can be null css::uno::Reference< css::container::XNameAccess > m_xDrvColumns; css::uno::WeakReference< css::uno::XInterface > m_xParent; @@ -139,6 +138,7 @@ namespace dbaccess bool m_bAddColumn : 1; bool m_bDropColumn : 1; + protected: virtual void impl_refresh() override; virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override; virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; diff --git a/dbaccess/source/core/inc/databasecontext.hxx b/dbaccess/source/core/inc/databasecontext.hxx index e15585c819d1..89662ad2281d 100644 --- a/dbaccess/source/core/inc/databasecontext.hxx +++ b/dbaccess/source/core/inc/databasecontext.hxx @@ -84,7 +84,6 @@ private: BasicDLL m_aBasicDLL; #endif -protected: ::osl::Mutex m_aMutex; css::uno::Reference< css::uno::XComponentContext > m_aContext; diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 8c29bff44772..84bcf2470ec6 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -44,7 +44,6 @@ namespace dbaccess private: ::rtl::Reference< OContainerMediator > m_pColumnMediator; - protected: css::uno::Reference< css::container::XNameAccess > m_xColumnDefinitions; css::uno::Reference< css::container::XNameAccess > m_xDriverColumns; @@ -52,6 +51,7 @@ namespace dbaccess sal_Int32 m_nPrivileges; // </properties> + protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 0db7ea7b04a6..938339314ecc 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -64,7 +64,6 @@ typedef std::deque< OTableInfo > TableInfoList; // IndexDialog class ODbaseIndexDialog : public weld::GenericDialogController { -protected: OUString m_aDSN; TableInfoList m_aTableInfoList; TableIndexList m_aFreeIndexList; @@ -88,6 +87,7 @@ protected: DECL_LINK( OKClickHdl, weld::Button&, void ); DECL_LINK( OnListEntrySelected, weld::TreeView&, void ); +protected: void Init(); void SetCtrls(); diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index 33fb4a958100..0160ea723316 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -34,7 +34,7 @@ namespace dbaui mutable ::osl::Mutex m_aMutex; void listen(); - protected: + // the columns of the table css::uno::Reference< css::beans::XPropertySet > m_xTable; // can either be a table or a query css::uno::Reference< css::container::XIndexAccess> m_xKeys; diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index d677eed06c5f..3d227b0b3869 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -29,7 +29,6 @@ namespace dbaui // OIndexCollection class OIndexCollection { - protected: css::uno::Reference< css::container::XNameAccess > m_xIndexes; diff --git a/drawinglayer/source/tools/emfpbrush.hxx b/drawinglayer/source/tools/emfpbrush.hxx index 5f272a63ac9c..aee3fe02f60e 100644 --- a/drawinglayer/source/tools/emfpbrush.hxx +++ b/drawinglayer/source/tools/emfpbrush.hxx @@ -90,7 +90,7 @@ namespace emfplushelper BrushTypeLinearGradient = 0x00000004 }; - struct EMFPPath; + class EMFPPath; struct EMFPBrush : public EMFPObject { diff --git a/drawinglayer/source/tools/emfppath.hxx b/drawinglayer/source/tools/emfppath.hxx index 8db095a21a69..94a3d342f887 100644 --- a/drawinglayer/source/tools/emfppath.hxx +++ b/drawinglayer/source/tools/emfppath.hxx @@ -23,13 +23,14 @@ namespace emfplushelper { - struct EMFPPath : public EMFPObject + class EMFPPath : public EMFPObject { ::basegfx::B2DPolyPolygon aPolygon; sal_uInt32 nPoints; std::unique_ptr<float[]> pPoints; std::unique_ptr<sal_uInt8[]> pPointTypes; + public: EMFPPath(sal_uInt32 _nPoints, bool bLines = false); virtual ~EMFPPath() override; diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index a37398ca3525..11dc5ceb65d4 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -88,7 +88,6 @@ namespace dbp class ODBFieldPage : public OMaybeListSelectionPage { - protected: std::unique_ptr<weld::Label> m_xDescription; std::unique_ptr<weld::RadioButton> m_xStoreYes; std::unique_ptr<weld::RadioButton> m_xStoreNo; diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index a56a839796f4..a149d7ff2338 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -76,10 +76,7 @@ namespace pcr typedef std::vector< css::uno::Reference< css::uno::XInterface > > InterfaceArray; - protected: css::uno::Reference< css::uno::XComponentContext > m_xContext; - - private: css::uno::Reference< css::frame::XFrame > m_xFrame; css::uno::Reference< css::awt::XWindow > m_xView; diff --git a/forms/source/inc/limitedformats.hxx b/forms/source/inc/limitedformats.hxx index a176df06f054..9ef4534423cd 100644 --- a/forms/source/inc/limitedformats.hxx +++ b/forms/source/inc/limitedformats.hxx @@ -43,7 +43,6 @@ namespace frm static css::uno::Reference< css::util::XNumberFormatsSupplier > s_xStandardFormats; - protected: sal_Int32 m_nFormatEnumPropertyHandle; const sal_Int16 m_nTableId; css::uno::Reference< css::beans::XFastPropertySet > diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx index caf71326d632..e9c43583b634 100644 --- a/i18npool/inc/indexentrysupplier_default.hxx +++ b/i18npool/inc/indexentrysupplier_default.hxx @@ -88,7 +88,9 @@ public: void makeIndexKeys(const css::lang::Locale &rLocale, std::u16string_view algorithm); sal_Int16 getIndexWeight(const OUString& rIndexEntry); OUString getIndexDescription(const OUString& rIndexEntry); + sal_Int16 compare(sal_Unicode c1, sal_Unicode c2); +private: IndexTable tables[MAX_TABLES]; sal_Int16 table_count; IndexKey keys[MAX_KEYS]; @@ -97,7 +99,6 @@ public: sal_Int16 mkey_count; OUString skipping_chars; rtl::Reference<CollatorImpl> collator; - sal_Int16 compare(sal_Unicode c1, sal_Unicode c2); }; } diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx index acd9ce9c4af6..867583d646ca 100644 --- a/include/comphelper/MasterPropertySet.hxx +++ b/include/comphelper/MasterPropertySet.hxx @@ -61,12 +61,12 @@ namespace comphelper public css::beans::XPropertyState, public css::beans::XMultiPropertySet { - protected: SolarMutex* const mpMutex; sal_uInt8 mnLastId; std::map< sal_uInt8, comphelper::SlaveData* > maSlaveMap; rtl::Reference< MasterPropertySetInfo > mxInfo; + protected: /// @throws css::beans::UnknownPropertyException /// @throws css::beans::PropertyVetoException /// @throws css::lang::IllegalArgumentException diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index 4493c660f216..8a09ae0110c3 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -71,8 +71,6 @@ namespace comphelper m_xParentAccessible; css::uno::WeakReference< css::accessibility::XAccessibleContext > m_aContext; - - protected: css::uno::Reference< css::accessibility::XAccessible > m_xInnerAccessible; diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx index 5b40b62ae515..dc3abc1d6148 100644 --- a/include/comphelper/containermultiplexer.hxx +++ b/include/comphelper/containermultiplexer.hxx @@ -45,7 +45,6 @@ namespace comphelper class COMPHELPER_DLLPUBLIC OContainerListener { friend class OContainerListenerAdapter; - protected: rtl::Reference<OContainerListenerAdapter> m_xAdapter; ::osl::Mutex& m_rMutex; diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx index f0a599765b80..609c0b727f7b 100644 --- a/include/comphelper/logging.hxx +++ b/include/comphelper/logging.hxx @@ -91,7 +91,6 @@ namespace comphelper */ class COMPHELPER_DLLPUBLIC EventLogger { - protected: std::shared_ptr< EventLogger_Impl > m_pImpl; public: diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index 6b21dd77ddbb..a1df3cc363c5 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -38,6 +38,7 @@ namespace comphelper struct UStringMixLess { +private: bool m_bCaseSensitive; public: UStringMixLess(bool bCaseSensitive = true):m_bCaseSensitive(bCaseSensitive){} diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 462cee4f75af..ab8c30d7b2c4 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -478,18 +478,20 @@ struct MSFILTER_DLLPUBLIC EscherConnectorListEntry struct MSFILTER_DLLPUBLIC EscherExContainer { +private: sal_uInt32 nContPos; SvStream& rStrm; - +public: EscherExContainer( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance = 0 ); ~EscherExContainer(); }; struct MSFILTER_DLLPUBLIC EscherExAtom { +private: sal_uInt32 nContPos; SvStream& rStrm; - +public: EscherExAtom( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance = 0, const sal_uInt8 nVersion = 0 ); ~EscherExAtom(); }; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 40ace3c33425..9c515615e0af 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -1000,8 +1000,9 @@ struct PPTRuler final : public salhelper::SimpleReferenceObject struct PPTTextRulerInterpreter { +private: rtl::Reference<PPTRuler> mxImplRuler; - +public: PPTTextRulerInterpreter(); PPTTextRulerInterpreter( PPTTextRulerInterpreter const & rRuler ); PPTTextRulerInterpreter( @@ -1156,10 +1157,10 @@ class MSFILTER_DLLPUBLIC PPTParagraphObj PPTParagraphObj(PPTParagraphObj const&) = delete; void operator=(PPTParagraphObj const&) = delete; -public: sal_uInt32 mnCurrentObject; ::std::vector<std::unique_ptr<PPTPortionObj>> m_PortionList; +public: void UpdateBulletRelSize( sal_uInt32& nBulletRelSize ) const; bool GetAttrib( sal_uInt32 nAttr, sal_uInt32& nVal, TSS_Type nInstanceInSheet );
