summaryrefslogtreecommitdiff
path: root/include/comphelper
diff options
context:
space:
mode:
Diffstat (limited to 'include/comphelper')
-rw-r--r--include/comphelper/SelectionMultiplex.hxx4
-rw-r--r--include/comphelper/accessibleeventnotifier.hxx4
-rw-r--r--include/comphelper/accessiblewrapper.hxx12
-rw-r--r--include/comphelper/asyncnotification.hxx4
-rw-r--r--include/comphelper/basicio.hxx2
-rw-r--r--include/comphelper/componentmodule.hxx4
-rw-r--r--include/comphelper/configuration.hxx56
-rw-r--r--include/comphelper/logging.hxx2
-rw-r--r--include/comphelper/propertycontainerhelper.hxx4
-rw-r--r--include/comphelper/proxyaggregation.hxx12
-rw-r--r--include/comphelper/scopeguard.hxx4
-rw-r--r--include/comphelper/solarmutex.hxx4
-rw-r--r--include/comphelper/syntaxhighlight.hxx4
-rw-r--r--include/comphelper/threadpool.hxx4
-rw-r--r--include/comphelper/unique_disposing_ptr.hxx4
15 files changed, 62 insertions, 62 deletions
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 14bbcc76734b..8b45f1a7b025 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -74,8 +74,8 @@ namespace comphelper
bool m_bListening : 1;
bool m_bAutoSetRelease : 1;
- OSelectionChangeMultiplexer(const OSelectionChangeMultiplexer&) SAL_DELETED_FUNCTION;
- OSelectionChangeMultiplexer& operator=(const OSelectionChangeMultiplexer&) SAL_DELETED_FUNCTION;
+ OSelectionChangeMultiplexer(const OSelectionChangeMultiplexer&) = delete;
+ OSelectionChangeMultiplexer& operator=(const OSelectionChangeMultiplexer&) = delete;
protected:
virtual ~OSelectionChangeMultiplexer();
public:
diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx
index c401503dba69..0cef8ed1487c 100644
--- a/include/comphelper/accessibleeventnotifier.hxx
+++ b/include/comphelper/accessibleeventnotifier.hxx
@@ -44,8 +44,8 @@ namespace comphelper
~AccessibleEventNotifier( ); // never implemented
private:
- AccessibleEventNotifier( const AccessibleEventNotifier& ) SAL_DELETED_FUNCTION;
- AccessibleEventNotifier& operator=( const AccessibleEventNotifier& ) SAL_DELETED_FUNCTION;
+ AccessibleEventNotifier( const AccessibleEventNotifier& ) = delete;
+ AccessibleEventNotifier& operator=( const AccessibleEventNotifier& ) = delete;
public:
/** registers a client of this class, means a broadcaster of AccessibleEvents
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index 61a315248691..3363fead4766 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -116,8 +116,8 @@ namespace comphelper
virtual ~OAccessibleWrapper( );
private:
- OAccessibleWrapper( const OAccessibleWrapper& ) SAL_DELETED_FUNCTION;
- OAccessibleWrapper& operator=( const OAccessibleWrapper& ) SAL_DELETED_FUNCTION;
+ OAccessibleWrapper( const OAccessibleWrapper& ) = delete;
+ OAccessibleWrapper& operator=( const OAccessibleWrapper& ) = delete;
};
@@ -303,8 +303,8 @@ namespace comphelper
virtual ~OAccessibleContextWrapper();
private:
- OAccessibleContextWrapper( const OAccessibleContextWrapper& ) SAL_DELETED_FUNCTION;
- OAccessibleContextWrapper& operator=( const OAccessibleContextWrapper& ) SAL_DELETED_FUNCTION;
+ OAccessibleContextWrapper( const OAccessibleContextWrapper& ) = delete;
+ OAccessibleContextWrapper& operator=( const OAccessibleContextWrapper& ) = delete;
};
@@ -390,8 +390,8 @@ namespace comphelper
virtual ~OWrappedAccessibleChildrenManager( );
private:
- OWrappedAccessibleChildrenManager( const OWrappedAccessibleChildrenManager& ) SAL_DELETED_FUNCTION;
- OWrappedAccessibleChildrenManager& operator=( const OWrappedAccessibleChildrenManager& ) SAL_DELETED_FUNCTION;
+ OWrappedAccessibleChildrenManager( const OWrappedAccessibleChildrenManager& ) = delete;
+ OWrappedAccessibleChildrenManager& operator=( const OWrappedAccessibleChildrenManager& ) = delete;
};
diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx
index 01d589c8540e..9775347ff46e 100644
--- a/include/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
@@ -44,8 +44,8 @@ namespace comphelper
virtual ~AnyEvent();
private:
- AnyEvent( AnyEvent& ) SAL_DELETED_FUNCTION;
- void operator=( AnyEvent& ) SAL_DELETED_FUNCTION;
+ AnyEvent( AnyEvent& ) = delete;
+ void operator=( AnyEvent& ) = delete;
};
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index c48a313dacc4..3dd8aea727ae 100644
--- a/include/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
@@ -33,7 +33,7 @@ COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& ope
COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, bool _bVal);
void operator <<(
css::uno::Reference<css::io::XObjectOutputStream> const &, sal_Bool)
- SAL_DELETED_FUNCTION;
+ = delete;
// OUString
COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, OUString& _rStr);
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 024d9b63f551..172b0b2c0072 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -162,8 +162,8 @@ namespace comphelper
virtual void onLastClient();
private:
- OModule( const OModule& ) SAL_DELETED_FUNCTION;
- OModule& operator=( const OModule& ) SAL_DELETED_FUNCTION;
+ OModule( const OModule& ) = delete;
+ OModule& operator=( const OModule& ) = delete;
};
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx
index 8ca6bd7eccfd..b1cdefdf204f 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -53,8 +53,8 @@ public:
void commit() const;
private:
- ConfigurationChanges(const ConfigurationChanges&) SAL_DELETED_FUNCTION;
- ConfigurationChanges& operator=(const ConfigurationChanges&) SAL_DELETED_FUNCTION;
+ ConfigurationChanges(const ConfigurationChanges&) = delete;
+ ConfigurationChanges& operator=(const ConfigurationChanges&) = delete;
SAL_DLLPRIVATE ConfigurationChanges(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
@@ -129,8 +129,8 @@ public:
std::shared_ptr< ConfigurationChanges > createChanges() const;
private:
- ConfigurationWrapper(const ConfigurationWrapper&) SAL_DELETED_FUNCTION;
- ConfigurationWrapper& operator=(const ConfigurationWrapper&) SAL_DELETED_FUNCTION;
+ ConfigurationWrapper(const ConfigurationWrapper&) = delete;
+ ConfigurationWrapper& operator=(const ConfigurationWrapper&) = delete;
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
context_;
@@ -152,11 +152,11 @@ template< typename T > struct Convert {
{ return value.get< T >(); }
private:
- Convert(const Convert&) SAL_DELETED_FUNCTION;
- Convert& operator=(const Convert&) SAL_DELETED_FUNCTION;
+ Convert(const Convert&) = delete;
+ Convert& operator=(const Convert&) = delete;
- Convert() SAL_DELETED_FUNCTION;
- ~Convert() SAL_DELETED_FUNCTION;
+ Convert() = delete;
+ ~Convert() = delete;
};
/// @internal
@@ -175,11 +175,11 @@ template< typename T > struct Convert< boost::optional< T > >
}
private:
- Convert(const Convert&) SAL_DELETED_FUNCTION;
- Convert& operator=(const Convert&) SAL_DELETED_FUNCTION;
+ Convert(const Convert&) = delete;
+ Convert& operator=(const Convert&) = delete;
- Convert() SAL_DELETED_FUNCTION;
- ~Convert() SAL_DELETED_FUNCTION;
+ Convert() = delete;
+ ~Convert() = delete;
};
}
@@ -228,11 +228,11 @@ template< typename T, typename U > struct ConfigurationProperty
}
private:
- ConfigurationProperty(const ConfigurationProperty&) SAL_DELETED_FUNCTION;
- ConfigurationProperty& operator=(const ConfigurationProperty&) SAL_DELETED_FUNCTION;
+ ConfigurationProperty(const ConfigurationProperty&) = delete;
+ ConfigurationProperty& operator=(const ConfigurationProperty&) = delete;
- ConfigurationProperty() SAL_DELETED_FUNCTION;
- ~ConfigurationProperty() SAL_DELETED_FUNCTION;
+ ConfigurationProperty() = delete;
+ ~ConfigurationProperty() = delete;
};
/// A type-safe wrapper around a localized configuration property.
@@ -274,11 +274,11 @@ template< typename T, typename U > struct ConfigurationLocalizedProperty
}
private:
- ConfigurationLocalizedProperty(const ConfigurationLocalizedProperty&) SAL_DELETED_FUNCTION;
- ConfigurationLocalizedProperty& operator=(const ConfigurationLocalizedProperty&) SAL_DELETED_FUNCTION;
+ ConfigurationLocalizedProperty(const ConfigurationLocalizedProperty&) = delete;
+ ConfigurationLocalizedProperty& operator=(const ConfigurationLocalizedProperty&) = delete;
- ConfigurationLocalizedProperty() SAL_DELETED_FUNCTION;
- ~ConfigurationLocalizedProperty() SAL_DELETED_FUNCTION;
+ ConfigurationLocalizedProperty() = delete;
+ ~ConfigurationLocalizedProperty() = delete;
};
/// A type-safe wrapper around a configuration group.
@@ -308,11 +308,11 @@ template< typename T > struct ConfigurationGroup {
}
private:
- ConfigurationGroup(const ConfigurationGroup&) SAL_DELETED_FUNCTION;
- ConfigurationGroup& operator=(const ConfigurationGroup&) SAL_DELETED_FUNCTION;
+ ConfigurationGroup(const ConfigurationGroup&) = delete;
+ ConfigurationGroup& operator=(const ConfigurationGroup&) = delete;
- ConfigurationGroup() SAL_DELETED_FUNCTION;
- ~ConfigurationGroup() SAL_DELETED_FUNCTION;
+ ConfigurationGroup() = delete;
+ ~ConfigurationGroup() = delete;
};
/// A type-safe wrapper around a configuration set.
@@ -342,11 +342,11 @@ template< typename T > struct ConfigurationSet {
}
private:
- ConfigurationSet(const ConfigurationSet&) SAL_DELETED_FUNCTION;
- ConfigurationSet& operator=(const ConfigurationSet&) SAL_DELETED_FUNCTION;
+ ConfigurationSet(const ConfigurationSet&) = delete;
+ ConfigurationSet& operator=(const ConfigurationSet&) = delete;
- ConfigurationSet() SAL_DELETED_FUNCTION;
- ~ConfigurationSet() SAL_DELETED_FUNCTION;
+ ConfigurationSet() = delete;
+ ~ConfigurationSet() = delete;
};
}
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index dcfe7b37e142..665bc9c52d0c 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -57,7 +57,7 @@ namespace comphelper
inline OUString convertLogArgToString( sal_Int16 _nValue ) { return OUString::number( _nValue ); }
inline OUString convertLogArgToString( sal_Unicode _nValue ) { return OUString( _nValue ); }
inline OUString convertLogArgToString( bool _bValue ) { return OUString::boolean( _bValue ); }
- void convertLogArgToString(sal_Bool) SAL_DELETED_FUNCTION;
+ void convertLogArgToString(sal_Bool) = delete;
} } // namespace log::convert
diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx
index 430c86ff76f4..1d29cda90952 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -186,8 +186,8 @@ private:
COMPHELPER_DLLPRIVATE PropertiesIterator searchHandle(sal_Int32 _nHandle);
private:
- OPropertyContainerHelper( const OPropertyContainerHelper& ) SAL_DELETED_FUNCTION;
- OPropertyContainerHelper& operator=( const OPropertyContainerHelper& ) SAL_DELETED_FUNCTION;
+ OPropertyContainerHelper( const OPropertyContainerHelper& ) = delete;
+ OPropertyContainerHelper& operator=( const OPropertyContainerHelper& ) = delete;
};
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index 426ce3efcc8b..39118d03125e 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -110,8 +110,8 @@ namespace comphelper
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException);
private:
- OProxyAggregation( const OProxyAggregation& ) SAL_DELETED_FUNCTION;
- OProxyAggregation& operator=( const OProxyAggregation& ) SAL_DELETED_FUNCTION;
+ OProxyAggregation( const OProxyAggregation& ) = delete;
+ OProxyAggregation& operator=( const OProxyAggregation& ) = delete;
};
@@ -170,8 +170,8 @@ namespace comphelper
virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0;
private:
- OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& ) SAL_DELETED_FUNCTION;
- OComponentProxyAggregationHelper& operator=( const OComponentProxyAggregationHelper& ) SAL_DELETED_FUNCTION;
+ OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& ) = delete;
+ OComponentProxyAggregationHelper& operator=( const OComponentProxyAggregationHelper& ) = delete;
};
@@ -208,8 +208,8 @@ namespace comphelper
void implEnsureDisposeInDtor( );
private:
- OComponentProxyAggregation( const OComponentProxyAggregation& ) SAL_DELETED_FUNCTION;
- OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ) SAL_DELETED_FUNCTION;
+ OComponentProxyAggregation( const OComponentProxyAggregation& ) = delete;
+ OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ) = delete;
};
diff --git a/include/comphelper/scopeguard.hxx b/include/comphelper/scopeguard.hxx
index 324ad6ce2090..629950ccc151 100644
--- a/include/comphelper/scopeguard.hxx
+++ b/include/comphelper/scopeguard.hxx
@@ -51,8 +51,8 @@ public:
private:
// noncopyable until we have good reasons...
- ScopeGuard(const ScopeGuard&) SAL_DELETED_FUNCTION;
- ScopeGuard& operator=(const ScopeGuard&) SAL_DELETED_FUNCTION;
+ ScopeGuard(const ScopeGuard&) = delete;
+ ScopeGuard& operator=(const ScopeGuard&) = delete;
::std::function<void ()> m_func;
exc_handling const m_excHandling;
diff --git a/include/comphelper/solarmutex.hxx b/include/comphelper/solarmutex.hxx
index c50eba29dcda..48453de915e4 100644
--- a/include/comphelper/solarmutex.hxx
+++ b/include/comphelper/solarmutex.hxx
@@ -54,8 +54,8 @@ protected:
virtual ~SolarMutex();
private:
- SolarMutex(const SolarMutex&) SAL_DELETED_FUNCTION;
- SolarMutex& operator=(const SolarMutex&) SAL_DELETED_FUNCTION;
+ SolarMutex(const SolarMutex&) = delete;
+ SolarMutex& operator=(const SolarMutex&) = delete;
};
}
diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx
index c2487499c375..77543ed4cb8f 100644
--- a/include/comphelper/syntaxhighlight.hxx
+++ b/include/comphelper/syntaxhighlight.hxx
@@ -72,8 +72,8 @@ class COMPHELPER_DLLPUBLIC SyntaxHighlighter
HighlighterLanguage eLanguage;
std::unique_ptr<Tokenizer> m_tokenizer;
- SyntaxHighlighter(const SyntaxHighlighter&) SAL_DELETED_FUNCTION;
- SyntaxHighlighter& operator=(const SyntaxHighlighter&) SAL_DELETED_FUNCTION;
+ SyntaxHighlighter(const SyntaxHighlighter&) = delete;
+ SyntaxHighlighter& operator=(const SyntaxHighlighter&) = delete;
public:
SyntaxHighlighter(HighlighterLanguage language);
~SyntaxHighlighter();
diff --git a/include/comphelper/threadpool.hxx b/include/comphelper/threadpool.hxx
index 4a149a89e4be..cfa471b60802 100644
--- a/include/comphelper/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -49,8 +49,8 @@ public:
sal_Int32 getWorkerCount() const { return maWorkers.size(); }
private:
- ThreadPool(const ThreadPool&) SAL_DELETED_FUNCTION;
- ThreadPool& operator=(const ThreadPool&) SAL_DELETED_FUNCTION;
+ ThreadPool(const ThreadPool&) = delete;
+ ThreadPool& operator=(const ThreadPool&) = delete;
class ThreadWorker;
friend class ThreadWorker;
diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx
index 89810982d317..6da49fdd2ec7 100644
--- a/include/comphelper/unique_disposing_ptr.hxx
+++ b/include/comphelper/unique_disposing_ptr.hxx
@@ -27,8 +27,8 @@ private:
std::unique_ptr<T> m_xItem;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener> m_xTerminateListener;
- unique_disposing_ptr(const unique_disposing_ptr&) SAL_DELETED_FUNCTION;
- unique_disposing_ptr& operator=(const unique_disposing_ptr&) SAL_DELETED_FUNCTION;
+ unique_disposing_ptr(const unique_disposing_ptr&) = delete;
+ unique_disposing_ptr& operator=(const unique_disposing_ptr&) = delete;
public:
unique_disposing_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 )
: m_xItem(p)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 17:33:00 +0000