diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-16 08:59:52 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-16 09:10:16 +0000 |
commit | 7cca2c7fb328e64f1779993b60809eff6974b970 (patch) | |
tree | 1e9463b671572a0ea0d04f443033b9eaf8933bcc /include | |
parent | 3c73942c8c4b97ee9ede65890e1b1db3cac753c5 (diff) |
new loplugin finalprotected
look for final classes, and make sure they don't have protected members
Change-Id: I1fa810659bba02b61a5160dbfd8e24185ec9abf4
Reviewed-on: https://gerrit.libreoffice.org/30895
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/dbaccess/AsynchronousLink.hxx | 4 | ||||
-rw-r--r-- | include/oox/ole/vbacontrol.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/timenode.hxx | 3 | ||||
-rw-r--r-- | include/sfx2/dispatch.hxx | 11 | ||||
-rw-r--r-- | include/sfx2/emojiview.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/templatelocalview.hxx | 2 | ||||
-rw-r--r-- | include/svtools/imap.hxx | 2 | ||||
-rw-r--r-- | include/svtools/treelist.hxx | 1 | ||||
-rw-r--r-- | include/svx/AccessibleTextHelper.hxx | 9 | ||||
-rw-r--r-- | include/svx/ShapeTypeHandler.hxx | 3 | ||||
-rw-r--r-- | include/svx/fmsrcimp.hxx | 3 | ||||
-rw-r--r-- | include/svx/sdr/contact/displayinfo.hxx | 1 | ||||
-rw-r--r-- | include/tools/ref.hxx | 2 | ||||
-rw-r--r-- | include/tools/simplerm.hxx | 1 | ||||
-rw-r--r-- | include/vcl/gdimtf.hxx | 2 | ||||
-rw-r--r-- | include/vcl/svapp.hxx | 8 | ||||
-rw-r--r-- | include/xmloff/xmlnume.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/xmltabe.hxx | 2 |
18 files changed, 16 insertions, 44 deletions
diff --git a/include/dbaccess/AsynchronousLink.hxx b/include/dbaccess/AsynchronousLink.hxx index d8ca5b1d3610..c2779be5334a 100644 --- a/include/dbaccess/AsynchronousLink.hxx +++ b/include/dbaccess/AsynchronousLink.hxx @@ -42,6 +42,7 @@ namespace dbaui ::osl::Mutex m_aEventSafety; ::osl::Mutex m_aDestructionSafety; ImplSVEvent * m_nEventId; + DECL_LINK(OnAsyncCall, void*, void); public: /** constructs the object @@ -54,9 +55,6 @@ namespace dbaui void Call( void* _pArgument = nullptr ); void CancelCall(); - - protected: - DECL_LINK(OnAsyncCall, void*, void); }; } #endif // INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index df1c0410c7cd..f7e22cf68eda 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -88,7 +88,7 @@ public: sal_Int32 nCtrlIndex ) const; const OUString& getControlSource() { return maControlSource; } const OUString& getRowSource() { return maRowSource; } -protected: +private: OUString maName; ///< Name of the control. OUString maTag; ///< User defined tag. OUString maToolTip; ///< Tool tip for the control. diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx index 7e6bd94b672c..0c3cd403b93d 100644 --- a/include/oox/ppt/timenode.hxx +++ b/include/oox/ppt/timenode.hxx @@ -94,7 +94,7 @@ namespace oox { namespace ppt { { return maPrevCondList; } AnimationCondition & getEndSyncValue() { mbHasEndSyncValue = true; return maEndSyncValue; } - protected: + private: static OUString getServiceName( sal_Int16 nNodeType ); @@ -104,7 +104,6 @@ namespace oox { namespace ppt { const OUString& rServiceName, const css::uno::Reference< css::animations::XAnimationNode >& rxNode ); - private: const sal_Int16 mnNodeType; TimeNodePtrList maChildren; diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 1b79d9049997..78dc67ea5f47 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -80,12 +80,15 @@ class SFX2_DLLPUBLIC SfxDispatcher final { std::unique_ptr<SfxDispatcher_Impl> xImp; -private: // Search for temporary evaluated Todos SAL_DLLPRIVATE bool CheckVirtualStack( const SfxShell& rShell ); friend class SfxApplication; friend class SfxViewFrame; +friend class SfxBindings; +friend class SfxStateCache; +friend class SfxPopupMenuManager; +friend class SfxHelp; DECL_DLLPRIVATE_LINK( EventHdl_Impl, Idle *, void ); DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest *, void ); @@ -93,11 +96,6 @@ friend class SfxViewFrame; SAL_DLLPRIVATE void Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord ); SAL_DLLPRIVATE void Update_Impl_( bool,bool,bool,SfxWorkWindow*); -protected: -friend class SfxBindings; -friend class SfxStateCache; -friend class SfxPopupMenuManager; -friend class SfxHelp; bool FindServer_( sal_uInt16 nId, SfxSlotServer &rServer, bool bModal ); bool FillState_( const SfxSlotServer &rServer, @@ -106,7 +104,6 @@ friend class SfxHelp; SfxRequest &rReq, SfxCallMode eCall = SfxCallMode::RECORD); -protected: void FlushImpl(); public: diff --git a/include/sfx2/emojiview.hxx b/include/sfx2/emojiview.hxx index 80ef8a0c0c36..602fae9e9ec9 100644 --- a/include/sfx2/emojiview.hxx +++ b/include/sfx2/emojiview.hxx @@ -48,7 +48,7 @@ public: static bool isFilteredCategory(FILTER_CATEGORY filter, const OUString &rCategory); -protected: +private: FILTER_CATEGORY mCategory; }; diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 4a1579fa9190..8a3bfaeac19d 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -66,7 +66,7 @@ public: static bool isFilteredExtension(FILTER_APPLICATION filter, const OUString &rExt); bool isValid (const OUString& rPath) const; -protected: +private: FILTER_APPLICATION mApp; }; diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx index bd317797d92b..da68c639b2f0 100644 --- a/include/svtools/imap.hxx +++ b/include/svtools/imap.hxx @@ -38,8 +38,6 @@ private: ::std::vector< IMapObject* > maList; OUString aName; -protected: - // binary saving/loading void ImpWriteImageMap( SvStream& rOStm, const OUString& ) const ; void ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString& ); diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index 2d162875c8ce..4b2d918c9bd5 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -130,7 +130,6 @@ class SVT_DLLPUBLIC SvTreeList final SvTreeList(const SvTreeList&) = delete; SvTreeList& operator= (const SvTreeList&) = delete; -protected: SvTreeListEntry* pRootItem; public: diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index c264585846e8..7fdee91520de 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -126,14 +126,9 @@ namespace accessibility ~AccessibleTextHelper(); - protected: + AccessibleTextHelper( const AccessibleTextHelper& ) = delete; + AccessibleTextHelper& operator= ( const AccessibleTextHelper& ) = delete; - // declared, but not defined - AccessibleTextHelper( const AccessibleTextHelper& ); - // declared, but not defined - AccessibleTextHelper& operator= ( const AccessibleTextHelper& ); - - public: /** Query the current edit source @attention This method returns by reference, so you are diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx index 7e21e384ed93..b2c80e3cac0b 100644 --- a/include/svx/ShapeTypeHandler.hxx +++ b/include/svx/ShapeTypeHandler.hxx @@ -140,7 +140,7 @@ public: const css::uno::Reference< css::drawing::XShape >& rxShape) throw (css::uno::RuntimeException, std::exception); -protected: +private: // Declare default constructor, copy constructor, destructor, and // assignment operation protected so that no one accidentally creates a // second instance of this singleton class or deletes it. @@ -153,7 +153,6 @@ protected: */ ~ShapeTypeHandler(); -private: /// Pointer to the only instance of this class. static ShapeTypeHandler* instance; diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index 478b9e1c1e84..467fafabbc9e 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -310,7 +310,7 @@ public: void SwitchToContext(const css::uno::Reference< css::sdbc::XResultSet >& xCursor, const OUString& strVisibleFields, const InterfaceArray& arrFields, sal_Int32 nFieldIndex); -protected: +private: void Init(const OUString& strVisibleFields); void SearchNextImpl(); @@ -319,7 +319,6 @@ protected: // start a thread-search (or call SearchNextImpl directly, depending on the search mode) void ImplStartNextSearch(); -private: SVX_DLLPRIVATE void clearControlTexts(); SVX_DLLPRIVATE void fillControlTexts(const InterfaceArray& arrFields); diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx index 64d15f9564bb..b474cae3377e 100644 --- a/include/svx/sdr/contact/displayinfo.hxx +++ b/include/svx/sdr/contact/displayinfo.hxx @@ -30,7 +30,6 @@ namespace sdr { class SVX_DLLPUBLIC DisplayInfo final { - protected: // The Layers which shall be processed (visible) SetOfByte maProcessLayers; diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx index fd00dad553a1..c251a7839f7a 100644 --- a/include/tools/ref.hxx +++ b/include/tools/ref.hxx @@ -99,7 +99,7 @@ public: bool operator ==(const SvRef<T> &rhs) const { return pObj == rhs.pObj; } bool operator !=(const SvRef<T> &rhs) const { return !(*this == rhs); } -protected: +private: T * pObj; }; diff --git a/include/tools/simplerm.hxx b/include/tools/simplerm.hxx index b670dab21a3d..28d008ed7e59 100644 --- a/include/tools/simplerm.hxx +++ b/include/tools/simplerm.hxx @@ -32,7 +32,6 @@ class InternalResMgr; class TOOLS_DLLPUBLIC SimpleResMgr final { -protected: osl::Mutex m_aAccessSafety; InternalResMgr* m_pResImpl; diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index fec0cdd04595..d8b8d16e0e60 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -98,8 +98,6 @@ private: SAL_DLLPRIVATE bool ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, Size rLogicDestSize ); -protected: - void Linker( OutputDevice* pOut, bool bLink ); public: diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 4798bf3ac653..23d6e694fa2a 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1423,6 +1423,7 @@ class VCL_DLLPUBLIC SolarMutexClearableGuard final SolarMutexClearableGuard( const SolarMutexClearableGuard& ) = delete; const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& ) = delete; bool m_bCleared; + comphelper::SolarMutex& m_solarMutex; public: /** Acquires mutex */ @@ -1451,9 +1452,6 @@ public: m_bCleared = true; } } - -protected: - comphelper::SolarMutex& m_solarMutex; }; class VCL_DLLPUBLIC SolarMutexResettableGuard final @@ -1461,6 +1459,7 @@ class VCL_DLLPUBLIC SolarMutexResettableGuard final SolarMutexResettableGuard( const SolarMutexResettableGuard& ) = delete; const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& ) = delete; bool m_bCleared; + comphelper::SolarMutex& m_solarMutex; public: /** Acquires mutex */ @@ -1499,9 +1498,6 @@ public: m_bCleared = false; } } - -protected: - comphelper::SolarMutex& m_solarMutex; }; namespace vcl diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx index 9d4b253403d9..420e6448127c 100644 --- a/include/xmloff/xmlnume.hxx +++ b/include/xmloff/xmlnume.hxx @@ -54,8 +54,6 @@ class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport final const css::uno::Sequence< css::beans::PropertyValue>& rProps, bool bOutline ); -protected: - SAL_DLLPRIVATE void exportStyle( const css::uno::Reference< css::style::XStyle >& rStyle ); SAL_DLLPRIVATE void exportOutline(); diff --git a/include/xmloff/xmltabe.hxx b/include/xmloff/xmltabe.hxx index 85c182df573f..3bdd0a368406 100644 --- a/include/xmloff/xmltabe.hxx +++ b/include/xmloff/xmltabe.hxx @@ -34,8 +34,6 @@ class SvxXMLTabStopExport final { SvXMLExport& rExport; // for access to document handler -protected: - void exportTabStop( const css::style::TabStop* pTabStop ); public: |