[Libreoffice-commits] core.git: include/codemaker include/comphelper
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Oct 29 06:06:43 UTC 2019
include/codemaker/typemanager.hxx | 2 +-
include/comphelper/ChainablePropertySetInfo.hxx | 2 +-
include/comphelper/DisableInteractionHelper.hxx | 2 +-
include/comphelper/MasterPropertySetInfo.hxx | 2 +-
include/comphelper/anycompare.hxx | 12 ++++++------
include/comphelper/asyncnotification.hxx | 6 +++---
include/comphelper/attributelist.hxx | 2 +-
include/comphelper/docpasswordrequest.hxx | 4 ++--
include/comphelper/enumhelper.hxx | 6 +++---
include/comphelper/evtlistenerhlp.hxx | 2 +-
include/comphelper/interaction.hxx | 2 +-
include/comphelper/listenernotification.hxx | 4 ++--
include/comphelper/numberedcollection.hxx | 2 +-
include/comphelper/oslfile2streamwrap.hxx | 4 ++--
include/comphelper/parallelsort.hxx | 2 +-
include/comphelper/propertybag.hxx | 2 +-
include/comphelper/propertysetinfo.hxx | 2 +-
include/comphelper/refcountedmutex.hxx | 2 +-
include/comphelper/seekableinput.hxx | 2 +-
include/comphelper/seqstream.hxx | 4 ++--
include/comphelper/servicedecl.hxx | 4 ++--
include/comphelper/simplefileaccessinteraction.hxx | 2 +-
include/comphelper/stillreadwriteinteraction.hxx | 2 +-
include/comphelper/unique_disposing_ptr.hxx | 2 +-
include/comphelper/weakeventlistener.hxx | 4 ++--
25 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit 13532e63e715ab2bfd1a8040bec6f700fbfa6250
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Oct 28 21:01:40 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Oct 29 07:05:53 2019 +0100
loplugin:finalclass in comphelper
Change-Id: Ic64151191e46dff81c0a5cb8377f89e1e4afb269
Reviewed-on: https://gerrit.libreoffice.org/81624
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/codemaker/typemanager.hxx b/include/codemaker/typemanager.hxx
index 3227393edb6e..5a2d50ec0d90 100644
--- a/include/codemaker/typemanager.hxx
+++ b/include/codemaker/typemanager.hxx
@@ -38,7 +38,7 @@ namespace unoidl {
class Provider;
}
-class TypeManager: public salhelper::SimpleReferenceObject {
+class TypeManager final : public salhelper::SimpleReferenceObject {
public:
TypeManager();
diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx
index 16bfced1376b..e35c534e7b0c 100644
--- a/include/comphelper/ChainablePropertySetInfo.hxx
+++ b/include/comphelper/ChainablePropertySetInfo.hxx
@@ -36,7 +36,7 @@ namespace comphelper
// workaround for incremental linking bugs in MSVC2015
class SAL_DLLPUBLIC_TEMPLATE ChainablePropertySetInfo_Base : public cppu::WeakImplHelper< css::beans::XPropertySetInfo > {};
- class COMPHELPER_DLLPUBLIC ChainablePropertySetInfo : public ChainablePropertySetInfo_Base
+ class COMPHELPER_DLLPUBLIC ChainablePropertySetInfo final : public ChainablePropertySetInfo_Base
{
public:
ChainablePropertySetInfo( PropertyInfo const * pMap );
diff --git a/include/comphelper/DisableInteractionHelper.hxx b/include/comphelper/DisableInteractionHelper.hxx
index c24fdeee40e2..3082a1406dfe 100644
--- a/include/comphelper/DisableInteractionHelper.hxx
+++ b/include/comphelper/DisableInteractionHelper.hxx
@@ -15,7 +15,7 @@
namespace comphelper
{
-class NoEnableJavaInteractionContext : public cppu::WeakImplHelper<css::uno::XCurrentContext>
+class NoEnableJavaInteractionContext final : public cppu::WeakImplHelper<css::uno::XCurrentContext>
{
public:
explicit NoEnableJavaInteractionContext(
diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx
index 8559b2e2fd45..3293ee76483a 100644
--- a/include/comphelper/MasterPropertySetInfo.hxx
+++ b/include/comphelper/MasterPropertySetInfo.hxx
@@ -29,7 +29,7 @@ namespace comphelper
// workaround for incremental linking bugs in MSVC2015
class SAL_DLLPUBLIC_TEMPLATE MasterPropertySetInfo_Base : public cppu::WeakImplHelper< css::beans::XPropertySetInfo > {};
- class COMPHELPER_DLLPUBLIC MasterPropertySetInfo : public MasterPropertySetInfo_Base
+ class COMPHELPER_DLLPUBLIC MasterPropertySetInfo final : public MasterPropertySetInfo_Base
{
public:
MasterPropertySetInfo( PropertyInfo const * pMap );
diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx
index 8b5a941a781c..782c7f19951f 100644
--- a/include/comphelper/anycompare.hxx
+++ b/include/comphelper/anycompare.hxx
@@ -66,7 +66,7 @@ namespace comphelper
//= ScalarPredicateLess
template< typename SCALAR >
- class ScalarPredicateLess : public IKeyPredicateLess
+ class ScalarPredicateLess final : public IKeyPredicateLess
{
public:
virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const override
@@ -83,7 +83,7 @@ namespace comphelper
//= StringPredicateLess
- class StringPredicateLess : public IKeyPredicateLess
+ class StringPredicateLess final : public IKeyPredicateLess
{
public:
virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const override
@@ -100,7 +100,7 @@ namespace comphelper
//= StringCollationPredicateLess
- class StringCollationPredicateLess : public IKeyPredicateLess
+ class StringCollationPredicateLess final : public IKeyPredicateLess
{
public:
StringCollationPredicateLess( css::uno::Reference< css::i18n::XCollator > const & i_collator )
@@ -125,7 +125,7 @@ namespace comphelper
//= TypePredicateLess
- class TypePredicateLess : public IKeyPredicateLess
+ class TypePredicateLess final : public IKeyPredicateLess
{
public:
virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const override
@@ -142,7 +142,7 @@ namespace comphelper
//= EnumPredicateLess
- class EnumPredicateLess : public IKeyPredicateLess
+ class EnumPredicateLess final : public IKeyPredicateLess
{
public:
EnumPredicateLess( css::uno::Type const & _enumType )
@@ -169,7 +169,7 @@ namespace comphelper
//= InterfacePredicateLess
- class InterfacePredicateLess : public IKeyPredicateLess
+ class InterfacePredicateLess final : public IKeyPredicateLess
{
public:
virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const override
diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx
index 9eb61c4c50c9..2daac286bf09 100644
--- a/include/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
@@ -141,7 +141,7 @@ namespace comphelper
/** This class is usable with rtl::Reference.
As always, the thread must be joined somewhere.
*/
- class COMPHELPER_DLLPUBLIC AsyncEventNotifier
+ class COMPHELPER_DLLPUBLIC AsyncEventNotifier final
: public AsyncEventNotifierBase
, public salhelper::Thread
{
@@ -165,7 +165,7 @@ namespace comphelper
/** This is a hack (when proper joining is not possible), use of which
should be avoided by good design.
*/
- class COMPHELPER_DLLPUBLIC AsyncEventNotifierAutoJoin
+ class COMPHELPER_DLLPUBLIC AsyncEventNotifierAutoJoin final
: public AsyncEventNotifierBase
, private osl::Thread
{
@@ -198,7 +198,7 @@ namespace comphelper
/** AnyEvent derivee holding a foreign event instance
*/
template < typename EVENT_OBJECT >
- class SAL_DLLPUBLIC_RTTI EventHolder : public AnyEvent
+ class SAL_DLLPUBLIC_RTTI EventHolder final : public AnyEvent
{
public:
typedef EVENT_OBJECT EventObjectType;
diff --git a/include/comphelper/attributelist.hxx b/include/comphelper/attributelist.hxx
index 8d9248fd57c2..0309ab60855e 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -40,7 +40,7 @@ struct TagAttribute
OUString sValue;
};
-class COMPHELPER_DLLPUBLIC AttributeList :
+class COMPHELPER_DLLPUBLIC AttributeList final :
public ::cppu::WeakImplHelper<css::xml::sax::XAttributeList, css::util::XCloneable>
{
std::vector<TagAttribute> mAttributes;
diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index 31b49bb09c72..4f1d034e2eb6 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -41,7 +41,7 @@ enum class DocPasswordRequestType
};
-class COMPHELPER_DLLPUBLIC SimplePasswordRequest :
+class COMPHELPER_DLLPUBLIC SimplePasswordRequest final :
public cppu::WeakImplHelper<css::task::XInteractionRequest>
{
public:
@@ -70,7 +70,7 @@ private:
/** Implements the task.XInteractionRequest interface for requesting a password
string for a document.
*/
-class COMPHELPER_DLLPUBLIC DocPasswordRequest :
+class COMPHELPER_DLLPUBLIC DocPasswordRequest final :
public cppu::WeakImplHelper<css::task::XInteractionRequest>
{
public:
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index 7612ecb5fc43..c9816cd3e055 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -41,7 +41,7 @@ struct OEnumerationLock
/** provides a com.sun.star.container::XEnumeration access based
on an object implementing the com.sun.star.container::XNameAccess interface
*/
-class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
+class COMPHELPER_DLLPUBLIC OEnumerationByName final : private OEnumerationLock
, public ::cppu::WeakImplHelper< css::container::XEnumeration ,
css::lang::XEventListener >
{
@@ -69,7 +69,7 @@ private:
/** provides a com.sun.star.container::XEnumeration access based
on an object implementing the com.sun.star.container::XNameAccess interface
*/
-class COMPHELPER_DLLPUBLIC OEnumerationByIndex : private OEnumerationLock
+class COMPHELPER_DLLPUBLIC OEnumerationByIndex final : private OEnumerationLock
, public ::cppu::WeakImplHelper< css::container::XEnumeration ,
css::lang::XEventListener >
{
@@ -99,7 +99,7 @@ class SAL_DLLPUBLIC_TEMPLATE OAnyEnumeration_BASE
for an outside set vector of Any's.
*/
-class COMPHELPER_DLLPUBLIC OAnyEnumeration : private OEnumerationLock
+class COMPHELPER_DLLPUBLIC OAnyEnumeration final : private OEnumerationLock
, public OAnyEnumeration_BASE
{
sal_Int32 m_nPos;
diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx
index 004ceb9def23..5e99461e8cc3 100644
--- a/include/comphelper/evtlistenerhlp.hxx
+++ b/include/comphelper/evtlistenerhlp.hxx
@@ -33,7 +33,7 @@ namespace comphelper
// is helper class to avoid a cycle in refcount between the XEventListener
// and the member XComponent
- class COMPHELPER_DLLPUBLIC OEventListenerHelper : public ::cppu::WeakImplHelper< css::lang::XEventListener >
+ class COMPHELPER_DLLPUBLIC OEventListenerHelper final : public ::cppu::WeakImplHelper< css::lang::XEventListener >
{
css::uno::WeakReference< css::lang::XEventListener> m_xListener;
public:
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index be22d4254983..3c4074eafeb9 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -91,7 +91,7 @@ namespace comphelper
/** implements an interaction request (com.sun.star.task::XInteractionRequest)<p/>
at run time, you can freely add any interaction continuation objects
*/
- class COMPHELPER_DLLPUBLIC OInteractionRequest : public OInteractionRequest_Base
+ class COMPHELPER_DLLPUBLIC OInteractionRequest final : public OInteractionRequest_Base
{
css::uno::Any const
m_aRequest; /// the request we represent
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index 88c2b8ef979b..ba52983f86af 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -153,7 +153,7 @@ namespace comphelper
the event type to notify, e.g. css::lang::EventObject
*/
template< class LISTENER, class EVENT >
- class OSimpleListenerContainer : protected OListenerContainer
+ class OSimpleListenerContainer final : protected OListenerContainer
{
public:
typedef LISTENER ListenerClass;
@@ -189,7 +189,7 @@ namespace comphelper
/// typed notification
inline void notify( const EventClass& _rEvent, NotificationMethod _pNotify );
- protected:
+ private:
virtual bool implNotify(
const css::uno::Reference< css::lang::XEventListener >& _rxListener,
const css::lang::EventObject& _rEvent
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 06cfaa1c08d2..f2a9d0b3277a 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -44,7 +44,7 @@ namespace comphelper{
@threadsafe
*/
-class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
+class COMPHELPER_DLLPUBLIC NumberedCollection final : private ::cppu::BaseMutex
, public ::cppu::WeakImplHelper< css::frame::XUntitledNumbers >
{
diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx
index d365df6ccb12..a7393b411ac7 100644
--- a/include/comphelper/oslfile2streamwrap.hxx
+++ b/include/comphelper/oslfile2streamwrap.hxx
@@ -32,7 +32,7 @@ namespace comphelper
// Stream to read and write data, based on File
-class OSLInputStreamWrapper : public ::cppu::WeakImplHelper<css::io::XInputStream>
+class OSLInputStreamWrapper final : public ::cppu::WeakImplHelper<css::io::XInputStream>
{
public:
COMPHELPER_DLLPUBLIC OSLInputStreamWrapper(::osl::File& _rStream);
@@ -54,7 +54,7 @@ private:
// data sink for the files
-class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper<css::io::XOutputStream>
+class OSLOutputStreamWrapper final : public ::cppu::WeakImplHelper<css::io::XOutputStream>
{
public:
COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper(::osl::File& _rFile);
diff --git a/include/comphelper/parallelsort.hxx b/include/comphelper/parallelsort.hxx
index fc77bdeea669..d10519cf83ca 100644
--- a/include/comphelper/parallelsort.hxx
+++ b/include/comphelper/parallelsort.hxx
@@ -93,7 +93,7 @@ private:
class ParallelRunner
{
- class Executor : public comphelper::ThreadTask
+ class Executor final : public comphelper::ThreadTask
{
public:
Executor(const std::shared_ptr<comphelper::ThreadTaskTag>& rTag,
diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx
index dcca91db86dd..337bf4da4e5f 100644
--- a/include/comphelper/propertybag.hxx
+++ b/include/comphelper/propertybag.hxx
@@ -39,7 +39,7 @@ namespace comphelper
This class can, for instance, be used for components which need to implement
the com.sun.star.beans.PropertyBag service.
*/
- class COMPHELPER_DLLPUBLIC PropertyBag : protected OPropertyContainerHelper
+ class COMPHELPER_DLLPUBLIC PropertyBag final : protected OPropertyContainerHelper
{
private:
::std::unique_ptr< PropertyBag_Impl > m_pImpl;
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index 84a9a28d18ab..ee413ac51611 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -87,7 +87,7 @@ class SAL_DLLPUBLIC_TEMPLATE PropertySetInfo_BASE
/** this class implements a XPropertySetInfo that is initialized with arrays of PropertyMapEntry.
It is used by the class PropertySetHelper.
*/
-class COMPHELPER_DLLPUBLIC PropertySetInfo
+class COMPHELPER_DLLPUBLIC PropertySetInfo final
: public PropertySetInfo_BASE
{
private:
diff --git a/include/comphelper/refcountedmutex.hxx b/include/comphelper/refcountedmutex.hxx
index d7eb1a43b51a..cda0c981890a 100644
--- a/include/comphelper/refcountedmutex.hxx
+++ b/include/comphelper/refcountedmutex.hxx
@@ -27,7 +27,7 @@
namespace comphelper
{
-class COMPHELPER_DLLPUBLIC RefCountedMutex : public salhelper::SimpleReferenceObject
+class COMPHELPER_DLLPUBLIC RefCountedMutex final : public salhelper::SimpleReferenceObject
{
osl::Mutex m_aMutex;
public:
diff --git a/include/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx
index 54e2aa884cca..5ab241071a70 100644
--- a/include/comphelper/seekableinput.hxx
+++ b/include/comphelper/seekableinput.hxx
@@ -36,7 +36,7 @@ class SAL_DLLPUBLIC_TEMPLATE OSeekableInputWrapper_BASE
css::io::XSeekable >
{};
-class COMPHELPER_DLLPUBLIC OSeekableInputWrapper
+class COMPHELPER_DLLPUBLIC OSeekableInputWrapper final
: public OSeekableInputWrapper_BASE
{
::osl::Mutex m_aMutex;
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index 656b2a25899e..d515b0fe4b7c 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -35,8 +35,8 @@ namespace comphelper
// stream for reading data from a sequence of bytes
-class COMPHELPER_DLLPUBLIC SequenceInputStream
-: public ::cppu::WeakImplHelper< css::io::XInputStream, css::io::XSeekable >
+class COMPHELPER_DLLPUBLIC SequenceInputStream final
+ : public ::cppu::WeakImplHelper< css::io::XInputStream, css::io::XSeekable >
{
::osl::Mutex m_aMutex;
css::uno::Sequence<sal_Int8> const m_aData;
diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index 8594d36f1658..01c4d29c8992 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -177,7 +177,7 @@ private:
};
template <typename ImplT>
-class ServiceImpl : public OwnServiceImpl< ::cppu::ImplInheritanceHelper<ImplT,css::lang::XServiceInfo> >
+class ServiceImpl final : public OwnServiceImpl< ::cppu::ImplInheritanceHelper<ImplT,css::lang::XServiceInfo> >
{
typedef OwnServiceImpl< ::cppu::ImplInheritanceHelper<ImplT,css::lang::XServiceInfo> > ServiceImpl_BASE;
public:
@@ -193,7 +193,7 @@ public:
};
template <typename ImplT>
-class InheritingServiceImpl : public OwnServiceImpl< ImplT >
+class InheritingServiceImpl final : public OwnServiceImpl< ImplT >
{
typedef OwnServiceImpl< ImplT > ServiceImpl_BASE;
public:
diff --git a/include/comphelper/simplefileaccessinteraction.hxx b/include/comphelper/simplefileaccessinteraction.hxx
index 78705d8724b3..503b70e99c3d 100644
--- a/include/comphelper/simplefileaccessinteraction.hxx
+++ b/include/comphelper/simplefileaccessinteraction.hxx
@@ -33,7 +33,7 @@ namespace comphelper {
It will be used for Certificate Validation dialog or authentication dialog.
The authentication is used in Web/DAV access when the server requests credentials to be accessed.
*/
-class COMPHELPER_DLLPUBLIC SimpleFileAccessInteraction : public ::ucbhelper::InterceptedInteraction
+class COMPHELPER_DLLPUBLIC SimpleFileAccessInteraction final : public ::ucbhelper::InterceptedInteraction
{
public:
diff --git a/include/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx
index 6bd1d8c6f744..efa5436c2dc5 100644
--- a/include/comphelper/stillreadwriteinteraction.hxx
+++ b/include/comphelper/stillreadwriteinteraction.hxx
@@ -29,7 +29,7 @@ namespace com::sun::star::task { class XInteractionRequest; }
namespace comphelper{
-class COMPHELPER_DLLPUBLIC StillReadWriteInteraction : public ::ucbhelper::InterceptedInteraction
+class COMPHELPER_DLLPUBLIC StillReadWriteInteraction final : public ::ucbhelper::InterceptedInteraction
{
private:
static const sal_Int32 HANDLE_INTERACTIVEIOEXCEPTION = 0;
diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx
index 2c09d05eb447..7bed79c43110 100644
--- a/include/comphelper/unique_disposing_ptr.hxx
+++ b/include/comphelper/unique_disposing_ptr.hxx
@@ -68,7 +68,7 @@ public:
reset();
}
private:
- class TerminateListener : public ::cppu::WeakImplHelper< css::frame::XTerminateListener,
+ class TerminateListener final : public ::cppu::WeakImplHelper< css::frame::XTerminateListener,
css::lang::XServiceInfo>
{
private:
diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx
index ffe367bbfea0..a39c0d0c9c70 100644
--- a/include/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
@@ -132,7 +132,7 @@ namespace comphelper
> OWeakEventListenerAdapter_Base;
/** the most simple listener adapter: for XEventListeners at XComponents
*/
- class COMPHELPER_DLLPUBLIC OWeakEventListenerAdapter : public OWeakEventListenerAdapter_Base
+ class COMPHELPER_DLLPUBLIC OWeakEventListenerAdapter final : public OWeakEventListenerAdapter_Base
{
public:
OWeakEventListenerAdapter(
@@ -143,7 +143,7 @@ namespace comphelper
// nothing to do except an own ctor - the forwarding of the "disposing" is already done
// in the base class
- protected:
+ private:
using OWeakEventListenerAdapter_Base::disposing;
virtual void SAL_CALL disposing( ) override;
};
More information about the Libreoffice-commits
mailing list