loplugin:deletedspecial

Change-Id: I53a088b74b95230aa3842bcac0bb1fd09e39cc12

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
 

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:
 

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;

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();

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(

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(

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;

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();

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

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:
                     /**

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 );

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 ();
 
 };

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();

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);