summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 15:25:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:26 +0200
commitbff4c13475957863bfa7da5bc3bcf82a64a7503a (patch)
tree23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /forms
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/entrylisthelper.hxx4
-rw-r--r--forms/source/inc/FormComponent.hxx4
-rw-r--r--forms/source/inc/InterfaceContainer.hxx4
-rw-r--r--forms/source/inc/formcontrolfont.hxx4
-rw-r--r--forms/source/inc/formnavigation.hxx4
-rw-r--r--forms/source/richtext/richtextengine.hxx4
-rw-r--r--forms/source/richtext/richtextmodel.hxx4
-rw-r--r--forms/source/richtext/richtextunowrapper.hxx8
-rw-r--r--forms/source/runtime/formoperations.hxx4
-rw-r--r--forms/source/xforms/datatyperepository.hxx4
-rw-r--r--forms/source/xforms/datatypes.hxx4
11 files changed, 24 insertions, 24 deletions
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index b9569936be29..f6588a2c87ea 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -172,8 +172,8 @@ namespace frm
void impl_lock_refreshList( ControlModelLock& _rInstanceLock );
private:
- OEntryListHelper( const OEntryListHelper& ) SAL_DELETED_FUNCTION;
- OEntryListHelper& operator=( const OEntryListHelper& ) SAL_DELETED_FUNCTION;
+ OEntryListHelper( const OEntryListHelper& ) = delete;
+ OEntryListHelper& operator=( const OEntryListHelper& ) = delete;
};
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 7b77af450594..88ec9502803d 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -139,8 +139,8 @@ namespace frm
css::uno::Sequence< css::uno::Any > m_aNewValues;
private:
- ControlModelLock( const ControlModelLock& ) SAL_DELETED_FUNCTION;
- ControlModelLock& operator=( const ControlModelLock& ) SAL_DELETED_FUNCTION;
+ ControlModelLock( const ControlModelLock& ) = delete;
+ ControlModelLock& operator=( const ControlModelLock& ) = delete;
};
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 131d0ba9877d..96a5d1717d89 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& ) SAL_DELETED_FUNCTION;
- ElementDescription& operator=( const ElementDescription& ) SAL_DELETED_FUNCTION;
+ ElementDescription( const ElementDescription& ) = delete;
+ ElementDescription& operator=( const ElementDescription& ) = delete;
};
typedef std::vector<css::uno::Reference<css::uno::XInterface>> OInterfaceArray;
diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx
index b0f544ad4a8b..6999c7ef5bc2 100644
--- a/forms/source/inc/formcontrolfont.hxx
+++ b/forms/source/inc/formcontrolfont.hxx
@@ -85,8 +85,8 @@ namespace frm
private:
private:
- FontControlModel( const FontControlModel& ) SAL_DELETED_FUNCTION;
- FontControlModel& operator=( const FontControlModel& ) SAL_DELETED_FUNCTION;
+ FontControlModel( const FontControlModel& ) = delete;
+ FontControlModel& operator=( const FontControlModel& ) = delete;
};
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index 0e6db22e34d3..2981955519d0 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -209,8 +209,8 @@ namespace frm
static sal_Int16 getFeatureId( const OUString& _rCompleteURL );
private:
- OFormNavigationMapper( const OFormNavigationMapper& ) SAL_DELETED_FUNCTION;
- OFormNavigationMapper& operator=( const OFormNavigationMapper& ) SAL_DELETED_FUNCTION;
+ OFormNavigationMapper( const OFormNavigationMapper& ) = delete;
+ OFormNavigationMapper& operator=( const OFormNavigationMapper& ) = delete;
};
diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx
index 528a2d37e3a2..e2beb7fc35c9 100644
--- a/forms/source/richtext/richtextengine.hxx
+++ b/forms/source/richtext/richtextengine.hxx
@@ -63,8 +63,8 @@ namespace frm
explicit RichTextEngine( SfxItemPool* _pPool );
private:
- RichTextEngine( const RichTextEngine& ) SAL_DELETED_FUNCTION;
- RichTextEngine& operator=( const RichTextEngine& ) SAL_DELETED_FUNCTION;
+ RichTextEngine( const RichTextEngine& ) = delete;
+ RichTextEngine& operator=( const RichTextEngine& ) = delete;
private:
DECL_LINK_TYPED( EditEngineStatusChanged, EditStatus&, void );
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index 7964acaa17f7..0b15405238f6 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -173,8 +173,8 @@ namespace frm
static css::uno::Sequence< sal_Int8 > getEditEngineTunnelId();
private:
- ORichTextModel( const ORichTextModel& ) SAL_DELETED_FUNCTION;
- ORichTextModel& operator=( const ORichTextModel& ) SAL_DELETED_FUNCTION;
+ ORichTextModel( const ORichTextModel& ) = delete;
+ ORichTextModel& operator=( const ORichTextModel& ) = delete;
};
diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx
index f2973a842bf1..bc135a5313fa 100644
--- a/forms/source/richtext/richtextunowrapper.hxx
+++ b/forms/source/richtext/richtextunowrapper.hxx
@@ -46,8 +46,8 @@ namespace frm
private:
- ORichTextUnoWrapper( const ORichTextUnoWrapper& ) SAL_DELETED_FUNCTION;
- ORichTextUnoWrapper& operator=( const ORichTextUnoWrapper& ) SAL_DELETED_FUNCTION;
+ ORichTextUnoWrapper( const ORichTextUnoWrapper& ) = delete;
+ ORichTextUnoWrapper& operator=( const ORichTextUnoWrapper& ) = delete;
};
class RichTextEditSource : public SvxEditSource
@@ -69,8 +69,8 @@ namespace frm
virtual ~RichTextEditSource();
private:
- RichTextEditSource( const RichTextEditSource& _rSource ) SAL_DELETED_FUNCTION;
- RichTextEditSource& operator=( const RichTextEditSource& ) SAL_DELETED_FUNCTION;
+ RichTextEditSource( const RichTextEditSource& _rSource ) = delete;
+ RichTextEditSource& operator=( const RichTextEditSource& ) = delete;
};
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 0c1b984d3682..d80b5a95e3b6 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -341,8 +341,8 @@ namespace frm
};
private:
- FormOperations( const FormOperations& ) SAL_DELETED_FUNCTION;
- FormOperations& operator=( const FormOperations& ) SAL_DELETED_FUNCTION;
+ FormOperations( const FormOperations& ) = delete;
+ FormOperations& operator=( const FormOperations& ) = delete;
public:
class MethodGuard
diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx
index cffdb01ce846..bf63fc9a58ff 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 (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- ODataTypeRepository( const ODataTypeRepository& ) SAL_DELETED_FUNCTION;
- ODataTypeRepository& operator=( const ODataTypeRepository& ) SAL_DELETED_FUNCTION;
+ ODataTypeRepository( const ODataTypeRepository& ) = delete;
+ ODataTypeRepository& operator=( const ODataTypeRepository& ) = delete;
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 e4ab9cc04aab..07e29f87ae51 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -70,8 +70,8 @@ namespace xforms
sal_Int16 getTypeClass() const { return m_nTypeClass; }
private:
- OXSDDataType( const OXSDDataType& ) SAL_DELETED_FUNCTION;
- OXSDDataType& operator=( const OXSDDataType& ) SAL_DELETED_FUNCTION;
+ OXSDDataType( const OXSDDataType& ) = delete;
+ OXSDDataType& operator=( const OXSDDataType& ) = delete;
protected:
// create basic data type