diff options
Diffstat (limited to 'include/unotools')
-rw-r--r-- | include/unotools/charclass.hxx | 4 | ||||
-rw-r--r-- | include/unotools/configmgr.hxx | 4 | ||||
-rw-r--r-- | include/unotools/digitgroupingiterator.hxx | 4 | ||||
-rw-r--r-- | include/unotools/eventlisteneradapter.hxx | 4 | ||||
-rw-r--r-- | include/unotools/lingucfg.hxx | 4 | ||||
-rw-r--r-- | include/unotools/localedatawrapper.hxx | 4 | ||||
-rw-r--r-- | include/unotools/nativenumberwrapper.hxx | 4 | ||||
-rw-r--r-- | include/unotools/numberformatcodewrapper.hxx | 4 | ||||
-rw-r--r-- | include/unotools/options.hxx | 4 | ||||
-rw-r--r-- | include/unotools/searchopt.hxx | 4 | ||||
-rw-r--r-- | include/unotools/sharedunocomponent.hxx | 8 | ||||
-rw-r--r-- | include/unotools/tempfile.hxx | 4 | ||||
-rw-r--r-- | include/unotools/transliterationwrapper.hxx | 4 |
13 files changed, 28 insertions, 28 deletions
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx index cff4f869a02d..cdf9d0716794 100644 --- a/include/unotools/charclass.hxx +++ b/include/unotools/charclass.hxx @@ -69,8 +69,8 @@ class UNOTOOLS_DLLPUBLIC CharClass ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > xCC; mutable ::osl::Mutex aMutex; - CharClass(const CharClass&) SAL_DELETED_FUNCTION; - CharClass& operator=(const CharClass&) SAL_DELETED_FUNCTION; + CharClass(const CharClass&) = delete; + CharClass& operator=(const CharClass&) = delete; public: /// Preferred ctor with service manager specified diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx index 7c174f6cd46c..92ae409b3882 100644 --- a/include/unotools/configmgr.hxx +++ b/include/unotools/configmgr.hxx @@ -81,8 +81,8 @@ public: private: - ConfigManager(const ConfigManager&) SAL_DELETED_FUNCTION; - ConfigManager& operator=(const ConfigManager&) SAL_DELETED_FUNCTION; + ConfigManager(const ConfigManager&) = delete; + ConfigManager& operator=(const ConfigManager&) = delete; void doStoreConfigItems(); diff --git a/include/unotools/digitgroupingiterator.hxx b/include/unotools/digitgroupingiterator.hxx index 5746b9631300..12f8dc163b3d 100644 --- a/include/unotools/digitgroupingiterator.hxx +++ b/include/unotools/digitgroupingiterator.hxx @@ -116,8 +116,8 @@ class DigitGroupingIterator setDigits(); } - DigitGroupingIterator( const DigitGroupingIterator & ) SAL_DELETED_FUNCTION; - DigitGroupingIterator & operator=( const DigitGroupingIterator & ) SAL_DELETED_FUNCTION; + DigitGroupingIterator( const DigitGroupingIterator & ) = delete; + DigitGroupingIterator & operator=( const DigitGroupingIterator & ) = delete; public: diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx index 778382484745..26c1ef45dba4 100644 --- a/include/unotools/eventlisteneradapter.hxx +++ b/include/unotools/eventlisteneradapter.hxx @@ -36,8 +36,8 @@ namespace utl friend class OEventListenerImpl; private: - OEventListenerAdapter( const OEventListenerAdapter& _rSource ) SAL_DELETED_FUNCTION; - const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource ) SAL_DELETED_FUNCTION; + OEventListenerAdapter( const OEventListenerAdapter& _rSource ) = delete; + const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource ) = delete; protected: OEventListenerAdapterImpl* m_pImpl; diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx index a17082d13cc7..46a407464871 100644 --- a/include/unotools/lingucfg.hxx +++ b/include/unotools/lingucfg.hxx @@ -151,8 +151,8 @@ class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options OUString GetVendorImageUrl_Impl( const OUString &rServiceImplName, const OUString &rImageName ) const; - SvtLinguConfig( const SvtLinguConfig & ) SAL_DELETED_FUNCTION; - SvtLinguConfig & operator = ( const SvtLinguConfig & ) SAL_DELETED_FUNCTION; + SvtLinguConfig( const SvtLinguConfig & ) = delete; + SvtLinguConfig & operator = ( const SvtLinguConfig & ) = delete; public: SvtLinguConfig(); diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index 55106d8ca491..1664ad847fca 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -331,8 +331,8 @@ public: static void outputCheckMessage( const OUString& rMsg ); static void outputCheckMessage( const char* pStr); - LocaleDataWrapper(const LocaleDataWrapper&) SAL_DELETED_FUNCTION; - LocaleDataWrapper& operator=(const LocaleDataWrapper&) SAL_DELETED_FUNCTION; + LocaleDataWrapper(const LocaleDataWrapper&) = delete; + LocaleDataWrapper& operator=(const LocaleDataWrapper&) = delete; private: diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx index 7c65a826a5d1..a6582d27292b 100644 --- a/include/unotools/nativenumberwrapper.hxx +++ b/include/unotools/nativenumberwrapper.hxx @@ -31,8 +31,8 @@ namespace com { namespace sun { namespace star { class UNOTOOLS_DLLPUBLIC NativeNumberWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNativeNumberSupplier > xNNS; - NativeNumberWrapper( const NativeNumberWrapper& ) SAL_DELETED_FUNCTION; - NativeNumberWrapper& operator=( const NativeNumberWrapper& ) SAL_DELETED_FUNCTION; + NativeNumberWrapper( const NativeNumberWrapper& ) = delete; + NativeNumberWrapper& operator=( const NativeNumberWrapper& ) = delete; public: NativeNumberWrapper( diff --git a/include/unotools/numberformatcodewrapper.hxx b/include/unotools/numberformatcodewrapper.hxx index 00f647a3b59b..b41233407d41 100644 --- a/include/unotools/numberformatcodewrapper.hxx +++ b/include/unotools/numberformatcodewrapper.hxx @@ -34,8 +34,8 @@ class UNOTOOLS_DLLPUBLIC NumberFormatCodeWrapper ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNumberFormatCode > xNFC; ::com::sun::star::lang::Locale aLocale; - NumberFormatCodeWrapper( const NumberFormatCodeWrapper& ) SAL_DELETED_FUNCTION; - NumberFormatCodeWrapper& operator=( const NumberFormatCodeWrapper& ) SAL_DELETED_FUNCTION; + NumberFormatCodeWrapper( const NumberFormatCodeWrapper& ) = delete; + NumberFormatCodeWrapper& operator=( const NumberFormatCodeWrapper& ) = delete; public: NumberFormatCodeWrapper( diff --git a/include/unotools/options.hxx b/include/unotools/options.hxx index 6c3390c2e4ca..3022f433b435 100644 --- a/include/unotools/options.hxx +++ b/include/unotools/options.hxx @@ -81,8 +81,8 @@ public: virtual ~Options() = 0; private: - Options(Options &) SAL_DELETED_FUNCTION; - void operator =(Options &) SAL_DELETED_FUNCTION; + Options(Options &) = delete; + void operator =(Options &) = delete; protected: virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster* p, sal_uInt32 nHint=0 ) SAL_OVERRIDE; diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx index a34e4490b56f..df655d74dec5 100644 --- a/include/unotools/searchopt.hxx +++ b/include/unotools/searchopt.hxx @@ -28,8 +28,8 @@ class UNOTOOLS_DLLPUBLIC SvtSearchOptions { SvtSearchOptions_Impl *pImpl; - SvtSearchOptions( const SvtSearchOptions & ) SAL_DELETED_FUNCTION; - SvtSearchOptions & operator = ( const SvtSearchOptions & ) SAL_DELETED_FUNCTION; + SvtSearchOptions( const SvtSearchOptions & ) = delete; + SvtSearchOptions & operator = ( const SvtSearchOptions & ) = delete; public: SvtSearchOptions(); diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx index 04df770fbaf8..7226822e942f 100644 --- a/include/unotools/sharedunocomponent.hxx +++ b/include/unotools/sharedunocomponent.hxx @@ -63,8 +63,8 @@ namespace utl ~DisposableComponent(); private: - DisposableComponent( const DisposableComponent& ) SAL_DELETED_FUNCTION; - DisposableComponent& operator=( const DisposableComponent& ) SAL_DELETED_FUNCTION; + DisposableComponent( const DisposableComponent& ) = delete; + DisposableComponent& operator=( const DisposableComponent& ) = delete; }; //= CloseableComponent @@ -103,8 +103,8 @@ namespace utl ~CloseableComponent(); private: - CloseableComponent( const CloseableComponent& ) SAL_DELETED_FUNCTION; - CloseableComponent& operator=( const CloseableComponent& ) SAL_DELETED_FUNCTION; + CloseableComponent( const CloseableComponent& ) = delete; + CloseableComponent& operator=( const CloseableComponent& ) = delete; }; //= SharedUNOComponent diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx index 7876c821ec9f..40ff667c0e44 100644 --- a/include/unotools/tempfile.hxx +++ b/include/unotools/tempfile.hxx @@ -49,8 +49,8 @@ class UNOTOOLS_DLLPUBLIC TempFile bool bIsDirectory; bool bKillingFileEnabled; - TempFile( const TempFile& ) SAL_DELETED_FUNCTION; - TempFile& operator=(const TempFile&) SAL_DELETED_FUNCTION; + TempFile( const TempFile& ) = delete; + TempFile& operator=(const TempFile&) = delete; public: /** diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx index 840bb408a1f4..9f93477bac13 100644 --- a/include/unotools/transliterationwrapper.hxx +++ b/include/unotools/transliterationwrapper.hxx @@ -42,8 +42,8 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper sal_uInt32 nType; mutable bool bFirstCall; - TransliterationWrapper( const TransliterationWrapper& ) SAL_DELETED_FUNCTION; - TransliterationWrapper& operator=( const TransliterationWrapper& ) SAL_DELETED_FUNCTION; + TransliterationWrapper( const TransliterationWrapper& ) = delete; + TransliterationWrapper& operator=( const TransliterationWrapper& ) = delete; void loadModuleImpl() const; void setLanguageLocaleImpl( sal_uInt16 nLang ); |