[Libreoffice-commits] core.git: comphelper/source include/comphelper
Noel Grandin
noel.grandin at collabora.co.uk
Thu Nov 9 14:15:07 UTC 2017
comphelper/source/misc/serviceinfohelper.cxx | 13 -------------
comphelper/source/property/opropertybag.hxx | 6 ++----
include/comphelper/accessiblekeybindinghelper.hxx | 5 +----
include/comphelper/propagg.hxx | 5 ++---
include/comphelper/seqstream.hxx | 4 +---
include/comphelper/serviceinfohelper.hxx | 18 ++++--------------
6 files changed, 10 insertions(+), 41 deletions(-)
New commits:
commit 82ccc1a02ed3d423552c4c3a58dfb4a23a9942ae
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Nov 7 11:16:22 2017 +0200
loplugin:finalclasses in comphelper
convert ServiceInfoHelper to a namespace, since the only usage is to
call it's static method
Change-Id: I908bdbc06cbdb6b72ee1ae469ff207b2fca69963
Reviewed-on: https://gerrit.libreoffice.org/44533
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx
index 87f4c343c3f9..8e70ebcc142d 100644
--- a/comphelper/source/misc/serviceinfohelper.cxx
+++ b/comphelper/source/misc/serviceinfohelper.cxx
@@ -25,19 +25,6 @@
namespace comphelper
{
-/** returns an empty UString(). most times sufficient */
-OUString SAL_CALL ServiceInfoHelper::getImplementationName()
-{
- return OUString();
-}
-
-/** the base implementation has no supported services */
-css::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames()
-{
- css::uno::Sequence< OUString> aSeq(0);
- return aSeq;
-}
-
/** this method adds a variable number of OUString to a given Sequence
*/
void ServiceInfoHelper::addToSequence( css::uno::Sequence< OUString >& rSeq, std::initializer_list<OUString> services ) throw()
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 95736d7923db..956657a33910 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -66,7 +66,7 @@ namespace comphelper
> OPropertyBag_Base;
typedef ::comphelper::OPropertyStateHelper OPropertyBag_PBase;
- class OPropertyBag :public ::comphelper::OMutexAndBroadcastHelper // must be before OPropertyBag_PBase
+ class OPropertyBag final : public ::comphelper::OMutexAndBroadcastHelper // must be before OPropertyBag_PBase
,public OPropertyBag_PBase
,public OPropertyBag_Base
,public ::cppu::IEventNotificationHook
@@ -94,7 +94,7 @@ namespace comphelper
OPropertyBag();
virtual ~OPropertyBag() override;
- protected:
+ private:
DECLARE_XINTERFACE()
DECLARE_XTYPEPROVIDER()
@@ -177,7 +177,6 @@ namespace comphelper
void SAL_CALL setModifiedImpl( bool bModified,
bool bIgnoreRuntimeExceptionsWhileFiring);
- private:
/** finds a free property handle
@precond
our mutex is locked
@@ -210,7 +209,6 @@ namespace comphelper
*/
void impl_setPropertyValues_throw( const css::uno::Sequence< css::beans::PropertyValue >& _rProps );
- protected:
using ::cppu::OPropertySetHelper::getPropertyValues;
using ::cppu::OPropertySetHelper::setPropertyValues;
using ::cppu::OPropertySetHelper::getFastPropertyValue;
diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx
index 9710bb0d1192..4de48bf3ec39 100644
--- a/include/comphelper/accessiblekeybindinghelper.hxx
+++ b/include/comphelper/accessiblekeybindinghelper.hxx
@@ -41,14 +41,11 @@ namespace comphelper
/** a helper class for implementing an accessible keybinding
*/
- class COMPHELPER_DLLPUBLIC OAccessibleKeyBindingHelper : public OAccessibleKeyBindingHelper_Base
+ class COMPHELPER_DLLPUBLIC OAccessibleKeyBindingHelper final : public OAccessibleKeyBindingHelper_Base
{
private:
typedef ::std::vector< css::uno::Sequence< css::awt::KeyStroke > > KeyBindings;
-
KeyBindings m_aKeyBindings;
-
- protected:
::osl::Mutex m_aMutex;
virtual ~OAccessibleKeyBindingHelper() override;
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index c1e521f3ee67..67cabd5c6402 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -86,10 +86,9 @@ protected:
#define DEFAULT_AGGREGATE_PROPERTY_ID 10000
-class COMPHELPER_DLLPUBLIC OPropertyArrayAggregationHelper: public ::cppu::IPropertyArrayHelper
+class COMPHELPER_DLLPUBLIC OPropertyArrayAggregationHelper final : public ::cppu::IPropertyArrayHelper
{
friend class OPropertySetAggregationHelper;
-protected:
std::vector<css::beans::Property> m_aProperties;
internal::PropertyAccessorMap m_aPropertyAccessors;
@@ -176,7 +175,7 @@ public:
*/
PropertyOrigin classifyProperty( const OUString& _rName );
-protected:
+private:
const css::beans::Property* findPropertyByName(const OUString& _rName) const;
};
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index ae7502f776e4..998c4a099d93 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -69,11 +69,10 @@ class SAL_DLLPUBLIC_TEMPLATE OSequenceOutputStream_Base
: public ::cppu::WeakImplHelper< css::io::XOutputStream >
{};
-class COMPHELPER_DLLPUBLIC OSequenceOutputStream : public OSequenceOutputStream_Base
+class COMPHELPER_DLLPUBLIC OSequenceOutputStream final : public OSequenceOutputStream_Base
{
private:
void finalizeOutput();
-protected:
css::uno::Sequence< sal_Int8 >& m_rSequence;
double m_nResizeFactor;
sal_Int32 m_nMinimumResize;
@@ -86,7 +85,6 @@ protected:
::osl::Mutex m_aMutex;
-protected:
virtual ~OSequenceOutputStream() override { if (m_bConnected) finalizeOutput(); }
public:
diff --git a/include/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx
index 527c09bbe75a..0e0e619e6440 100644
--- a/include/comphelper/serviceinfohelper.hxx
+++ b/include/comphelper/serviceinfohelper.hxx
@@ -29,24 +29,14 @@
namespace comphelper {
-/** this class provides a basic helper for classes supporting the XServiceInfo Interface.
+/** This class provides a basic helper for classes supporting the XServiceInfo Interface.
*
- * you can override the <code>getSupprotedServiceNames</code> to implement a XServiceInfo.
- * you can use the static helper methods to combine your services with that of parent
+ * You can use the static helper methods to combine your services with that of parent
* or aggregated classes.
*/
-class COMPHELPER_DLLPUBLIC ServiceInfoHelper : public css::lang::XServiceInfo
+namespace ServiceInfoHelper
{
-public:
- // XServiceInfo
- virtual OUString SAL_CALL getImplementationName() override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
- // helper
- static void addToSequence( css::uno::Sequence< OUString >& rSeq, std::initializer_list<OUString> services ) throw();
-
-protected:
- ~ServiceInfoHelper() {}
+ COMPHELPER_DLLPUBLIC void addToSequence( css::uno::Sequence< OUString >& rSeq, std::initializer_list<OUString> services ) throw();
};
}
More information about the Libreoffice-commits
mailing list