summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/unotools/desktopterminationobserver.hxx12
-rw-r--r--include/unotools/digitgroupingiterator.hxx6
-rw-r--r--include/unotools/eventlisteneradapter.hxx4
-rw-r--r--include/unotools/lingucfg.hxx5
-rw-r--r--include/unotools/nativenumberwrapper.hxx5
-rw-r--r--include/unotools/numberformatcodewrapper.hxx5
-rw-r--r--include/unotools/options.hxx4
-rw-r--r--include/unotools/searchopt.hxx7
-rw-r--r--include/unotools/sharedunocomponent.hxx10
-rw-r--r--include/unotools/tempfile.hxx7
-rw-r--r--include/unotools/transliterationwrapper.hxx5
-rw-r--r--unotools/source/ucbhelper/XTempFile.hxx2
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.cxx4
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.hxx2
14 files changed, 30 insertions, 48 deletions
diff --git a/include/unotools/desktopterminationobserver.hxx b/include/unotools/desktopterminationobserver.hxx
index d476f81d45f9..2baa8df0d1a6 100644
--- a/include/unotools/desktopterminationobserver.hxx
+++ b/include/unotools/desktopterminationobserver.hxx
@@ -43,21 +43,17 @@ namespace utl
/** a class which allows non-UNO components to observe the desktop (aka application)
for it's shutdown
*/
- class UNOTOOLS_DLLPUBLIC DesktopTerminationObserver
+ namespace DesktopTerminationObserver
{
- public:
/** registers a listener which should be notified when the desktop terminates
(which means the application is shutting down)
*/
- static void registerTerminationListener( ITerminationListener* _pListener );
+ UNOTOOLS_DLLPUBLIC void registerTerminationListener( ITerminationListener* _pListener );
/** revokes a termination listener
*/
- static void revokeTerminationListener( ITerminationListener* _pListener );
-
- private:
- DesktopTerminationObserver(); // never implemented, only static methods
- };
+ UNOTOOLS_DLLPUBLIC void revokeTerminationListener( ITerminationListener* _pListener );
+ }
} // namespace utl
diff --git a/include/unotools/digitgroupingiterator.hxx b/include/unotools/digitgroupingiterator.hxx
index d5a5bc144cd7..c2ad320c5c91 100644
--- a/include/unotools/digitgroupingiterator.hxx
+++ b/include/unotools/digitgroupingiterator.hxx
@@ -115,10 +115,8 @@ class DigitGroupingIterator
setDigits();
}
- // not implemented, prevent usage
- DigitGroupingIterator();
- DigitGroupingIterator( const DigitGroupingIterator & );
- DigitGroupingIterator & operator=( const DigitGroupingIterator & );
+ DigitGroupingIterator( const DigitGroupingIterator & ) SAL_DELETED_FUNCTION;
+ DigitGroupingIterator & operator=( const DigitGroupingIterator & ) SAL_DELETED_FUNCTION;
public:
diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx
index 2715f015f288..778382484745 100644
--- a/include/unotools/eventlisteneradapter.hxx
+++ b/include/unotools/eventlisteneradapter.hxx
@@ -36,8 +36,8 @@ namespace utl
friend class OEventListenerImpl;
private:
- UNOTOOLS_DLLPRIVATE OEventListenerAdapter( const OEventListenerAdapter& _rSource ); // never implemented
- UNOTOOLS_DLLPRIVATE const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource ); // never implemented
+ OEventListenerAdapter( const OEventListenerAdapter& _rSource ) SAL_DELETED_FUNCTION;
+ const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource ) SAL_DELETED_FUNCTION;
protected:
OEventListenerAdapterImpl* m_pImpl;
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index 82c56f4c7eae..cceae1bc8ccc 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -154,9 +154,8 @@ class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options
OUString GetVendorImageUrl_Impl( const OUString &rServiceImplName, const OUString &rImageName ) const;
- // disallow copy-constructor and assignment-operator for now
- SvtLinguConfig( const SvtLinguConfig & );
- SvtLinguConfig & operator = ( const SvtLinguConfig & );
+ SvtLinguConfig( const SvtLinguConfig & ) SAL_DELETED_FUNCTION;
+ SvtLinguConfig & operator = ( const SvtLinguConfig & ) SAL_DELETED_FUNCTION;
public:
SvtLinguConfig();
diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index bdd0e1030c44..7c65a826a5d1 100644
--- a/include/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
@@ -31,9 +31,8 @@ namespace com { namespace sun { namespace star {
class UNOTOOLS_DLLPUBLIC NativeNumberWrapper
{
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNativeNumberSupplier > xNNS;
- // not implemented, prevent usage
- NativeNumberWrapper( const NativeNumberWrapper& );
- NativeNumberWrapper& operator=( const NativeNumberWrapper& );
+ NativeNumberWrapper( const NativeNumberWrapper& ) SAL_DELETED_FUNCTION;
+ NativeNumberWrapper& operator=( const NativeNumberWrapper& ) SAL_DELETED_FUNCTION;
public:
NativeNumberWrapper(
diff --git a/include/unotools/numberformatcodewrapper.hxx b/include/unotools/numberformatcodewrapper.hxx
index 9d5a31100fdf..066e38858d75 100644
--- a/include/unotools/numberformatcodewrapper.hxx
+++ b/include/unotools/numberformatcodewrapper.hxx
@@ -34,9 +34,8 @@ class UNOTOOLS_DLLPUBLIC NumberFormatCodeWrapper
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNumberFormatCode > xNFC;
::com::sun::star::lang::Locale aLocale;
- // not implemented, prevent usage
- NumberFormatCodeWrapper( const NumberFormatCodeWrapper& );
- NumberFormatCodeWrapper& operator=( const NumberFormatCodeWrapper& );
+ NumberFormatCodeWrapper( const NumberFormatCodeWrapper& ) SAL_DELETED_FUNCTION;
+ NumberFormatCodeWrapper& operator=( const NumberFormatCodeWrapper& ) SAL_DELETED_FUNCTION;
public:
NumberFormatCodeWrapper(
diff --git a/include/unotools/options.hxx b/include/unotools/options.hxx
index a176aaf1c413..6c3390c2e4ca 100644
--- a/include/unotools/options.hxx
+++ b/include/unotools/options.hxx
@@ -81,8 +81,8 @@ public:
virtual ~Options() = 0;
private:
- UNOTOOLS_DLLPRIVATE Options(Options &); // not defined
- UNOTOOLS_DLLPRIVATE void operator =(Options &); // not defined
+ Options(Options &) SAL_DELETED_FUNCTION;
+ void operator =(Options &) SAL_DELETED_FUNCTION;
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 d9b3cf3c1f7e..83bbed45b5cb 100644
--- a/include/unotools/searchopt.hxx
+++ b/include/unotools/searchopt.hxx
@@ -28,11 +28,8 @@ class UNOTOOLS_DLLPUBLIC SvtSearchOptions
{
SvtSearchOptions_Impl *pImpl;
- // disallow copy-constructor and assignment-operator for now
- SvtSearchOptions( const SvtSearchOptions & );
- SvtSearchOptions & operator = ( const SvtSearchOptions & );
-
-protected:
+ SvtSearchOptions( const SvtSearchOptions & ) SAL_DELETED_FUNCTION;
+ SvtSearchOptions & operator = ( const SvtSearchOptions & ) SAL_DELETED_FUNCTION;
public:
SvtSearchOptions();
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index 5130fa73b88a..ff932b69bba9 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -64,9 +64,8 @@ namespace utl
~DisposableComponent();
private:
- DisposableComponent(); // never implemented
- DisposableComponent( const DisposableComponent& ); // never implemented
- DisposableComponent& operator=( const DisposableComponent& ); // never implemented
+ DisposableComponent( const DisposableComponent& ) SAL_DELETED_FUNCTION;
+ DisposableComponent& operator=( const DisposableComponent& ) SAL_DELETED_FUNCTION;
};
//= CloseableComponent
@@ -105,9 +104,8 @@ namespace utl
~CloseableComponent();
private:
- CloseableComponent(); // never implemented
- CloseableComponent( const CloseableComponent& ); // never implemented
- CloseableComponent& operator=( const CloseableComponent& ); // never implemented
+ CloseableComponent( const CloseableComponent& ) SAL_DELETED_FUNCTION;
+ CloseableComponent& operator=( const CloseableComponent& ) SAL_DELETED_FUNCTION;
};
//= SharedUNOComponent
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index 0af9aa5a614a..51d901ac77a7 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -50,11 +50,8 @@ class UNOTOOLS_DLLPUBLIC TempFile
bool bIsDirectory;
bool bKillingFileEnabled;
- // prevent copy c'tor
- TempFile( const TempFile& );
- TempFile& operator=(const TempFile&);
-
-protected:
+ TempFile( const TempFile& ) SAL_DELETED_FUNCTION;
+ TempFile& operator=(const TempFile&) SAL_DELETED_FUNCTION;
public:
/**
diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index 715ea5fceb07..7d0dce0e1690 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -42,9 +42,8 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper
sal_uInt32 nType;
mutable bool bFirstCall;
- // not implemented, prevent usage
- TransliterationWrapper( const TransliterationWrapper& );
- TransliterationWrapper& operator=( const TransliterationWrapper& );
+ TransliterationWrapper( const TransliterationWrapper& ) SAL_DELETED_FUNCTION;
+ TransliterationWrapper& operator=( const TransliterationWrapper& ) SAL_DELETED_FUNCTION;
void loadModuleImpl() const;
void setLanguageLocaleImpl( sal_uInt16 nLang );
diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index 3a76a2b6b8c7..a2ed5e511287 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -135,7 +135,7 @@ public:
static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleComponentFactory > createServiceFactory_Static();
private:
- OTempFileService( OTempFileService & );
+ OTempFileService( OTempFileService & ) SAL_DELETED_FUNCTION;
virtual ~OTempFileService ();
};
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 271b80c63059..1fcf878c9552 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1515,7 +1515,7 @@ UcbLockBytesRef UcbLockBytes::CreateInputLockBytes( const Reference< XInputStrea
if( !xInputStream.is() )
return NULL;
- UcbLockBytesRef xLockBytes = new UcbLockBytes();
+ UcbLockBytesRef xLockBytes = new UcbLockBytes(nullptr);
xLockBytes->setDontClose_Impl();
xLockBytes->setInputStream_Impl( xInputStream );
xLockBytes->terminate_Impl();
@@ -1527,7 +1527,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference< XStream >& xStre
if( !xStream.is() )
return NULL;
- UcbLockBytesRef xLockBytes = new UcbLockBytes();
+ UcbLockBytesRef xLockBytes = new UcbLockBytes(nullptr);
xLockBytes->setDontClose_Impl();
xLockBytes->setStream_Impl( xStream );
xLockBytes->terminate_Impl();
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index 3c8e319b0c6d..e19c919dedb4 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -105,7 +105,7 @@ class UcbLockBytes : public virtual SvLockBytes
DECL_LINK( DataAvailHdl, void * );
- UcbLockBytes( UcbLockBytesHandler* pHandler=NULL );
+ UcbLockBytes( UcbLockBytesHandler* pHandler );
protected:
virtual ~UcbLockBytes (void);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-14 09:12:17 +0000