From 73e117d19a67c2a1ed2fa28aaee36f42759f0755 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 7 Feb 2015 12:14:42 +0100 Subject: loplugin:deletedspecial Change-Id: Ic3b744fe3eb3a07d7f5a7feeaf43cde2ec2b3241 --- forms/source/component/entrylisthelper.hxx | 5 ++--- forms/source/inc/FormComponent.hxx | 5 ++--- forms/source/inc/InterfaceContainer.hxx | 4 ++-- forms/source/inc/formcontrolfont.hxx | 5 ++--- forms/source/inc/formnavigation.hxx | 5 ++--- forms/source/inc/forms_module.hxx | 3 +-- forms/source/richtext/richtextengine.hxx | 5 ++--- forms/source/richtext/richtextmodel.hxx | 5 ++--- forms/source/richtext/richtextunowrapper.hxx | 10 ++++------ forms/source/richtext/rtattributehandler.hxx | 13 +++---------- forms/source/runtime/formoperations.hxx | 5 ++--- forms/source/xforms/datatyperepository.hxx | 4 ++-- forms/source/xforms/datatypes.hxx | 5 ++--- 13 files changed, 28 insertions(+), 46 deletions(-) diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index 1e3ddf7272c9..4722640901f4 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -174,9 +174,8 @@ namespace frm void impl_lock_refreshList( ControlModelLock& _rInstanceLock ); private: - OEntryListHelper(); // never implemented - OEntryListHelper( const OEntryListHelper& ); // never implemented - OEntryListHelper& operator=( const OEntryListHelper& ); // never implemented + OEntryListHelper( const OEntryListHelper& ) SAL_DELETED_FUNCTION; + OEntryListHelper& operator=( const OEntryListHelper& ) SAL_DELETED_FUNCTION; }; diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index fdd5c886ca91..91ecc23f7efb 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -144,9 +144,8 @@ namespace frm ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aNewValues; private: - ControlModelLock(); // never implemented - ControlModelLock( const ControlModelLock& ); // never implemented - ControlModelLock& operator=( const ControlModelLock& ); // never implemented + ControlModelLock( const ControlModelLock& ) SAL_DELETED_FUNCTION; + ControlModelLock& operator=( const ControlModelLock& ) SAL_DELETED_FUNCTION; }; diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 6d5ec45be1c1..5324ad2f3e11 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -72,8 +72,8 @@ namespace frm virtual ~ElementDescription(); private: - ElementDescription( const ElementDescription& ); // never implemented - ElementDescription& operator=( const ElementDescription& ); // never implemented + ElementDescription( const ElementDescription& ) SAL_DELETED_FUNCTION; + ElementDescription& operator=( const ElementDescription& ) SAL_DELETED_FUNCTION; }; typedef std::vector OInterfaceArray; diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx index 90663514b43a..047d1999a8fc 100644 --- a/forms/source/inc/formcontrolfont.hxx +++ b/forms/source/inc/formcontrolfont.hxx @@ -86,9 +86,8 @@ namespace frm private: private: - FontControlModel(); // never implemented - FontControlModel( const FontControlModel& ); // never implemented - FontControlModel& operator=( const FontControlModel& ); // never implemented + FontControlModel( const FontControlModel& ) SAL_DELETED_FUNCTION; + FontControlModel& operator=( const FontControlModel& ) SAL_DELETED_FUNCTION; }; diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index 6bd725fc2dbb..5e978ec37935 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -213,9 +213,8 @@ namespace frm sal_Int16 getFeatureId( const OUString& _rCompleteURL ); private: - OFormNavigationMapper( ); // never implemented - OFormNavigationMapper( const OFormNavigationMapper& ); // never implemented - OFormNavigationMapper& operator=( const OFormNavigationMapper& ); // never implemented + OFormNavigationMapper( const OFormNavigationMapper& ) SAL_DELETED_FUNCTION; + OFormNavigationMapper& operator=( const OFormNavigationMapper& ) SAL_DELETED_FUNCTION; }; diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx index 4cda7a0554c0..4dd4a6196d38 100644 --- a/forms/source/inc/forms_module.hxx +++ b/forms/source/inc/forms_module.hxx @@ -52,8 +52,7 @@ namespace FORMS_MODULE_NAMESPACE class OFormsModule { private: - OFormsModule(); - // not implemented. OFormsModule is a static class + OFormsModule() SAL_DELETED_FUNCTION; //TODO: get rid of this class protected: // auto registration administration diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx index c0ff8bd140b9..3c32ece9c9c5 100644 --- a/forms/source/richtext/richtextengine.hxx +++ b/forms/source/richtext/richtextengine.hxx @@ -63,9 +63,8 @@ namespace frm RichTextEngine( SfxItemPool* _pPool ); private: - RichTextEngine( ); // never implemented - RichTextEngine( const RichTextEngine& ); // never implemented - RichTextEngine& operator=( const RichTextEngine& ); // never implemented + RichTextEngine( const RichTextEngine& ) SAL_DELETED_FUNCTION; + RichTextEngine& operator=( const RichTextEngine& ) SAL_DELETED_FUNCTION; private: DECL_LINK( EditEngineStatusChanged, EditStatus* ); diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index f64d22b34332..5967366d4644 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -171,9 +171,8 @@ namespace frm static ::com::sun::star::uno::Sequence< sal_Int8 > getEditEngineTunnelId(); private: - ORichTextModel(); // never implemented - ORichTextModel( const ORichTextModel& ); // never implemented - ORichTextModel& operator=( const ORichTextModel& ); // never implemented + ORichTextModel( const ORichTextModel& ) SAL_DELETED_FUNCTION; + ORichTextModel& operator=( const ORichTextModel& ) SAL_DELETED_FUNCTION; }; diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx index 73d185c181e3..f2973a842bf1 100644 --- a/forms/source/richtext/richtextunowrapper.hxx +++ b/forms/source/richtext/richtextunowrapper.hxx @@ -46,9 +46,8 @@ namespace frm private: - ORichTextUnoWrapper(); // never implemented - ORichTextUnoWrapper( const ORichTextUnoWrapper& ); // never implemented - ORichTextUnoWrapper& operator=( const ORichTextUnoWrapper& ); // never implemented + ORichTextUnoWrapper( const ORichTextUnoWrapper& ) SAL_DELETED_FUNCTION; + ORichTextUnoWrapper& operator=( const ORichTextUnoWrapper& ) SAL_DELETED_FUNCTION; }; class RichTextEditSource : public SvxEditSource @@ -70,9 +69,8 @@ namespace frm virtual ~RichTextEditSource(); private: - RichTextEditSource( ); // never implemented - RichTextEditSource( const RichTextEditSource& _rSource ); // never implemented - RichTextEditSource& operator=( const RichTextEditSource& ); // never implemented + RichTextEditSource( const RichTextEditSource& _rSource ) SAL_DELETED_FUNCTION; + RichTextEditSource& operator=( const RichTextEditSource& ) SAL_DELETED_FUNCTION; }; diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx index 881ec2d2ed8f..28a17ccbb2f1 100644 --- a/forms/source/richtext/rtattributehandler.hxx +++ b/forms/source/richtext/rtattributehandler.hxx @@ -76,17 +76,10 @@ namespace frm virtual ~AttributeHandler(); }; - class AttributeHandlerFactory + namespace AttributeHandlerFactory { - public: - static ::rtl::Reference< IAttributeHandler > getHandlerFor( AttributeId _nAttributeId, const SfxItemPool& _rEditEnginePool ); - - private: - AttributeHandlerFactory(); // never implemented - AttributeHandlerFactory( const AttributeHandlerFactory& ); // never implemented - AttributeHandlerFactory& operator=( const AttributeHandlerFactory& ); // never implemented - ~AttributeHandlerFactory(); // never implemented - }; + ::rtl::Reference< IAttributeHandler > getHandlerFor( AttributeId _nAttributeId, const SfxItemPool& _rEditEnginePool ); + } class ParaAlignmentHandler : public AttributeHandler { diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index a884de9542b8..7c3e604bc98e 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -345,9 +345,8 @@ namespace frm }; private: - FormOperations(); // never implemented - FormOperations( const FormOperations& ); // never implemented - FormOperations& operator=( const FormOperations& ); // never implemented + FormOperations( const FormOperations& ) SAL_DELETED_FUNCTION; + FormOperations& operator=( const FormOperations& ) SAL_DELETED_FUNCTION; public: class MethodGuard diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx index 33d95dc466e3..0158c15f403c 100644 --- a/forms/source/xforms/datatyperepository.hxx +++ b/forms/source/xforms/datatyperepository.hxx @@ -68,8 +68,8 @@ namespace xforms virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - ODataTypeRepository( const ODataTypeRepository& ); // never implemented - ODataTypeRepository& operator=( const ODataTypeRepository& ); // never implemented + ODataTypeRepository( const ODataTypeRepository& ) SAL_DELETED_FUNCTION; + ODataTypeRepository& operator=( const ODataTypeRepository& ) SAL_DELETED_FUNCTION; private: /** locates the type with the given name in our repository, or throws an exception if there is no such type diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index d881300c4954..848ff75e5dac 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -74,9 +74,8 @@ namespace xforms getName() const { return m_sName; } private: - OXSDDataType( ); // never implemented - OXSDDataType( const OXSDDataType& ); // never implemented - OXSDDataType& operator=( const OXSDDataType& ); // never implemented + OXSDDataType( const OXSDDataType& ) SAL_DELETED_FUNCTION; + OXSDDataType& operator=( const OXSDDataType& ) SAL_DELETED_FUNCTION; protected: // create basic data type -- cgit