diff options
Diffstat (limited to 'include')
198 files changed, 503 insertions, 503 deletions
diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index 72e2ecb64a57..04c72964b48a 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -112,8 +112,8 @@ namespace avmedia static BitmapEx getEmptyLogo(); private: - MediaWindow(const MediaWindow&) SAL_DELETED_FUNCTION; - MediaWindow& operator =( const MediaWindow& ) SAL_DELETED_FUNCTION; + MediaWindow(const MediaWindow&) = delete; + MediaWindow& operator =( const MediaWindow& ) = delete; css::uno::Reference< css::uno::XInterface > mxIFace; VclPtr<priv::MediaWindowImpl> mpImpl; diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx index 7cf078ae562d..f495dad5b0ea 100644 --- a/include/basegfx/color/bcolormodifier.hxx +++ b/include/basegfx/color/bcolormodifier.hxx @@ -59,8 +59,8 @@ namespace basegfx class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier { private: - BColorModifier(const BColorModifier&) SAL_DELETED_FUNCTION; - BColorModifier& operator=(const BColorModifier&) SAL_DELETED_FUNCTION; + BColorModifier(const BColorModifier&) = delete; + BColorModifier& operator=(const BColorModifier&) = delete; protected: // no one is allowed to incarnate the abstract base class // except derivations diff --git a/include/basegfx/range/b2dconnectedranges.hxx b/include/basegfx/range/b2dconnectedranges.hxx index 6473b2ddf990..6feb867f1311 100644 --- a/include/basegfx/range/b2dconnectedranges.hxx +++ b/include/basegfx/range/b2dconnectedranges.hxx @@ -235,8 +235,8 @@ namespace basegfx } private: - B2DConnectedRanges(const B2DConnectedRanges&) SAL_DELETED_FUNCTION; - B2DConnectedRanges& operator=( const B2DConnectedRanges& ) SAL_DELETED_FUNCTION; + B2DConnectedRanges(const B2DConnectedRanges&) = delete; + B2DConnectedRanges& operator=( const B2DConnectedRanges& ) = delete; /** Current list of disjunct sets of connected components diff --git a/include/basegfx/raster/bpixelraster.hxx b/include/basegfx/raster/bpixelraster.hxx index 6f2b21b107e8..67eea7d31b15 100644 --- a/include/basegfx/raster/bpixelraster.hxx +++ b/include/basegfx/raster/bpixelraster.hxx @@ -31,8 +31,8 @@ namespace basegfx class BPixelRaster { private: - BPixelRaster(const BPixelRaster&) SAL_DELETED_FUNCTION; - BPixelRaster& operator=(const BPixelRaster&) SAL_DELETED_FUNCTION; + BPixelRaster(const BPixelRaster&) = delete; + BPixelRaster& operator=(const BPixelRaster&) = delete; protected: sal_uInt32 mnWidth; diff --git a/include/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx index 3baca23f5025..6159742a7a3f 100644 --- a/include/basegfx/tools/unopolypolygon.hxx +++ b/include/basegfx/tools/unopolypolygon.hxx @@ -96,8 +96,8 @@ namespace unotools virtual void modifying() const {} private: - UnoPolyPolygon(const UnoPolyPolygon&) SAL_DELETED_FUNCTION; - UnoPolyPolygon& operator=(const UnoPolyPolygon&) SAL_DELETED_FUNCTION; + UnoPolyPolygon(const UnoPolyPolygon&) = delete; + UnoPolyPolygon& operator=(const UnoPolyPolygon&) = delete; B2DPolyPolygon maPolyPoly; ::com::sun::star::rendering::FillRule meFillRule; diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index e0fcfe517e97..fbbf6b4c1899 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -57,8 +57,8 @@ class BASIC_DLLPUBLIC SbModule : public SbxObject BASIC_DLLPRIVATE void implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic ); - SbModule(const SbModule&) SAL_DELETED_FUNCTION; - SbModule& operator=(const SbModule&) SAL_DELETED_FUNCTION; + SbModule(const SbModule&) = delete; + SbModule& operator=(const SbModule&) = delete; protected: com::sun::star::uno::Reference< com::sun::star::script::XInvocation > mxWrapper; OUString aOUSource; diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx index 4afc2ce14bc4..32e5ecde4ffa 100644 --- a/include/canvas/base/cachedprimitivebase.hxx +++ b/include/canvas/base/cachedprimitivebase.hxx @@ -80,8 +80,8 @@ namespace canvas virtual ~CachedPrimitiveBase(); // we're a ref-counted UNO class. _We_ destroy ourselves. private: - CachedPrimitiveBase( const CachedPrimitiveBase& ) SAL_DELETED_FUNCTION; - CachedPrimitiveBase& operator=( const CachedPrimitiveBase& ) SAL_DELETED_FUNCTION; + CachedPrimitiveBase( const CachedPrimitiveBase& ) = delete; + CachedPrimitiveBase& operator=( const CachedPrimitiveBase& ) = delete; /** Actually perform the requested redraw. diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx index 4d710a537dde..2cb129d90bc1 100644 --- a/include/canvas/base/canvasbase.hxx +++ b/include/canvas/base/canvasbase.hxx @@ -465,8 +465,8 @@ namespace canvas mutable bool mbSurfaceDirty; private: - CanvasBase( const CanvasBase& ) SAL_DELETED_FUNCTION; - CanvasBase& operator=( const CanvasBase& ) SAL_DELETED_FUNCTION; + CanvasBase( const CanvasBase& ) = delete; + CanvasBase& operator=( const CanvasBase& ) = delete; }; } diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx index fe29f5c5146b..a81a0b6026f0 100644 --- a/include/canvas/base/canvascustomspritehelper.hxx +++ b/include/canvas/base/canvascustomspritehelper.hxx @@ -196,8 +196,8 @@ namespace canvas void visibilityUpdated() const { mbVisibilityDirty=false; } private: - CanvasCustomSpriteHelper( const CanvasCustomSpriteHelper& ) SAL_DELETED_FUNCTION; - CanvasCustomSpriteHelper& operator=( const CanvasCustomSpriteHelper& ) SAL_DELETED_FUNCTION; + CanvasCustomSpriteHelper( const CanvasCustomSpriteHelper& ) = delete; + CanvasCustomSpriteHelper& operator=( const CanvasCustomSpriteHelper& ) = delete; /** Called to convert an API polygon to a basegfx polygon diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx index 83b5adc69fd4..9e34eab460ae 100644 --- a/include/canvas/base/graphicdevicebase.hxx +++ b/include/canvas/base/graphicdevicebase.hxx @@ -363,8 +363,8 @@ namespace canvas bool mbDumpScreenContent; private: - GraphicDeviceBase( const GraphicDeviceBase& ) SAL_DELETED_FUNCTION; - GraphicDeviceBase& operator=( const GraphicDeviceBase& ) SAL_DELETED_FUNCTION; + GraphicDeviceBase( const GraphicDeviceBase& ) = delete; + GraphicDeviceBase& operator=( const GraphicDeviceBase& ) = delete; }; } diff --git a/include/codemaker/exceptiontree.hxx b/include/codemaker/exceptiontree.hxx index 091ff034bf72..9c6b3b919b94 100644 --- a/include/codemaker/exceptiontree.hxx +++ b/include/codemaker/exceptiontree.hxx @@ -54,8 +54,8 @@ struct ExceptionTreeNode { Children children; private: - ExceptionTreeNode(ExceptionTreeNode &) SAL_DELETED_FUNCTION; - void operator =(ExceptionTreeNode) SAL_DELETED_FUNCTION; + ExceptionTreeNode(ExceptionTreeNode &) = delete; + void operator =(ExceptionTreeNode) = delete; void clearChildren(); }; @@ -107,8 +107,8 @@ public: ExceptionTreeNode const & getRoot() const { return m_root; } private: - ExceptionTree(ExceptionTree &) SAL_DELETED_FUNCTION; - void operator =(const ExceptionTree&) SAL_DELETED_FUNCTION; + ExceptionTree(ExceptionTree &) = delete; + void operator =(const ExceptionTree&) = delete; ExceptionTreeNode m_root; }; diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx index ca4ad24c68be..f6cb452c1990 100644 --- a/include/codemaker/generatedtypeset.hxx +++ b/include/codemaker/generatedtypeset.hxx @@ -60,8 +60,8 @@ public: { return m_set.find(type) != m_set.end(); } private: - GeneratedTypeSet(GeneratedTypeSet &) SAL_DELETED_FUNCTION; - void operator =(const GeneratedTypeSet&) SAL_DELETED_FUNCTION; + GeneratedTypeSet(GeneratedTypeSet &) = delete; + void operator =(const GeneratedTypeSet&) = delete; std::unordered_set< OString, OStringHash > m_set; }; 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) diff --git a/include/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx index 931398c893e6..72e9d701b1f4 100644 --- a/include/connectivity/ParameterCont.hxx +++ b/include/connectivity/ParameterCont.hxx @@ -43,8 +43,8 @@ namespace dbtools protected: virtual ~OParameterContinuation() { } private: - OParameterContinuation(const OParameterContinuation&) SAL_DELETED_FUNCTION; - void operator =(const OParameterContinuation&) SAL_DELETED_FUNCTION; + OParameterContinuation(const OParameterContinuation&) = delete; + void operator =(const OParameterContinuation&) = delete; }; } // dbtools #endif // INCLUDED_CONNECTIVITY_PARAMETERCONT_HXX diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index f946ce264305..74abd30e37af 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -87,8 +87,8 @@ namespace dbtools OUString getFormattedValue() const; private: - FormattedColumnValue(const FormattedColumnValue&) SAL_DELETED_FUNCTION; - FormattedColumnValue& operator=(const FormattedColumnValue&) SAL_DELETED_FUNCTION; + FormattedColumnValue(const FormattedColumnValue&) = delete; + FormattedColumnValue& operator=(const FormattedColumnValue&) = delete; std::unique_ptr< FormattedColumnValue_Data > m_pData; }; diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx index f4908372f40d..9d4a50524ed6 100644 --- a/include/connectivity/parameters.hxx +++ b/include/connectivity/parameters.hxx @@ -396,8 +396,8 @@ namespace dbtools void cacheConnectionInfo(); private: - ParameterManager( const ParameterManager& ) SAL_DELETED_FUNCTION; - ParameterManager& operator=( const ParameterManager& ) SAL_DELETED_FUNCTION; + ParameterManager( const ParameterManager& ) = delete; + ParameterManager& operator=( const ParameterManager& ) = delete; }; diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index be8274a8e607..4c1e330b42b1 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -129,7 +129,7 @@ namespace connectivity private: - OSQLParseTreeIterator(const OSQLParseTreeIterator & rIter) SAL_DELETED_FUNCTION; + OSQLParseTreeIterator(const OSQLParseTreeIterator & rIter) = delete; public: OSQLParseTreeIterator( diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx index c3f5464fa501..b4d5c1e3d31f 100644 --- a/include/connectivity/statementcomposer.hxx +++ b/include/connectivity/statementcomposer.hxx @@ -88,9 +88,9 @@ namespace dbtools getQuery(); private: - StatementComposer(const StatementComposer&) SAL_DELETED_FUNCTION; - StatementComposer& operator=(const StatementComposer&) SAL_DELETED_FUNCTION; - StatementComposer() SAL_DELETED_FUNCTION; + StatementComposer(const StatementComposer&) = delete; + StatementComposer& operator=(const StatementComposer&) = delete; + StatementComposer() = delete; }; diff --git a/include/cppcanvas/basegfxfactory.hxx b/include/cppcanvas/basegfxfactory.hxx index 5341cd631ebc..8238b502ffbb 100644 --- a/include/cppcanvas/basegfxfactory.hxx +++ b/include/cppcanvas/basegfxfactory.hxx @@ -69,9 +69,9 @@ namespace cppcanvas static BitmapSharedPtr createAlphaBitmap( const CanvasSharedPtr&, const ::basegfx::B2ISize& rSize ); private: - BaseGfxFactory() SAL_DELETED_FUNCTION; - BaseGfxFactory(const BaseGfxFactory&) SAL_DELETED_FUNCTION; - BaseGfxFactory& operator=( const BaseGfxFactory& ) SAL_DELETED_FUNCTION; + BaseGfxFactory() = delete; + BaseGfxFactory(const BaseGfxFactory&) = delete; + BaseGfxFactory& operator=( const BaseGfxFactory& ) = delete; }; } diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx index 76b1269dff90..a3c5f63c11ac 100644 --- a/include/cppcanvas/vclfactory.hxx +++ b/include/cppcanvas/vclfactory.hxx @@ -87,9 +87,9 @@ namespace cppcanvas const Renderer::Parameters& rParms ); private: - VCLFactory() SAL_DELETED_FUNCTION; - VCLFactory(const VCLFactory&) SAL_DELETED_FUNCTION; - VCLFactory& operator=( const VCLFactory& ) SAL_DELETED_FUNCTION; + VCLFactory() = delete; + VCLFactory(const VCLFactory&) = delete; + VCLFactory& operator=( const VCLFactory& ) = delete; }; } diff --git a/include/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx index dd52b6e15cf1..00cc2543380b 100644 --- a/include/drawinglayer/animation/animationtiming.hxx +++ b/include/drawinglayer/animation/animationtiming.hxx @@ -35,8 +35,8 @@ namespace drawinglayer class DRAWINGLAYER_DLLPUBLIC AnimationEntry { private: - AnimationEntry(const AnimationEntry&) SAL_DELETED_FUNCTION; - AnimationEntry& operator=(const AnimationEntry& rCandidate) SAL_DELETED_FUNCTION; + AnimationEntry(const AnimationEntry&) = delete; + AnimationEntry& operator=(const AnimationEntry& rCandidate) = delete; public: AnimationEntry(); diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 6d48c27e6d73..5900e23194c6 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -286,8 +286,8 @@ namespace accessibility void TextChanged(); private: - AccessibleEditableTextPara( const AccessibleEditableTextPara& ) SAL_DELETED_FUNCTION; - AccessibleEditableTextPara& operator= ( const AccessibleEditableTextPara& ) SAL_DELETED_FUNCTION; + AccessibleEditableTextPara( const AccessibleEditableTextPara& ) = delete; + AccessibleEditableTextPara& operator= ( const AccessibleEditableTextPara& ) = delete; /** Calculate character range of similar attributes diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index d4caae753dce..ff0d25004dc6 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -148,8 +148,8 @@ namespace accessibility void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; private: - AccessibleImageBullet( const AccessibleImageBullet& ) SAL_DELETED_FUNCTION; - AccessibleImageBullet& operator= ( const AccessibleImageBullet& ) SAL_DELETED_FUNCTION; + AccessibleImageBullet( const AccessibleImageBullet& ) = delete; + AccessibleImageBullet& operator= ( const AccessibleImageBullet& ) = delete; // syntactic sugar for FireEvent void GotPropertyEvent( const ::com::sun::star::uno::Any& rNewValue, const sal_Int16 nEventId ) const; diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx index 5682425d8619..b5918f21d44c 100644 --- a/include/editeng/AccessibleStaticTextBase.hxx +++ b/include/editeng/AccessibleStaticTextBase.hxx @@ -106,8 +106,8 @@ namespace accessibility virtual ~AccessibleStaticTextBase(); private: - AccessibleStaticTextBase( const AccessibleStaticTextBase& ) SAL_DELETED_FUNCTION; - AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& ) SAL_DELETED_FUNCTION; + AccessibleStaticTextBase( const AccessibleStaticTextBase& ) = delete; + AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& ) = delete; public: diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index a35a3424309d..da46fe6f5eba 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -158,8 +158,8 @@ public: private: ImpEditEngine* pImpEditEngine; - EditEngine( const EditEngine& ) SAL_DELETED_FUNCTION; - EditEngine& operator=( const EditEngine& ) SAL_DELETED_FUNCTION; + EditEngine( const EditEngine& ) = delete; + EditEngine& operator=( const EditEngine& ) = delete; EDITENG_DLLPRIVATE bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, vcl::Window* pFrameWin = NULL ); EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode); diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx index a11d052bc48d..e07547ce312f 100644 --- a/include/editeng/editobj.hxx +++ b/include/editeng/editobj.hxx @@ -64,7 +64,7 @@ class EDITENG_DLLPUBLIC EditTextObject : public SfxItemPoolUser EditTextObjectImpl* mpImpl; - EditTextObject& operator=( const EditTextObject& ) SAL_DELETED_FUNCTION; + EditTextObject& operator=( const EditTextObject& ) = delete; EditTextObject(); // disabled diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 210e816b2132..835e540ec5fc 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -93,8 +93,8 @@ private: ImpEditView* pImpEditView; OUString aDicNameSingle; - EditView( const EditView& ) SAL_DELETED_FUNCTION; - EditView& operator=( const EditView& ) SAL_DELETED_FUNCTION; + EditView( const EditView& ) = delete; + EditView& operator=( const EditView& ) = delete; public: EditView( EditEngine* pEng, vcl::Window* pWindow ); diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx index 1b9abb8e5cbf..0ee9113e140d 100644 --- a/include/editeng/hangulhanja.hxx +++ b/include/editeng/hangulhanja.hxx @@ -102,8 +102,8 @@ namespace editeng static bool m_bTryBothDirectionsSave; static ConversionDirection m_ePrimaryConversionDirectionSave; - HangulHanjaConversion (const HangulHanjaConversion &) SAL_DELETED_FUNCTION; - HangulHanjaConversion & operator= (const HangulHanjaConversion &) SAL_DELETED_FUNCTION; + HangulHanjaConversion (const HangulHanjaConversion &) = delete; + HangulHanjaConversion & operator= (const HangulHanjaConversion &) = delete; public: HangulHanjaConversion( diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 69ccb523fbe0..b996ef2cd08e 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -137,7 +137,7 @@ private: friend class OutlinerUndoCheckPara; friend class OutlinerUndoChangeParaFlags; - Paragraph& operator=(const Paragraph& rPara ) SAL_DELETED_FUNCTION; + Paragraph& operator=(const Paragraph& rPara ) = delete; ParaFlag nFlags; OUString aBulText; @@ -151,7 +151,7 @@ private: const OUString& GetText() const { return aBulText; } Paragraph( sal_Int16 nDepth ); - Paragraph( const Paragraph& ) SAL_DELETED_FUNCTION; + Paragraph( const Paragraph& ) = delete; Paragraph( const ParagraphData& ); ~Paragraph(); @@ -506,7 +506,7 @@ private: sal_Int32 nPos; bool bSimpleClick; - EditFieldInfo( const EditFieldInfo& ) SAL_DELETED_FUNCTION; + EditFieldInfo( const EditFieldInfo& ) = delete; SdrPage* mpSdrPage; diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 0f8a46760607..3e5399df97ab 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -136,8 +136,8 @@ class EDITENG_DLLPUBLIC SvxAutocorrWordList struct Impl; Impl* mpImpl; - SvxAutocorrWordList( const SvxAutocorrWordList& ) SAL_DELETED_FUNCTION; - const SvxAutocorrWordList& operator= ( const SvxAutocorrWordList& ) SAL_DELETED_FUNCTION; + SvxAutocorrWordList( const SvxAutocorrWordList& ) = delete; + const SvxAutocorrWordList& operator= ( const SvxAutocorrWordList& ) = delete; const SvxAutocorrWord* WordMatches(const SvxAutocorrWord *pFnd, const OUString &rTxt, diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx index 2069152a58c9..09897e0904ee 100644 --- a/include/editeng/txtrange.hxx +++ b/include/editeng/txtrange.hxx @@ -57,7 +57,7 @@ class EDITENG_DLLPUBLIC TextRanger // FALSE: Objekt flow (StarWriter); bool bVertical :1;// for vertical writing mode - TextRanger( const TextRanger& ) SAL_DELETED_FUNCTION; + TextRanger( const TextRanger& ) = delete; const Rectangle& _GetBoundRect(); public: TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index 90071d52a5e7..9d61c2b01956 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -156,8 +156,8 @@ public: bool IsValid() const { return mbEditSourceValid;} private: - SvxEditSourceAdapter( const SvxEditSourceAdapter& ) SAL_DELETED_FUNCTION; - SvxEditSourceAdapter& operator= ( const SvxEditSourceAdapter& ) SAL_DELETED_FUNCTION; + SvxEditSourceAdapter( const SvxEditSourceAdapter& ) = delete; + SvxEditSourceAdapter& operator= ( const SvxEditSourceAdapter& ) = delete; ::std::unique_ptr< SvxEditSource > mpAdaptee; diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx index 06e890081bd4..113d1b35b8ca 100644 --- a/include/editeng/unolingu.hxx +++ b/include/editeng/unolingu.hxx @@ -81,8 +81,8 @@ class EDITENG_DLLPUBLIC LinguMgr static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetChangeAll(); - LinguMgr(const LinguMgr &) SAL_DELETED_FUNCTION; - LinguMgr & operator = (const LinguMgr &) SAL_DELETED_FUNCTION; + LinguMgr(const LinguMgr &) = delete; + LinguMgr & operator = (const LinguMgr &) = delete; public: @@ -146,8 +146,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > xDicList; - SvxDicListChgClamp(const SvxDicListChgClamp &) SAL_DELETED_FUNCTION; - SvxDicListChgClamp & operator = (const SvxDicListChgClamp &) SAL_DELETED_FUNCTION; + SvxDicListChgClamp(const SvxDicListChgClamp &) = delete; + SvxDicListChgClamp & operator = (const SvxDicListChgClamp &) = delete; public: SvxDicListChgClamp( ::com::sun::star::uno::Reference< diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 4f390f5a73be..97e19871c708 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1338,8 +1338,8 @@ public: sal_uInt16 GetHellLayerId() const { return mnHellLayerId; } private: - EscherEx( const EscherEx& ) SAL_DELETED_FUNCTION; - EscherEx& operator=( const EscherEx& ) SAL_DELETED_FUNCTION; + EscherEx( const EscherEx& ) = delete; + EscherEx& operator=( const EscherEx& ) = delete; // prevent C-style cast to former base class EscherGraphicProvider operator EscherGraphicProvider&(); diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index 3f8339910c28..f8f5b728365f 100644 --- a/include/filter/msfilter/mscodec.hxx +++ b/include/filter/msfilter/mscodec.hxx @@ -122,8 +122,8 @@ protected: sal_Size mnOffset; /// Key offset. private: - MSCodec_Xor95( const MSCodec_Xor95& ) SAL_DELETED_FUNCTION; - MSCodec_Xor95& operator=( const MSCodec_Xor95& ) SAL_DELETED_FUNCTION; + MSCodec_Xor95( const MSCodec_Xor95& ) = delete; + MSCodec_Xor95& operator=( const MSCodec_Xor95& ) = delete; sal_uInt16 mnKey; /// Base key from password. sal_uInt16 mnHash; /// Hash value from password. @@ -346,8 +346,8 @@ public: void GetDigestFromSalt( const sal_uInt8 pSaltData[16], sal_uInt8 pDigest[16] ); private: - MSCodec_Std97( const MSCodec_Std97& ) SAL_DELETED_FUNCTION; - MSCodec_Std97& operator=( const MSCodec_Std97& ) SAL_DELETED_FUNCTION; + MSCodec_Std97( const MSCodec_Std97& ) = delete; + MSCodec_Std97& operator=( const MSCodec_Std97& ) = delete; rtlCipher m_hCipher; rtlDigest m_hDigest; diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 8e6d419318f4..6d2fe9056e84 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -264,7 +264,7 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec { return nShapeId < rEntry.nShapeId; } private: - SvxMSDffImportRec &operator=(const SvxMSDffImportRec&) SAL_DELETED_FUNCTION; + SvxMSDffImportRec &operator=(const SvxMSDffImportRec&) = delete; }; /** list of all SvxMSDffImportRec instances of/for a group */ diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index 8d3704e3a5d8..efe06121754d 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -118,8 +118,8 @@ class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase sal_Int8 tbcu; sal_Int8 tbmg; - TBCExtraInfo(const TBCExtraInfo&) SAL_DELETED_FUNCTION; - TBCExtraInfo& operator = ( const TBCExtraInfo&) SAL_DELETED_FUNCTION; + TBCExtraInfo(const TBCExtraInfo&) = delete; + TBCExtraInfo& operator = ( const TBCExtraInfo&) = delete; public: TBCExtraInfo(); virtual ~TBCExtraInfo(){} @@ -283,8 +283,8 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase TBCHeader rHeader; TBCGeneralInfo controlGeneralInfo; std::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct - TBCData(const TBCData&) SAL_DELETED_FUNCTION; - TBCData& operator = ( const TBCData&) SAL_DELETED_FUNCTION; + TBCData(const TBCData&) = delete; + TBCData& operator = ( const TBCData&) = delete; public: TBCData( const TBCHeader& Header ); virtual ~TBCData(){} diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 6d6ed22dfe54..867d4f161bf3 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -66,8 +66,8 @@ typedef std::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< O class FORMULA_DLLPUBLIC FormulaCompiler { private: - FormulaCompiler(const FormulaCompiler&) SAL_DELETED_FUNCTION; - FormulaCompiler& operator=(const FormulaCompiler&) SAL_DELETED_FUNCTION; + FormulaCompiler(const FormulaCompiler&) = delete; + FormulaCompiler& operator=(const FormulaCompiler&) = delete; public: FormulaCompiler(); FormulaCompiler(FormulaTokenArray& _rArr); @@ -85,8 +85,8 @@ public: bool mbCore : 1; /// If mapping was setup by core, not filters bool mbEnglish : 1; /// If English symbols and external names - OpCodeMap( const OpCodeMap& ) SAL_DELETED_FUNCTION; - OpCodeMap& operator=( const OpCodeMap& ) SAL_DELETED_FUNCTION; + OpCodeMap( const OpCodeMap& ) = delete; + OpCodeMap& operator=( const OpCodeMap& ) = delete; public: @@ -367,8 +367,8 @@ private: { FormulaTokenRef pPrevFac; FormulaCompiler* pCompiler; - CurrentFactor( const CurrentFactor& ) SAL_DELETED_FUNCTION; - CurrentFactor& operator=( const CurrentFactor& ) SAL_DELETED_FUNCTION; + CurrentFactor( const CurrentFactor& ) = delete; + CurrentFactor& operator=( const CurrentFactor& ) = delete; public: explicit CurrentFactor( FormulaCompiler* pComp ) : pPrevFac( pComp->pCurrentFactorToken ) diff --git a/include/formula/token.hxx b/include/formula/token.hxx index c87a3c525ef9..7bf22618f3fd 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -94,7 +94,7 @@ class FormulaTokenArray; class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken { OpCode eOp; - FormulaToken& operator=( const FormulaToken& ) SAL_DELETED_FUNCTION; + FormulaToken& operator=( const FormulaToken& ) = delete; protected: const StackVar eType; // type of data diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx index 7d35c558b8e3..c2350e9d530d 100644 --- a/include/framework/menuconfiguration.hxx +++ b/include/framework/menuconfiguration.hxx @@ -76,7 +76,7 @@ private: { } - MenuAttributes(const MenuAttributes&) SAL_DELETED_FUNCTION; + MenuAttributes(const MenuAttributes&) = delete; public: OUString aTargetFrame; diff --git a/include/i18nutil/oneToOneMapping.hxx b/include/i18nutil/oneToOneMapping.hxx index cde6681e2089..76405078c340 100644 --- a/include/i18nutil/oneToOneMapping.hxx +++ b/include/i18nutil/oneToOneMapping.hxx @@ -43,8 +43,8 @@ struct UnicodePairWithFlag class I18NUTIL_DLLPUBLIC oneToOneMapping { private: - oneToOneMapping(const oneToOneMapping&) SAL_DELETED_FUNCTION; - oneToOneMapping& operator=(const oneToOneMapping&) SAL_DELETED_FUNCTION; + oneToOneMapping(const oneToOneMapping&) = delete; + oneToOneMapping& operator=(const oneToOneMapping&) = delete; public: oneToOneMapping( OneToOneMappingTable_t *rpTable, const size_t rnSize, const size_t rnUnitSize = sizeof(OneToOneMappingTable_t) ); virtual ~oneToOneMapping(); @@ -63,8 +63,8 @@ protected: class I18NUTIL_DLLPUBLIC oneToOneMappingWithFlag : public oneToOneMapping { private: - oneToOneMappingWithFlag(const oneToOneMappingWithFlag&) SAL_DELETED_FUNCTION; - oneToOneMappingWithFlag& operator=(const oneToOneMappingWithFlag&) SAL_DELETED_FUNCTION; + oneToOneMappingWithFlag(const oneToOneMappingWithFlag&) = delete; + oneToOneMappingWithFlag& operator=(const oneToOneMappingWithFlag&) = delete; friend class widthfolding; diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx index 5b0e785dec23..7b34b5f71a46 100644 --- a/include/jvmaccess/unovirtualmachine.hxx +++ b/include/jvmaccess/unovirtualmachine.hxx @@ -88,8 +88,8 @@ public: void * getClassLoader() const { return m_classLoader;} private: - UnoVirtualMachine(UnoVirtualMachine &) SAL_DELETED_FUNCTION; - void operator =(UnoVirtualMachine &) SAL_DELETED_FUNCTION; + UnoVirtualMachine(UnoVirtualMachine &) = delete; + void operator =(UnoVirtualMachine &) = delete; virtual ~UnoVirtualMachine(); diff --git a/include/jvmaccess/virtualmachine.hxx b/include/jvmaccess/virtualmachine.hxx index 0493e30d4978..b27ce89840bb 100644 --- a/include/jvmaccess/virtualmachine.hxx +++ b/include/jvmaccess/virtualmachine.hxx @@ -82,8 +82,8 @@ public: inline JNIEnv * getEnvironment() const { return m_pEnvironment; } private: - AttachGuard(AttachGuard &) SAL_DELETED_FUNCTION; - void operator =(AttachGuard) SAL_DELETED_FUNCTION; + AttachGuard(AttachGuard &) = delete; + void operator =(AttachGuard) = delete; rtl::Reference< VirtualMachine > m_xMachine; JNIEnv * m_pEnvironment; @@ -128,8 +128,8 @@ public: JNIEnv * pMainThreadEnv); private: - VirtualMachine(VirtualMachine &) SAL_DELETED_FUNCTION; - void operator =(VirtualMachine) SAL_DELETED_FUNCTION; + VirtualMachine(VirtualMachine &) = delete; + void operator =(VirtualMachine) = delete; virtual ~VirtualMachine(); diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx index 14768ca9700b..af0cb3bd54c2 100644 --- a/include/linguistic/hyphdta.hxx +++ b/include/linguistic/hyphdta.hxx @@ -41,8 +41,8 @@ class HyphenatedWord : sal_Int16 nLanguage; bool bIsAltSpelling; - HyphenatedWord(const HyphenatedWord &) SAL_DELETED_FUNCTION; - HyphenatedWord & operator = (const HyphenatedWord &) SAL_DELETED_FUNCTION; + HyphenatedWord(const HyphenatedWord &) = delete; + HyphenatedWord & operator = (const HyphenatedWord &) = delete; public: HyphenatedWord(const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos, @@ -86,8 +86,8 @@ class PossibleHyphens : ::com::sun::star::uno::Sequence< sal_Int16 > aOrigHyphenPos; sal_Int16 nLanguage; - PossibleHyphens(const PossibleHyphens &) SAL_DELETED_FUNCTION; - PossibleHyphens & operator = (const PossibleHyphens &) SAL_DELETED_FUNCTION; + PossibleHyphens(const PossibleHyphens &) = delete; + PossibleHyphens & operator = (const PossibleHyphens &) = delete; public: PossibleHyphens(const OUString &rWord, sal_Int16 nLang, diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx index 75780566766c..ce8c6b73bca3 100644 --- a/include/linguistic/lngprophelp.hxx +++ b/include/linguistic/lngprophelp.hxx @@ -75,8 +75,8 @@ class PropertyChgHelper : bool bResIsIgnoreControlCharacters; bool bResIsUseDictionaryList; - PropertyChgHelper( const PropertyChgHelper & ) SAL_DELETED_FUNCTION; - PropertyChgHelper & operator = ( const PropertyChgHelper & ) SAL_DELETED_FUNCTION; + PropertyChgHelper( const PropertyChgHelper & ) = delete; + PropertyChgHelper & operator = ( const PropertyChgHelper & ) = delete; protected: virtual void SetDefaultValues(); @@ -146,8 +146,8 @@ public: class PropertyHelper_Thes : public PropertyChgHelper { - PropertyHelper_Thes( const PropertyHelper_Thes & ) SAL_DELETED_FUNCTION; - PropertyHelper_Thes & operator = ( const PropertyHelper_Thes & ) SAL_DELETED_FUNCTION; + PropertyHelper_Thes( const PropertyHelper_Thes & ) = delete; + PropertyHelper_Thes & operator = ( const PropertyHelper_Thes & ) = delete; public: PropertyHelper_Thes( @@ -199,8 +199,8 @@ class LNG_DLLPUBLIC PropertyHelper_Spell : bool bResIsSpellWithDigits; bool bResIsSpellCapitalization; - PropertyHelper_Spell( const PropertyHelper_Spell & ) SAL_DELETED_FUNCTION; - PropertyHelper_Spell & operator = ( const PropertyHelper_Spell & ) SAL_DELETED_FUNCTION; + PropertyHelper_Spell( const PropertyHelper_Spell & ) = delete; + PropertyHelper_Spell & operator = ( const PropertyHelper_Spell & ) = delete; protected: // PropertyChgHelper @@ -279,8 +279,8 @@ class PropertyHelper_Hyphen : nResHyphMinTrailing, nResHyphMinWordLength; - PropertyHelper_Hyphen( const PropertyHelper_Hyphen & ) SAL_DELETED_FUNCTION; - PropertyHelper_Hyphen & operator = ( const PropertyHelper_Hyphen & ) SAL_DELETED_FUNCTION; + PropertyHelper_Hyphen( const PropertyHelper_Hyphen & ) = delete; + PropertyHelper_Hyphen & operator = ( const PropertyHelper_Hyphen & ) = delete; protected: // PropertyChgHelper diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx index a6de85d3e56b..78e519df4d26 100644 --- a/include/oox/core/contexthandler.hxx +++ b/include/oox/core/contexthandler.hxx @@ -98,7 +98,7 @@ protected: #endif private: - ContextHandler& operator=( const ContextHandler& ) SAL_DELETED_FUNCTION; + ContextHandler& operator=( const ContextHandler& ) = delete; private: FragmentBaseDataRef mxBaseData; ///< Base data of the fragment. diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index 048a2eca11f2..c94bda415ded 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -190,7 +190,7 @@ protected: void implEndRecord( sal_Int32 nRecId ); private: - ContextHandler2Helper& operator=( const ContextHandler2Helper& ) SAL_DELETED_FUNCTION; + ContextHandler2Helper& operator=( const ContextHandler2Helper& ) = delete; ElementInfo& pushElementInfo( sal_Int32 nElement ); void popElementInfo(); diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx index 2be69748e99e..d459f54bc428 100644 --- a/include/oox/drawingml/chart/chartconverter.hxx +++ b/include/oox/drawingml/chart/chartconverter.hxx @@ -89,8 +89,8 @@ public: const DataSequenceModel& rDataSeq, const OUString& rRole ); private: - ChartConverter( const ChartConverter& ) SAL_DELETED_FUNCTION; - ChartConverter& operator=( const ChartConverter& ) SAL_DELETED_FUNCTION; + ChartConverter( const ChartConverter& ) = delete; + ChartConverter& operator=( const ChartConverter& ) = delete; }; diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index f9d3a1b9b34d..8e5355e2069d 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -1094,8 +1094,8 @@ public: explicit IndentGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.incIndent(); } ~IndentGuard() { mrOut.decIndent(); } private: - IndentGuard( const IndentGuard& ) SAL_DELETED_FUNCTION; - IndentGuard& operator=( const IndentGuard& ) SAL_DELETED_FUNCTION; + IndentGuard( const IndentGuard& ) = delete; + IndentGuard& operator=( const IndentGuard& ) = delete; private: Output& mrOut; }; @@ -1117,8 +1117,8 @@ public: ~TableGuard() { mrOut.endTable(); } void tab( size_t nCol ) { mrOut.tab( nCol ); } private: - TableGuard( const TableGuard& ) SAL_DELETED_FUNCTION; - TableGuard& operator=( const TableGuard& ) SAL_DELETED_FUNCTION; + TableGuard( const TableGuard& ) = delete; + TableGuard& operator=( const TableGuard& ) = delete; private: Output& mrOut; }; @@ -1133,8 +1133,8 @@ public: ~ItemGuard() { mrOut.endItem(); } void cont() { mrOut.contItem(); } private: - ItemGuard( const ItemGuard& ) SAL_DELETED_FUNCTION; - ItemGuard& operator=( const ItemGuard& ) SAL_DELETED_FUNCTION; + ItemGuard( const ItemGuard& ) = delete; + ItemGuard& operator=( const ItemGuard& ) = delete; private: Output& mrOut; }; @@ -1147,8 +1147,8 @@ public: explicit MultiItemsGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.startMultiItems(); } ~MultiItemsGuard() { mrOut.endMultiItems(); } private: - MultiItemsGuard( const MultiItemsGuard& ) SAL_DELETED_FUNCTION; - MultiItemsGuard& operator=( const MultiItemsGuard& ) SAL_DELETED_FUNCTION; + MultiItemsGuard( const MultiItemsGuard& ) = delete; + MultiItemsGuard& operator=( const MultiItemsGuard& ) = delete; private: Output& mrOut; }; diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index 9f669a9fff30..4078fc68f5ac 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -107,8 +107,8 @@ protected: explicit BinaryStreamBase( bool bSeekable ) : mbEof( false ), mbSeekable( bSeekable ) {} private: - BinaryStreamBase( const BinaryStreamBase& ) SAL_DELETED_FUNCTION; - BinaryStreamBase& operator=( const BinaryStreamBase& ) SAL_DELETED_FUNCTION; + BinaryStreamBase( const BinaryStreamBase& ) = delete; + BinaryStreamBase& operator=( const BinaryStreamBase& ) = delete; protected: bool mbEof; ///< End of stream flag. diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index 52196dab93c1..f073b292de2d 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -138,8 +138,8 @@ protected: explicit StorageBase( const StorageBase& rParentStorage, const OUString& rStorageName, bool bReadOnly ); private: - StorageBase( const StorageBase& ) SAL_DELETED_FUNCTION; - StorageBase& operator=( const StorageBase& ) SAL_DELETED_FUNCTION; + StorageBase( const StorageBase& ) = delete; + StorageBase& operator=( const StorageBase& ) = delete; /** Returns true, if the object represents a valid storage. */ virtual bool implIsStorage() const = 0; diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 6325b23fe12a..dac147affb23 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -153,8 +153,8 @@ protected: virtual void prepareImport(); private: - VbaProject( const VbaProject& ) SAL_DELETED_FUNCTION; - VbaProject& operator=( const VbaProject& ) SAL_DELETED_FUNCTION; + VbaProject( const VbaProject& ) = delete; + VbaProject& operator=( const VbaProject& ) = delete; /** Returns the Basic or dialog library container. */ ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > diff --git a/include/registry/writer.hxx b/include/registry/writer.hxx index d1d04dd8f0fa..d7c94faf7dd5 100644 --- a/include/registry/writer.hxx +++ b/include/registry/writer.hxx @@ -278,8 +278,8 @@ public: } private: - Writer(Writer &) SAL_DELETED_FUNCTION; - void operator =(Writer) SAL_DELETED_FUNCTION; + Writer(Writer &) = delete; + void operator =(Writer) = delete; void * m_handle; }; diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx index 0cd51ecf163d..fa265a34a331 100644 --- a/include/sfx2/Metadatable.hxx +++ b/include/sfx2/Metadatable.hxx @@ -120,8 +120,8 @@ public: ::com::sun::star::rdf::XMetadatable > MakeUnoObject() = 0; private: - Metadatable(const Metadatable&) SAL_DELETED_FUNCTION; - Metadatable& operator=(const Metadatable&) SAL_DELETED_FUNCTION; + Metadatable(const Metadatable&) = delete; + Metadatable& operator=(const Metadatable&) = delete; friend class MetadatableClipboard; friend class MetadatableUndo; diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 4287d1df9a2a..176e248f6894 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -60,8 +60,8 @@ class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog SfxItemSet* pOutputSet; private: - SfxModalDialog(SfxModalDialog &) SAL_DELETED_FUNCTION; - void operator =(SfxModalDialog &) SAL_DELETED_FUNCTION; + SfxModalDialog(SfxModalDialog &) = delete; + void operator =(SfxModalDialog &) = delete; SAL_DLLPRIVATE void SetDialogData_Impl(); SAL_DLLPRIVATE void GetDialogData_Impl(); @@ -94,8 +94,8 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog Size aSize; SfxModelessDialog_Impl* pImp; - SfxModelessDialog(SfxModelessDialog &) SAL_DELETED_FUNCTION; - void operator =(SfxModelessDialog &) SAL_DELETED_FUNCTION; + SfxModelessDialog(SfxModelessDialog &) = delete; + void operator =(SfxModelessDialog &) = delete; void Init(SfxBindings *pBindinx, SfxChildWindow *pCW); @@ -128,8 +128,8 @@ class SFX2_DLLPUBLIC SfxFloatingWindow: public FloatingWindow Size aSize; SfxFloatingWindow_Impl* pImp; - SfxFloatingWindow(SfxFloatingWindow &) SAL_DELETED_FUNCTION; - void operator =(SfxFloatingWindow &) SAL_DELETED_FUNCTION; + SfxFloatingWindow(SfxFloatingWindow &) = delete; + void operator =(SfxFloatingWindow &) = delete; protected: SfxFloatingWindow( SfxBindings *pBindings, diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index 42aaab620fbd..5ef71e41e0bc 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -162,8 +162,8 @@ public: virtual void SetControlDontKnow( bool bSet ) = 0; private: - ControlWrapperBase( const ControlWrapperBase& ) SAL_DELETED_FUNCTION; - ControlWrapperBase& operator=( const ControlWrapperBase& ) SAL_DELETED_FUNCTION; + ControlWrapperBase( const ControlWrapperBase& ) = delete; + ControlWrapperBase& operator=( const ControlWrapperBase& ) = delete; }; diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx index ea8d0e8b5060..ccc1baa086c9 100644 --- a/include/sfx2/docfac.hxx +++ b/include/sfx2/docfac.hxx @@ -82,8 +82,8 @@ public: SAL_DLLPRIVATE sal_uInt16 GetViewNo_Impl( const sal_uInt16 i_nViewId, const sal_uInt16 i_nFallback ) const; private: - SfxObjectFactory(const SfxObjectFactory&) SAL_DELETED_FUNCTION; - const SfxObjectFactory& operator=(const SfxObjectFactory &) SAL_DELETED_FUNCTION; + SfxObjectFactory(const SfxObjectFactory&) = delete; + const SfxObjectFactory& operator=(const SfxObjectFactory &) = delete; }; #define SFX_DECL_OBJECTFACTORY() \ diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 1933be7cd757..984fa53ae892 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -47,8 +47,8 @@ private: SfxChildWindow* pMgr; SfxDockingWindow_Impl* pImp; - SfxDockingWindow(SfxDockingWindow &) SAL_DELETED_FUNCTION; - void operator =(SfxDockingWindow &) SAL_DELETED_FUNCTION; + SfxDockingWindow(SfxDockingWindow &) = delete; + void operator =(SfxDockingWindow &) = delete; protected: SfxChildAlignment CalcAlignment(const Point& rPos, Rectangle& rRect ); diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx index e2b845ed589f..740f5c3334c0 100644 --- a/include/sfx2/docstoragemodifylistener.hxx +++ b/include/sfx2/docstoragemodifylistener.hxx @@ -73,8 +73,8 @@ namespace sfx2 virtual ~DocumentStorageModifyListener(); private: - DocumentStorageModifyListener( const DocumentStorageModifyListener& ) SAL_DELETED_FUNCTION; - DocumentStorageModifyListener& operator=( const DocumentStorageModifyListener& ) SAL_DELETED_FUNCTION; + DocumentStorageModifyListener( const DocumentStorageModifyListener& ) = delete; + DocumentStorageModifyListener& operator=( const DocumentStorageModifyListener& ) = delete; }; diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index ceaea4963b7d..1f10eaa2a6ed 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -206,8 +206,8 @@ protected: TriState GetShowState( bool bKnown ) const; private: - ItemConnectionBase( const ItemConnectionBase& ) SAL_DELETED_FUNCTION; - ItemConnectionBase& operator=( const ItemConnectionBase& ) SAL_DELETED_FUNCTION; + ItemConnectionBase( const ItemConnectionBase& ) = delete; + ItemConnectionBase& operator=( const ItemConnectionBase& ) = delete; ItemConnFlags mnFlags; /// Flags for additional options. }; diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index 6d4bc03fd6ae..24a23dfa6e02 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.hxx @@ -160,8 +160,8 @@ public: Graphic& rGrf ); private: - LinkManager( const LinkManager& ) SAL_DELETED_FUNCTION; - LinkManager& operator=( const LinkManager& ) SAL_DELETED_FUNCTION; + LinkManager( const LinkManager& ) = delete; + LinkManager& operator=( const LinkManager& ) = delete; }; // Separator in the link name for the DDE-/File-/Graphics- links diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index ab0292ccf00e..57dc874ab781 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -75,8 +75,8 @@ private: // if we don't delete the pointer that got created in SfxPopupMenuManager::Popup static PopupMenu * pStaticThesSubMenu; - SfxPopupMenuManager( const SfxPopupMenuManager& ) SAL_DELETED_FUNCTION; - SfxPopupMenuManager& operator=( const SfxPopupMenuManager& ) SAL_DELETED_FUNCTION; + SfxPopupMenuManager( const SfxPopupMenuManager& ) = delete; + SfxPopupMenuManager& operator=( const SfxPopupMenuManager& ) = delete; public: SfxPopupMenuManager( PopupMenu*, SfxBindings& ); diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx index 69d5295436b8..bde7adbdfd19 100644 --- a/include/sfx2/opengrf.hxx +++ b/include/sfx2/opengrf.hxx @@ -46,8 +46,8 @@ public: OUString GetCurrentFilter() const; void SetCurrentFilter(const OUString&); private: - SvxOpenGraphicDialog (const SvxOpenGraphicDialog&) SAL_DELETED_FUNCTION; - SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & ) SAL_DELETED_FUNCTION; + SvxOpenGraphicDialog (const SvxOpenGraphicDialog&) = delete; + SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & ) = delete; const std::unique_ptr< SvxOpenGrf_Impl > mpImpl; }; diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx index dbcb94611c8f..18406941ebd8 100644 --- a/include/sfx2/printer.hxx +++ b/include/sfx2/printer.hxx @@ -39,7 +39,7 @@ private: SfxPrinter_Impl* pImpl; bool bKnown; - SAL_DLLPRIVATE void operator =(SfxPrinter &) SAL_DELETED_FUNCTION; + SAL_DLLPRIVATE void operator =(SfxPrinter &) = delete; public: SfxPrinter( SfxItemSet *pTheOptions ); diff --git a/include/sfx2/querystatus.hxx b/include/sfx2/querystatus.hxx index 628fe451e3c6..af071b107cac 100644 --- a/include/sfx2/querystatus.hxx +++ b/include/sfx2/querystatus.hxx @@ -42,8 +42,8 @@ class SFX2_DLLPUBLIC SfxQueryStatus SfxItemState QueryState( SfxPoolItem*& pPoolItem ); private: - SfxQueryStatus( const SfxQueryStatus& ) SAL_DELETED_FUNCTION; - SfxQueryStatus& operator=( const SfxQueryStatus& ) SAL_DELETED_FUNCTION; + SfxQueryStatus( const SfxQueryStatus& ) = delete; + SfxQueryStatus& operator=( const SfxQueryStatus& ) = delete; com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > m_xStatusListener; SfxQueryStatus_Impl* m_pSfxQueryStatusImpl; diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index c796d0cd66dc..e9ac976a5025 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -107,7 +107,7 @@ public: void ForgetAllArgs(); private: - const SfxRequest& operator=(const SfxRequest &) SAL_DELETED_FUNCTION; + const SfxRequest& operator=(const SfxRequest &) = delete; }; template<class T> bool checkSfxPoolItem(const SfxPoolItem* pItem) diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx index 779a51c41e12..384c3c4293a5 100644 --- a/include/sfx2/sfxstatuslistener.hxx +++ b/include/sfx2/sfxstatuslistener.hxx @@ -60,8 +60,8 @@ class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2< virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: - SfxStatusListener( const SfxStatusListener& ) SAL_DELETED_FUNCTION; - SfxStatusListener& operator=( const SfxStatusListener& ) SAL_DELETED_FUNCTION; + SfxStatusListener( const SfxStatusListener& ) = delete; + SfxStatusListener& operator=( const SfxStatusListener& ) = delete; sal_uInt16 m_nSlotID; ::com::sun::star::util::URL m_aCommand; diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 28934216b54c..c9391a0b1749 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -142,8 +142,8 @@ class SFX2_DLLPUBLIC SfxShell: public SfxBroadcaster ::svl::IUndoManager* pUndoMgr; private: - SfxShell( const SfxShell & ) SAL_DELETED_FUNCTION; - SfxShell& operator = ( const SfxShell & ) SAL_DELETED_FUNCTION; + SfxShell( const SfxShell & ) = delete; + SfxShell& operator = ( const SfxShell & ) = delete; protected: /** diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index e0a1f0563ada..caa305582d5e 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -81,8 +81,8 @@ friend class SfxFrameStatusListener; private: SfxFrameStatusListener* GetOrCreateStatusListener(); - SfxPopupWindow(SfxPopupWindow &) SAL_DELETED_FUNCTION; - void operator =(SfxPopupWindow &) SAL_DELETED_FUNCTION; + SfxPopupWindow(SfxPopupWindow &) = delete; + void operator =(SfxPopupWindow &) = delete; void Delete(); protected: diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx index 659dae88214c..03bdea2b4d11 100644 --- a/include/sot/factory.hxx +++ b/include/sot/factory.hxx @@ -56,8 +56,8 @@ public: bool Is( const SotFactory * pSuperClass ) const; private: - SotFactory( const SotFactory & ) SAL_DELETED_FUNCTION; - SotFactory & operator = ( const SotFactory & ) SAL_DELETED_FUNCTION; + SotFactory( const SotFactory & ) = delete; + SotFactory & operator = ( const SotFactory & ) = delete; }; #endif // _FACTORY_HXX diff --git a/include/sot/object.hxx b/include/sot/object.hxx index 4d140969c286..6699d925e0d2 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -55,8 +55,8 @@ public: bool IsInClose() const { return bInClose; } private: - SotObject & operator = ( const SotObject & ) SAL_DELETED_FUNCTION; - SotObject( const SotObject & ) SAL_DELETED_FUNCTION; + SotObject & operator = ( const SotObject & ) = delete; + SotObject( const SotObject & ) = delete; }; #endif // _IFACE_HXX diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx index fc21f37f0bd4..c44e96ded1b4 100644 --- a/include/svl/SfxBroadcaster.hxx +++ b/include/svl/SfxBroadcaster.hxx @@ -34,7 +34,7 @@ class SVL_DLLPUBLIC SfxBroadcaster private: void AddListener( SfxListener& rListener ); void RemoveListener( SfxListener& rListener ); - const SfxBroadcaster& operator=(const SfxBroadcaster &) SAL_DELETED_FUNCTION; + const SfxBroadcaster& operator=(const SfxBroadcaster &) = delete; protected: void Forward(SfxBroadcaster& rBC, const SfxHint& rHint); diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx index f34c0ad4c12f..934f591c3ba7 100644 --- a/include/svl/broadcast.hxx +++ b/include/svl/broadcast.hxx @@ -34,7 +34,7 @@ public: typedef std::vector<SvtListener*> ListenersType; private: - const SvtBroadcaster& operator=(const SvtBroadcaster &) SAL_DELETED_FUNCTION; + const SvtBroadcaster& operator=(const SvtBroadcaster &) = delete; /** * Ensure that the container doesn't contain any duplicated listener diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index fad39beded6d..3f7db59cc996 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -92,8 +92,8 @@ public: sal_uInt32 Close( bool bSeekToEndOfRec = true ); private: - SfxMiniRecordWriter( const SfxMiniRecordWriter& ) SAL_DELETED_FUNCTION; - SfxMiniRecordWriter& operator=(const SfxMiniRecordWriter&) SAL_DELETED_FUNCTION; + SfxMiniRecordWriter( const SfxMiniRecordWriter& ) = delete; + SfxMiniRecordWriter& operator=(const SfxMiniRecordWriter&) = delete; }; /** Reads simple record from a stream @@ -262,8 +262,8 @@ public: inline void Skip(); private: - SfxMiniRecordReader( const SfxMiniRecordReader& ) SAL_DELETED_FUNCTION; - SfxMiniRecordReader& operator=(const SfxMiniRecordReader&) SAL_DELETED_FUNCTION; + SfxMiniRecordReader( const SfxMiniRecordReader& ) = delete; + SfxMiniRecordReader& operator=(const SfxMiniRecordReader&) = delete; }; /** diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index fd4ff0356274..90a12bbb70fd 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.hxx @@ -51,8 +51,8 @@ class SVL_DLLPUBLIC INetURLHistory : public SfxBroadcaster /** Not implemented. */ - INetURLHistory (const INetURLHistory&) SAL_DELETED_FUNCTION; - INetURLHistory& operator= (const INetURLHistory&) SAL_DELETED_FUNCTION; + INetURLHistory (const INetURLHistory&) = delete; + INetURLHistory& operator= (const INetURLHistory&) = delete; public: /** GetOrCreate. diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index efc1c4a254c1..8098e415572a 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -221,7 +221,7 @@ public: static const SfxItemPool* GetStoringPool(); private: - const SfxItemPool& operator=(const SfxItemPool &) SAL_DELETED_FUNCTION; + const SfxItemPool& operator=(const SfxItemPool &) = delete; static const SfxItemPool* pStoringPool_; }; diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index f706e42fe01a..7203a5eaa876 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -60,7 +60,7 @@ public: SfxItemArray GetItems_Impl() const { return m_pItems; } private: - const SfxItemSet& operator=(const SfxItemSet &) SAL_DELETED_FUNCTION; + const SfxItemSet& operator=(const SfxItemSet &) = delete; protected: // Notification-Callback diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx index ed809faa4974..8ac8e08e91b3 100644 --- a/include/svl/listener.hxx +++ b/include/svl/listener.hxx @@ -31,7 +31,7 @@ class SVL_DLLPUBLIC SvtListener typedef std::unordered_set<SvtBroadcaster*> BroadcastersType; BroadcastersType maBroadcasters; - const SvtListener& operator=(const SvtListener &) SAL_DELETED_FUNCTION; + const SvtListener& operator=(const SvtListener &) = delete; public: class SVL_DLLPUBLIC QueryBase diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx index 521c1979f9f3..e3ce43ff9cf0 100644 --- a/include/svl/lstner.hxx +++ b/include/svl/lstner.hxx @@ -31,7 +31,7 @@ class SVL_DLLPUBLIC SfxListener Impl* mpImpl; private: - const SfxListener& operator=(const SfxListener &) SAL_DELETED_FUNCTION; + const SfxListener& operator=(const SfxListener &) = delete; public: TYPEINFO(); diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 8046edaea427..b60c2be13f4f 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -147,7 +147,7 @@ private: SvxMacroTableDtor aMacroTable; inline SvxMacroItem( const SvxMacroItem& ); - SvxMacroItem &operator=( const SvxMacroItem & ) SAL_DELETED_FUNCTION; + SvxMacroItem &operator=( const SvxMacroItem & ) = delete; }; inline SvxMacroItem::SvxMacroItem( const sal_uInt16 nId ) diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index ad221b1b9c3e..edd9e2e91136 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -193,7 +193,7 @@ public: virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const; private: - SfxPoolItem& operator=( const SfxPoolItem& ) SAL_DELETED_FUNCTION; + SfxPoolItem& operator=( const SfxPoolItem& ) = delete; }; inline void SfxPoolItem::SetRefCount( sal_uLong n ) @@ -250,7 +250,7 @@ inline bool IsInvalidItem(const SfxPoolItem *pItem) class SVL_DLLPUBLIC SfxVoidItem: public SfxPoolItem { - SfxVoidItem & operator=( const SfxVoidItem& ) SAL_DELETED_FUNCTION; + SfxVoidItem & operator=( const SfxVoidItem& ) = delete; public: TYPEINFO_OVERRIDE(); explicit SfxVoidItem( sal_uInt16 nWhich ); @@ -274,7 +274,7 @@ class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem { SfxItemSet *pSet; - SfxSetItem & operator=( const SfxSetItem& ) SAL_DELETED_FUNCTION; + SfxSetItem & operator=( const SfxSetItem& ) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/include/svl/sharedstringpool.hxx b/include/svl/sharedstringpool.hxx index f44810b419c6..ae958ed220c4 100644 --- a/include/svl/sharedstringpool.hxx +++ b/include/svl/sharedstringpool.hxx @@ -29,8 +29,8 @@ class SVL_DLLPUBLIC SharedStringPool struct Impl; Impl* mpImpl; - SharedStringPool( const SharedStringPool& ) SAL_DELETED_FUNCTION; - SharedStringPool& operator=( const SharedStringPool& ) SAL_DELETED_FUNCTION; + SharedStringPool( const SharedStringPool& ) = delete; + SharedStringPool& operator=( const SharedStringPool& ) = delete; public: SharedStringPool( const CharClass* pCharClass ); diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 65bb65dd56c0..c634ae135000 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -127,8 +127,8 @@ private: friend class DdeInternal; friend class DdeConnection; - DdeTransaction( const DdeTransaction& ) SAL_DELETED_FUNCTION; - const DdeTransaction& operator= ( const DdeTransaction& ) SAL_DELETED_FUNCTION; + DdeTransaction( const DdeTransaction& ) = delete; + const DdeTransaction& operator= ( const DdeTransaction& ) = delete; }; @@ -230,8 +230,8 @@ public: const OUString GetTopicName(); private: - DdeConnection( const DdeConnection& ) SAL_DELETED_FUNCTION; - const DdeConnection& operator= ( const DdeConnection& ) SAL_DELETED_FUNCTION; + DdeConnection( const DdeConnection& ) = delete; + const DdeConnection& operator= ( const DdeConnection& ) = delete; }; @@ -325,8 +325,8 @@ public: const std::vector<DdeItem*>& GetItems() const { return aItems; } private: - DdeTopic( const DdeTopic& ) SAL_DELETED_FUNCTION; - const DdeTopic& operator= ( const DdeTopic& ) SAL_DELETED_FUNCTION; + DdeTopic( const DdeTopic& ) = delete; + const DdeTopic& operator= ( const DdeTopic& ) = delete; }; diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index bbae41f66cfb..bfb7f617de71 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -73,8 +73,8 @@ public: virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const; private: - SfxUndoAction( const SfxUndoAction& ) SAL_DELETED_FUNCTION; - SfxUndoAction& operator=( const SfxUndoAction& ) SAL_DELETED_FUNCTION; + SfxUndoAction( const SfxUndoAction& ) = delete; + SfxUndoAction& operator=( const SfxUndoAction& ) = delete; }; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index c1b79e0ddf58..8703a031a05f 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -215,8 +215,8 @@ class SVL_DLLPUBLIC NfCurrencyEntry sal_uInt16 nDigits; /// count of decimal digits sal_Unicode cZeroChar; /// which character is used for zeros as last decimal digits - NfCurrencyEntry( const NfCurrencyEntry& ) SAL_DELETED_FUNCTION; - NfCurrencyEntry& operator=( const NfCurrencyEntry& ) SAL_DELETED_FUNCTION; + NfCurrencyEntry( const NfCurrencyEntry& ) = delete; + NfCurrencyEntry& operator=( const NfCurrencyEntry& ) = delete; private: diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index 4b099e0169f5..975b44def6f9 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -218,8 +218,8 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit */ SVT_DLLPRIVATE AcceleratorExecute(); - AcceleratorExecute(const AcceleratorExecute& rCopy) SAL_DELETED_FUNCTION; - void operator=(const AcceleratorExecute&) SAL_DELETED_FUNCTION; + AcceleratorExecute(const AcceleratorExecute& rCopy) = delete; + void operator=(const AcceleratorExecute&) = delete; /** TODO document me */ SVT_DLLPRIVATE OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey); diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx index 3333027d4391..2e7d8c0dda72 100644 --- a/include/svtools/contextmenuhelper.hxx +++ b/include/svtools/contextmenuhelper.hxx @@ -65,8 +65,8 @@ class SVT_DLLPUBLIC ContextMenuHelper // asynchronous link to prevent destruction while on stack DECL_STATIC_LINK_TYPED( ContextMenuHelper, ExecuteHdl_Impl, void*, void ); - ContextMenuHelper( const ContextMenuHelper& ) SAL_DELETED_FUNCTION; - const ContextMenuHelper& operator=( const ContextMenuHelper& ) SAL_DELETED_FUNCTION; + ContextMenuHelper( const ContextMenuHelper& ) = delete; + const ContextMenuHelper& operator=( const ContextMenuHelper& ) = delete; // show context menu and dispatch command automatically void executePopupMenu( const Point& aPos, PopupMenu* pMenu ); diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index eedb574af60e..bdecb651e967 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -194,8 +194,8 @@ public: } private: - ColorListBox( const ColorListBox& ) SAL_DELETED_FUNCTION; - ColorListBox& operator =( const ColorListBox& ) SAL_DELETED_FUNCTION; + ColorListBox( const ColorListBox& ) = delete; + ColorListBox& operator =( const ColorListBox& ) = delete; }; inline void ColorListBox::SelectEntry( const Color& rColor, bool bSelect ) @@ -345,8 +345,8 @@ protected: Color GetColorDist( sal_Int32 nPos = 0 ); private: - LineListBox( const LineListBox& ) SAL_DELETED_FUNCTION; - LineListBox& operator =( const LineListBox& ) SAL_DELETED_FUNCTION; + LineListBox( const LineListBox& ) = delete; + LineListBox& operator =( const LineListBox& ) = delete; }; inline void LineListBox::SetColor( const Color& rColor ) @@ -401,8 +401,8 @@ public: private: void InitFontMRUEntriesFile(); - FontNameBox( const FontNameBox& ) SAL_DELETED_FUNCTION; - FontNameBox& operator =( const FontNameBox& ) SAL_DELETED_FUNCTION; + FontNameBox( const FontNameBox& ) = delete; + FontNameBox& operator =( const FontNameBox& ) = delete; }; class SVT_DLLPUBLIC FontStyleBox : public ComboBox @@ -425,8 +425,8 @@ public: void Fill( const OUString& rName, const FontList* pList ); private: - FontStyleBox( const FontStyleBox& ) SAL_DELETED_FUNCTION; - FontStyleBox& operator =( const FontStyleBox& ) SAL_DELETED_FUNCTION; + FontStyleBox( const FontStyleBox& ) = delete; + FontStyleBox& operator =( const FontStyleBox& ) = delete; }; inline void FontStyleBox::SetText( const OUString& rText ) @@ -481,8 +481,8 @@ public: virtual sal_Int64 GetValue() const SAL_OVERRIDE; private: - FontSizeBox( const FontSizeBox& ) SAL_DELETED_FUNCTION; - FontSizeBox& operator =( const FontSizeBox& ) SAL_DELETED_FUNCTION; + FontSizeBox( const FontSizeBox& ) = delete; + FontSizeBox& operator =( const FontSizeBox& ) = delete; }; #endif // INCLUDED_SVTOOLS_CTRLBOX_HXX diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index 9d5c50119cce..6bec2bd8e25e 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -195,8 +195,8 @@ public: static const sal_IntPtr* GetStdSizeAry() { return aStdSizeAry; } private: - FontList( const FontList& ) SAL_DELETED_FUNCTION; - FontList& operator =( const FontList& ) SAL_DELETED_FUNCTION; + FontList( const FontList& ) = delete; + FontList& operator =( const FontList& ) = delete; }; class SVT_DLLPUBLIC FontSizeNames diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index 47ef7497e475..fc3fa11f79a4 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -118,8 +118,8 @@ namespace svt DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void ); private: - DialogController( const DialogController& ) SAL_DELETED_FUNCTION; - DialogController& operator=( const DialogController& ) SAL_DELETED_FUNCTION; + DialogController( const DialogController& ) = delete; + DialogController& operator=( const DialogController& ) = delete; }; typedef std::shared_ptr< DialogController > PDialogController; @@ -179,8 +179,8 @@ namespace svt void addController( const PDialogController& _pController ); private: - ControlDependencyManager( const ControlDependencyManager& ) SAL_DELETED_FUNCTION; - ControlDependencyManager& operator=( const ControlDependencyManager& ) SAL_DELETED_FUNCTION; + ControlDependencyManager( const ControlDependencyManager& ) = delete; + ControlDependencyManager& operator=( const ControlDependencyManager& ) = delete; }; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index afe8adccbaae..819e7fdd6650 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -451,8 +451,8 @@ namespace svt }; private: - EditBrowseBox(EditBrowseBox&) SAL_DELETED_FUNCTION; - EditBrowseBox& operator=(EditBrowseBox&) SAL_DELETED_FUNCTION; + EditBrowseBox(EditBrowseBox&) = delete; + EditBrowseBox& operator=(EditBrowseBox&) = delete; class BrowserMouseEventPtr { diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx index ff899cd0fd23..b1b33282f05d 100644 --- a/include/svtools/embedhlp.hxx +++ b/include/svtools/embedhlp.hxx @@ -50,7 +50,7 @@ class SVT_DLLPUBLIC EmbeddedObjectRef SVT_DLLPRIVATE SvStream* GetGraphicStream( bool bUpdate ) const; SVT_DLLPRIVATE void GetReplacement( bool bUpdate ); - EmbeddedObjectRef& operator = ( const EmbeddedObjectRef& ) SAL_DELETED_FUNCTION; + EmbeddedObjectRef& operator = ( const EmbeddedObjectRef& ) = delete; public: static void DrawPaintReplacement( const Rectangle &rRect, const OUString &rText, OutputDevice *pOut ); diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx index 20e65873cb54..d636d9e2f4e4 100644 --- a/include/svtools/javacontext.hxx +++ b/include/svtools/javacontext.hxx @@ -63,8 +63,8 @@ namespace svt throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - JavaContext(JavaContext&) SAL_DELETED_FUNCTION; - JavaContext& operator = (JavaContext&) SAL_DELETED_FUNCTION; + JavaContext(JavaContext&) = delete; + JavaContext& operator = (JavaContext&) = delete; oslInterlockedCount m_aRefCount; diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx index 7b0d00defe40..4346d8fdf222 100644 --- a/include/svtools/javainteractionhandler.hxx +++ b/include/svtools/javainteractionhandler.hxx @@ -57,8 +57,8 @@ public: private: oslInterlockedCount m_aRefCount; - JavaInteractionHandler(JavaInteractionHandler const&) SAL_DELETED_FUNCTION; - JavaInteractionHandler& operator = (JavaInteractionHandler const &) SAL_DELETED_FUNCTION; + JavaInteractionHandler(JavaInteractionHandler const&) = delete; + JavaInteractionHandler& operator = (JavaInteractionHandler const &) = delete; SVT_DLLPRIVATE virtual ~JavaInteractionHandler(); bool m_bShowErrorsOnce; bool m_bJavaDisabled_Handled; diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 116f0c80d7ba..aaa88c4189e0 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -698,8 +698,8 @@ private: SVT_DLLPRIVATE void ImplDrag( const Point& rPos ); SVT_DLLPRIVATE void ImplEndDrag(); - Ruler (const Ruler &) SAL_DELETED_FUNCTION; - Ruler& operator= (const Ruler &) SAL_DELETED_FUNCTION; + Ruler (const Ruler &) = delete; + Ruler& operator= (const Ruler &) = delete; protected: long GetRulerVirHeight() const { return mnVirHeight;} diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx index 47e1e4a19743..af3b82634e12 100644 --- a/include/svtools/scriptedtext.hxx +++ b/include/svtools/scriptedtext.hxx @@ -41,7 +41,7 @@ class SVT_DLLPUBLIC SvtScriptedTextHelper private: SvtScriptedTextHelper_Impl* mpImpl; /// Implementation of class functionality. - SvtScriptedTextHelper& operator=( const SvtScriptedTextHelper& ) SAL_DELETED_FUNCTION; + SvtScriptedTextHelper& operator=( const SvtScriptedTextHelper& ) = delete; public: /** Constructor sets an output device and no fonts. diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index b58031d8c430..cc8286ef14d7 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -405,8 +405,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > mxDragGestureRecognizer; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener > mxDragGestureListener; - DragSourceHelper& operator=( const DragSourceHelper& rDragSourceHelper ) SAL_DELETED_FUNCTION; - bool operator==( const DragSourceHelper& rDragSourceHelper ) const SAL_DELETED_FUNCTION; + DragSourceHelper& operator=( const DragSourceHelper& rDragSourceHelper ) = delete; + bool operator==( const DragSourceHelper& rDragSourceHelper ) const = delete; public: @@ -455,9 +455,9 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener > mxDropTargetListener; DataFlavorExVector* mpFormats; - DropTargetHelper() SAL_DELETED_FUNCTION; - DropTargetHelper& operator=( const DropTargetHelper& rDropTargetHelper ) SAL_DELETED_FUNCTION; - bool operator==( const DropTargetHelper& rDropTargetHelper ) const SAL_DELETED_FUNCTION; + DropTargetHelper() = delete; + DropTargetHelper& operator=( const DropTargetHelper& rDropTargetHelper ) = delete; + bool operator==( const DropTargetHelper& rDropTargetHelper ) const = delete; void ImplConstruct(); diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index 26e3f90d63b4..873b9bb822bb 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -127,8 +127,8 @@ class SVT_DLLPUBLIC SvTreeList SVT_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent ); SVT_DLLPRIVATE void ReverseChildren( SvTreeListEntry* pParent ); - SvTreeList(const SvTreeList&) SAL_DELETED_FUNCTION; - SvTreeList& operator= (const SvTreeList&) SAL_DELETED_FUNCTION; + SvTreeList(const SvTreeList&) = delete; + SvTreeList& operator= (const SvTreeList&) = delete; protected: SvTreeListEntry* pRootItem; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 7215a2c4a0ff..8d41a49bd4ce 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -274,8 +274,8 @@ private: DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void ); - ValueSet (const ValueSet &) SAL_DELETED_FUNCTION; - ValueSet & operator= (const ValueSet &) SAL_DELETED_FUNCTION; + ValueSet (const ValueSet &) = delete; + ValueSet & operator= (const ValueSet &) = delete; protected: bool StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion ); diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index 921ab112ba2b..07fc6f005b37 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -35,7 +35,7 @@ class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xWin; - XWindowItem & operator = ( const XWindowItem & ) SAL_DELETED_FUNCTION; + XWindowItem & operator = ( const XWindowItem & ) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx index 45b1d0a8897c..e29b5a7a1bdc 100644 --- a/include/svx/AccessibleControlShape.hxx +++ b/include/svx/AccessibleControlShape.hxx @@ -193,9 +193,9 @@ private: bool m_bWaitingForControl : 1; // if we are created before our control exists, we need to wait for it to appear ... private: - AccessibleControlShape(const AccessibleControlShape&) SAL_DELETED_FUNCTION; + AccessibleControlShape(const AccessibleControlShape&) = delete; - AccessibleControlShape& operator= (const AccessibleControlShape&) SAL_DELETED_FUNCTION; + AccessibleControlShape& operator= (const AccessibleControlShape&) = delete; }; } // end of namespace accessibility diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx index d4b88080ecfe..45dcfa394ab2 100644 --- a/include/svx/AccessibleGraphicShape.hxx +++ b/include/svx/AccessibleGraphicShape.hxx @@ -99,9 +99,9 @@ protected: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - AccessibleGraphicShape (const AccessibleGraphicShape&) SAL_DELETED_FUNCTION; + AccessibleGraphicShape (const AccessibleGraphicShape&) = delete; - AccessibleGraphicShape& operator= (const AccessibleGraphicShape&) SAL_DELETED_FUNCTION; + AccessibleGraphicShape& operator= (const AccessibleGraphicShape&) = delete; }; } // end of namespace accessibility diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx index 5ff85ada3468..082d6f647b20 100644 --- a/include/svx/AccessibleOLEShape.hxx +++ b/include/svx/AccessibleOLEShape.hxx @@ -105,9 +105,9 @@ protected: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - AccessibleOLEShape (const AccessibleOLEShape&) SAL_DELETED_FUNCTION; + AccessibleOLEShape (const AccessibleOLEShape&) = delete; - AccessibleOLEShape& operator= (const AccessibleOLEShape&) SAL_DELETED_FUNCTION; + AccessibleOLEShape& operator= (const AccessibleOLEShape&) = delete; }; } // end of namespace accessibility diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index 495c3c1bd652..1cfd86c2c0e8 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -459,8 +459,8 @@ protected: void UpdateStates(); private: - AccessibleShape (const AccessibleShape&) SAL_DELETED_FUNCTION; - AccessibleShape& operator= (const AccessibleShape&) SAL_DELETED_FUNCTION; + AccessibleShape (const AccessibleShape&) = delete; + AccessibleShape& operator= (const AccessibleShape&) = delete; //Old accessible name OUString aAccName; diff --git a/include/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx index 0c75bc914b9b..1d99e9289d38 100644 --- a/include/svx/AccessibleShapeInfo.hxx +++ b/include/svx/AccessibleShapeInfo.hxx @@ -91,7 +91,7 @@ public: AccessibleShapeInfo (const AccessibleShapeInfo&); private: - AccessibleShapeInfo& operator= (const AccessibleShapeInfo&) SAL_DELETED_FUNCTION; + AccessibleShapeInfo& operator= (const AccessibleShapeInfo&) = delete; }; } // end of namespace accessibility diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index 668574f5f61e..516561198998 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -197,8 +197,8 @@ protected: ChildrenManagerImpl* mpImpl; private: - ChildrenManager (const ChildrenManager&) SAL_DELETED_FUNCTION; - ChildrenManager& operator= (const ChildrenManager&) SAL_DELETED_FUNCTION; + ChildrenManager (const ChildrenManager&) = delete; + ChildrenManager& operator= (const ChildrenManager&) = delete; }; } // end of namespace accessibility diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx index 9f4f464e7133..8f0691001156 100644 --- a/include/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx @@ -195,8 +195,8 @@ private: // supposed to be a singleton FunctionParser(); - FunctionParser(const FunctionParser&) SAL_DELETED_FUNCTION; - FunctionParser& operator=( const FunctionParser& ) SAL_DELETED_FUNCTION; + FunctionParser(const FunctionParser&) = delete; + FunctionParser& operator=( const FunctionParser& ) = delete; }; } diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx index 22600859db21..129bc8042b58 100644 --- a/include/svx/fmmodel.hxx +++ b/include/svx/fmmodel.hxx @@ -42,8 +42,8 @@ private: bool m_bOpenInDesignMode : 1; bool m_bAutoControlFocus : 1; - FmFormModel( const FmFormModel& ) SAL_DELETED_FUNCTION; - void operator=(const FmFormModel& rSrcModel) SAL_DELETED_FUNCTION; + FmFormModel( const FmFormModel& ) = delete; + void operator=(const FmFormModel& rSrcModel) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 49fb5643c34e..1bf169e81e04 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -40,7 +40,7 @@ class HelpEvent; class SVX_DLLPUBLIC FmFormPage : public SdrPage { - FmFormPage& operator=(const FmFormPage&) SAL_DELETED_FUNCTION; + FmFormPage& operator=(const FmFormPage&) = delete; friend class FmFormObj; FmFormPageImpl* m_pImpl; diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 0fcee6f39b2b..27cb49dc54fc 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -58,8 +58,8 @@ SVX_DLLPUBLIC OUString GetDicInfoStr( const OUString& rName, const sal_uInt16 class SVX_DLLPUBLIC SvxLanguageBoxBase { private: - SvxLanguageBoxBase(const SvxLanguageBoxBase&) SAL_DELETED_FUNCTION; - SvxLanguageBoxBase& operator=(const SvxLanguageBoxBase&) SAL_DELETED_FUNCTION; + SvxLanguageBoxBase(const SvxLanguageBoxBase&) = delete; + SvxLanguageBoxBase& operator=(const SvxLanguageBoxBase&) = delete; public: explicit SvxLanguageBoxBase( bool bCheck ); virtual ~SvxLanguageBoxBase(); diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index a4c97f6be210..f7c4125fd1af 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -78,7 +78,7 @@ public: class E3dObjList : public SdrObjList { - E3dObjList &operator=(const E3dObjList& rSrcList) SAL_DELETED_FUNCTION; + E3dObjList &operator=(const E3dObjList& rSrcList) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 8c75da3af07a..42863867fd60 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -43,7 +43,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; private: - const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) SAL_DELETED_FUNCTION; + const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) = delete; public: TYPEINFO_OVERRIDE(); @@ -76,7 +76,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; private: - const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) SAL_DELETED_FUNCTION; + const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) = delete; public: TYPEINFO_OVERRIDE(); @@ -108,7 +108,7 @@ protected: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; private: - const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) SAL_DELETED_FUNCTION; + const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) = delete; public: TYPEINFO_OVERRIDE(); SvxPagePosSizeItem(const Point &rPos, long lWidth, long lHeight); @@ -234,7 +234,7 @@ protected: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; private: - const SvxObjectItem &operator=(const SvxObjectItem &) SAL_DELETED_FUNCTION; + const SvxObjectItem &operator=(const SvxObjectItem &) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index b7be54cad695..d25613a1fa80 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -53,8 +53,8 @@ namespace sdr , public salhelper::SimpleReferenceObject { private: - OverlayManager(const OverlayManager&) SAL_DELETED_FUNCTION; - OverlayManager& operator=(const OverlayManager&) SAL_DELETED_FUNCTION; + OverlayManager(const OverlayManager&) = delete; + OverlayManager& operator=(const OverlayManager&) = delete; protected: // the OutputDevice to work on, set on construction and not to be changed diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index 9b3a7585d0ea..36bd20868354 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -54,8 +54,8 @@ namespace sdr class SVX_DLLPUBLIC OverlayObject : public sdr::animation::Event { private: - OverlayObject(const OverlayObject&) SAL_DELETED_FUNCTION; - OverlayObject& operator=(const OverlayObject&) SAL_DELETED_FUNCTION; + OverlayObject(const OverlayObject&) = delete; + OverlayObject& operator=(const OverlayObject&) = delete; // Manager is allowed access to private Member mpOverlayManager friend class OverlayManager; diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 1df8742c0605..59428d9ebdee 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -114,8 +114,8 @@ public: bool isColumnHeader(); sdr::table::SdrTableObj* GetTableObj() { return dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); } private: - SvxTableController(SvxTableController &) SAL_DELETED_FUNCTION; - void operator =(SvxTableController &) SAL_DELETED_FUNCTION; + SvxTableController(SvxTableController &) = delete; + void operator =(SvxTableController &) = delete; // internals SVX_DLLPRIVATE void ApplyBorderAttr( const SfxItemSet& rAttr ); diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx index eec99df167bf..a00a0b96703a 100644 --- a/include/svx/sdrmasterpagedescriptor.hxx +++ b/include/svx/sdrmasterpagedescriptor.hxx @@ -47,7 +47,7 @@ namespace sdr // ViewContact part sdr::contact::ViewContact* mpViewContact; - void operator=(const MasterPageDescriptor& rCandidate) SAL_DELETED_FUNCTION; + void operator=(const MasterPageDescriptor& rCandidate) = delete; protected: sdr::contact::ViewContact* CreateObjectSpecificViewContact(); diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx index 16cce1c9bf28..48845fbc3ed6 100644 --- a/include/svx/sdrpagewindow.hxx +++ b/include/svx/sdrpagewindow.hxx @@ -49,8 +49,8 @@ class SVX_DLLPUBLIC SdrPageWindow Impl* mpImpl; - SdrPageWindow( const SdrPageWindow& ) SAL_DELETED_FUNCTION; - SdrPageWindow& operator= ( const SdrPageWindow& ) SAL_DELETED_FUNCTION; + SdrPageWindow( const SdrPageWindow& ) = delete; + SdrPageWindow& operator= ( const SdrPageWindow& ) = delete; public: SdrPageWindow(SdrPageView& rNewPageView, SdrPaintWindow& rPaintWindow); diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index a12a991c536e..3095872570a7 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -80,8 +80,8 @@ namespace svx protected: ::cppu::OWeakObject& getContext() const { return m_rContext; } - PropertyValueProvider(const PropertyValueProvider&) SAL_DELETED_FUNCTION; - PropertyValueProvider& operator=(const PropertyValueProvider&) SAL_DELETED_FUNCTION; + PropertyValueProvider(const PropertyValueProvider&) = delete; + PropertyValueProvider& operator=(const PropertyValueProvider&) = delete; private: ::cppu::OWeakObject& m_rContext; @@ -129,8 +129,8 @@ namespace svx void disposing(); private: - PropertyChangeNotifier(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION; - PropertyChangeNotifier& operator=(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION; + PropertyChangeNotifier(const PropertyChangeNotifier&) = delete; + PropertyChangeNotifier& operator=(const PropertyChangeNotifier&) = delete; std::unique_ptr< PropertyChangeNotifier_Data > m_xData; }; diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index 890a72ab3427..00ecc3831690 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -66,8 +66,8 @@ public: void Disconnect(); private: - SelectionChangeHandler(const SelectionChangeHandler&) SAL_DELETED_FUNCTION; - SelectionChangeHandler& operator=(const SelectionChangeHandler&) SAL_DELETED_FUNCTION; + SelectionChangeHandler(const SelectionChangeHandler&) = delete; + SelectionChangeHandler& operator=(const SelectionChangeHandler&) = delete; const std::function<rtl::OUString ()> maSelectionChangeCallback; css::uno::Reference<css::frame::XController> mxController; diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 6379540c2dda..e467525eab3d 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -260,9 +260,9 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); private: - SdrModel(const SdrModel& rSrcModel) SAL_DELETED_FUNCTION; - void operator=(const SdrModel& rSrcModel) SAL_DELETED_FUNCTION; - bool operator==(const SdrModel& rCmpModel) const SAL_DELETED_FUNCTION; + SdrModel(const SdrModel& rSrcModel) = delete; + void operator=(const SdrModel& rSrcModel) = delete; + bool operator==(const SdrModel& rCmpModel) const = delete; SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo); SVX_DLLPRIVATE void ImpSetUIUnit(); SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit = false ); diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 545a3fb61e78..7b498af21124 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -191,9 +191,9 @@ protected: sal_uInt16 nVersion; private: - void operator=(const SdrObjUserData& rData) SAL_DELETED_FUNCTION; - bool operator==(const SdrObjUserData& rData) const SAL_DELETED_FUNCTION; - bool operator!=(const SdrObjUserData& rData) const SAL_DELETED_FUNCTION; + void operator=(const SdrObjUserData& rData) = delete; + bool operator==(const SdrObjUserData& rData) const = delete; + bool operator!=(const SdrObjUserData& rData) const = delete; public: SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer); @@ -265,7 +265,7 @@ private: struct Impl; Impl* mpImpl; - SdrObject( const SdrObject& ) SAL_DELETED_FUNCTION; + SdrObject( const SdrObject& ) = delete; public: void AddObjectUser(sdr::ObjectUser& rNewUser); diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 6140c386492c..f3ecc7a47537 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC SdrVirtObj : public SdrObject { - SdrVirtObj( const SdrVirtObj& ) SAL_DELETED_FUNCTION; + SdrVirtObj( const SdrVirtObj& ) = delete; public: virtual sdr::properties::BaseProperties& GetProperties() const SAL_OVERRIDE; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 20a7fce3ad65..470c11a1fbaa 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -76,8 +76,8 @@ public: class SVX_DLLPUBLIC SdrObjList { - SdrObjList(const SdrObjList& rSrcList) SAL_DELETED_FUNCTION; - SdrObjList &operator=(const SdrObjList& rSrcList) SAL_DELETED_FUNCTION; + SdrObjList(const SdrObjList& rSrcList) = delete; + SdrObjList &operator=(const SdrObjList& rSrcList) = delete; private: ::std::vector<SdrObject*> maList; @@ -313,8 +313,8 @@ public: class SVX_DLLPUBLIC SdrPageGridFrameList { std::vector<SdrPageGridFrame*> aList; private: - SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList) SAL_DELETED_FUNCTION; - void operator=(const SdrPageGridFrameList& rSrcList) SAL_DELETED_FUNCTION; + SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList) = delete; + void operator=(const SdrPageGridFrameList& rSrcList) = delete; protected: SdrPageGridFrame* GetObject(sal_uInt16 i) const { return aList[i]; } public: @@ -342,7 +342,7 @@ private: void ImpRemoveStyleSheet(); void ImpAddStyleSheet(SfxStyleSheet& rNewStyleSheet); - SdrPageProperties& operator=(const SdrPageProperties& rCandidate) SAL_DELETED_FUNCTION; + SdrPageProperties& operator=(const SdrPageProperties& rCandidate) = delete; public: // construct/destruct @@ -377,7 +377,7 @@ public: */ class SVX_DLLPUBLIC SdrPage : public SdrObjList, public tools::WeakBase< SdrPage > { - SdrPage& operator=(const SdrPage& rSrcPage) SAL_DELETED_FUNCTION; + SdrPage& operator=(const SdrPage& rSrcPage) = delete; // start PageUser section private: diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index 1881877ee182..e853cbff7f8a 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -84,8 +84,8 @@ namespace toolkit void impl_updateImages_nolck( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_animatedImages ); private: - AnimatedImagesPeer(const AnimatedImagesPeer&) SAL_DELETED_FUNCTION; - AnimatedImagesPeer& operator=(const AnimatedImagesPeer&) SAL_DELETED_FUNCTION; + AnimatedImagesPeer(const AnimatedImagesPeer&) = delete; + AnimatedImagesPeer& operator=(const AnimatedImagesPeer&) = delete; std::unique_ptr< AnimatedImagesPeer_Data > m_xData; }; diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx index 1c999a9ba43b..7910c44bafd2 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/include/toolkit/awt/vclxspinbutton.hxx @@ -80,8 +80,8 @@ namespace toolkit void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) SAL_OVERRIDE; private: - VCLXSpinButton( const VCLXSpinButton& ) SAL_DELETED_FUNCTION; - VCLXSpinButton& operator=( const VCLXSpinButton& ) SAL_DELETED_FUNCTION; + VCLXSpinButton( const VCLXSpinButton& ) = delete; + VCLXSpinButton& operator=( const VCLXSpinButton& ) = delete; }; diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index ac295165190b..ed266c4fa84c 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -256,7 +256,7 @@ protected: ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; private: - GraphicControlModel& operator=( const GraphicControlModel& ) SAL_DELETED_FUNCTION; + GraphicControlModel& operator=( const GraphicControlModel& ) = delete; }; diff --git a/include/tools/config.hxx b/include/tools/config.hxx index 772c1c7da8f9..f6014f24fd81 100644 --- a/include/tools/config.hxx +++ b/include/tools/config.hxx @@ -61,8 +61,8 @@ public: void Flush(); private: - Config( const Config& rConfig ) SAL_DELETED_FUNCTION; - Config& operator = ( const Config& rConfig ) SAL_DELETED_FUNCTION; + Config( const Config& rConfig ) = delete; + Config& operator = ( const Config& rConfig ) = delete; }; #endif diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx index 7e43b0d912e8..834df8573194 100644 --- a/include/tools/inetstrm.hxx +++ b/include/tools/inetstrm.hxx @@ -47,8 +47,8 @@ class TOOLS_DLLPUBLIC INetMIMEMessageStream sal_uIntPtr nChildIndex; INetMIMEMessageStream *pChildStrm; - INetMIMEMessageStream (const INetMIMEMessageStream& rStrm) SAL_DELETED_FUNCTION; - INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm) SAL_DELETED_FUNCTION; + INetMIMEMessageStream (const INetMIMEMessageStream& rStrm) = delete; + INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm) = delete; int GetHeaderLine(sal_Char *pData, sal_uIntPtr nSize); int GetBodyLine(sal_Char *pData, sal_uIntPtr nSize); diff --git a/include/tools/resary.hxx b/include/tools/resary.hxx index e03ec168f78b..4e15feb5ee08 100644 --- a/include/tools/resary.hxx +++ b/include/tools/resary.hxx @@ -31,8 +31,8 @@ class TOOLS_DLLPUBLIC ResStringArray struct Impl; Impl* mpImpl; - ResStringArray( const ResStringArray& ) SAL_DELETED_FUNCTION; - ResStringArray& operator=( const ResStringArray& ) SAL_DELETED_FUNCTION; + ResStringArray( const ResStringArray& ) = delete; + ResStringArray& operator=( const ResStringArray& ) = delete; public: ResStringArray( const ResId& rResId ); diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx index 4c72c17855da..ade174674240 100644 --- a/include/tools/resmgr.hxx +++ b/include/tools/resmgr.hxx @@ -127,8 +127,8 @@ private: // like ReadString but doesn't call the string hook TOOLS_DLLPRIVATE OUString ReadStringWithoutHook(); - ResMgr(const ResMgr&) SAL_DELETED_FUNCTION; - ResMgr& operator=(const ResMgr&) SAL_DELETED_FUNCTION; + ResMgr(const ResMgr&) = delete; + ResMgr& operator=(const ResMgr&) = delete; public: static void DestroyAllResMgr(); ///< Called upon app shutdown diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 702734d014b6..19f062ee2e3a 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -226,8 +226,8 @@ private: // helper methods TOOLS_DLLPRIVATE void ImpInit(); - SvStream ( const SvStream& rStream ) SAL_DELETED_FUNCTION; - SvStream& operator=( const SvStream& rStream ) SAL_DELETED_FUNCTION; + SvStream ( const SvStream& rStream ) = delete; + SvStream& operator=( const SvStream& rStream ) = delete; protected: sal_uInt64 m_nBufFilePos; ///< File position of pBuf[0] @@ -622,8 +622,8 @@ private: sal_uInt16 nLockCounter; bool bIsOpen; - SvFileStream (const SvFileStream&) SAL_DELETED_FUNCTION; - SvFileStream & operator= (const SvFileStream&) SAL_DELETED_FUNCTION; + SvFileStream (const SvFileStream&) = delete; + SvFileStream & operator= (const SvFileStream&) = delete; bool LockRange( sal_Size nByteOffset, sal_Size nBytes ); bool UnlockRange( sal_Size nByteOffset, sal_Size nBytes ); @@ -656,8 +656,8 @@ public: class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream { - SvMemoryStream (const SvMemoryStream&) SAL_DELETED_FUNCTION; - SvMemoryStream & operator= (const SvMemoryStream&) SAL_DELETED_FUNCTION; + SvMemoryStream (const SvMemoryStream&) = delete; + SvMemoryStream & operator= (const SvMemoryStream&) = delete; protected: sal_Size nSize; diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx index 7c5f4f9caa71..7383f03cda87 100644 --- a/include/ucbhelper/commandenvironment.hxx +++ b/include/ucbhelper/commandenvironment.hxx @@ -39,8 +39,8 @@ class UCBHELPER_DLLPUBLIC CommandEnvironment : CommandEnvironment_Impl* m_pImpl; private: - CommandEnvironment( const CommandEnvironment& ) SAL_DELETED_FUNCTION; - CommandEnvironment& operator=( const CommandEnvironment& ) SAL_DELETED_FUNCTION; + CommandEnvironment( const CommandEnvironment& ) = delete; + CommandEnvironment& operator=( const CommandEnvironment& ) = delete; public: /** diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx index 9694be73a33d..3c87a7e963d2 100644 --- a/include/unoidl/unoidl.hxx +++ b/include/unoidl/unoidl.hxx @@ -36,7 +36,7 @@ public: rtl::OUString getUri() const { return uri_; } private: - void operator =(NoSuchFileException) SAL_DELETED_FUNCTION; + void operator =(NoSuchFileException) = delete; rtl::OUString uri_; }; @@ -59,7 +59,7 @@ public: rtl::OUString getDetail() const { return detail_; } private: - void operator =(FileFormatException) SAL_DELETED_FUNCTION; + void operator =(FileFormatException) = delete; rtl::OUString uri_; rtl::OUString detail_; 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 ); diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index cf5206e35d27..692c611c5869 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -80,8 +80,8 @@ protected: SAL_DLLPRIVATE long ImplGetButtonSize(); private: - ButtonDialog( const ButtonDialog & ) SAL_DELETED_FUNCTION; - ButtonDialog& operator=( const ButtonDialog& ) SAL_DELETED_FUNCTION; + ButtonDialog( const ButtonDialog & ) = delete; + ButtonDialog& operator=( const ButtonDialog& ) = delete; private: std::vector<std::unique_ptr<ImplBtnDlgItem>> m_ItemList; diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 26b5d8c3b7c0..580cc74ab201 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -120,8 +120,8 @@ public: css::uno::Reference<css::frame::XFrame> getFrame() { return m_xFrame; } private: - VclBuilder(const VclBuilder&) SAL_DELETED_FUNCTION; - VclBuilder& operator=(const VclBuilder&) SAL_DELETED_FUNCTION; + VclBuilder(const VclBuilder&) = delete; + VclBuilder& operator=(const VclBuilder&) = delete; typedef std::map<OUString, std::unique_ptr<osl::Module>> ModuleMap; diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 408eda900569..ea1af74d6157 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -44,8 +44,8 @@ private: /// Command URL (like .uno:Save) in case the button should handle it. OUString maCommand; - Button (const Button &) SAL_DELETED_FUNCTION; - Button & operator= (const Button &) SAL_DELETED_FUNCTION; + Button (const Button &) = delete; + Button & operator= (const Button &) = delete; public: SAL_DLLPRIVATE DrawButtonFlags ImplGetButtonState() const; SAL_DLLPRIVATE DrawButtonFlags& ImplGetButtonState(); @@ -218,8 +218,8 @@ protected: private: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - OKButton (const OKButton &) SAL_DELETED_FUNCTION; - OKButton & operator= (const OKButton &) SAL_DELETED_FUNCTION; + OKButton (const OKButton &) = delete; + OKButton & operator= (const OKButton &) = delete; public: explicit OKButton( vcl::Window* pParent, WinBits nStyle = WB_DEFBUTTON ); @@ -234,8 +234,8 @@ protected: private: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - CancelButton (const CancelButton &) SAL_DELETED_FUNCTION; - CancelButton & operator= (const CancelButton &) SAL_DELETED_FUNCTION; + CancelButton (const CancelButton &) = delete; + CancelButton & operator= (const CancelButton &) = delete; public: explicit CancelButton( vcl::Window* pParent, WinBits nStyle = 0 ); @@ -261,8 +261,8 @@ protected: private: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - HelpButton( const HelpButton & ) SAL_DELETED_FUNCTION; - HelpButton & operator= ( const HelpButton & ) SAL_DELETED_FUNCTION; + HelpButton( const HelpButton & ) = delete; + HelpButton & operator= ( const HelpButton & ) = delete; public: explicit HelpButton( vcl::Window* pParent, WinBits nStyle = 0 ); @@ -302,8 +302,8 @@ private: SAL_DLLPRIVATE Size ImplGetRadioImageSize() const; SAL_DLLPRIVATE long ImplGetImageToTextDistance() const; - RadioButton(const RadioButton &) SAL_DELETED_FUNCTION; - RadioButton& operator= (const RadioButton &) SAL_DELETED_FUNCTION; + RadioButton(const RadioButton &) = delete; + RadioButton& operator= (const RadioButton &) = delete; protected: using Control::ImplInitSettings; @@ -426,8 +426,8 @@ private: SAL_DLLPRIVATE long ImplGetImageToTextDistance() const; SAL_DLLPRIVATE Size ImplGetCheckImageSize() const; - CheckBox(const CheckBox &) SAL_DELETED_FUNCTION; - CheckBox& operator= (const CheckBox &) SAL_DELETED_FUNCTION; + CheckBox(const CheckBox &) = delete; + CheckBox& operator= (const CheckBox &) = delete; protected: using Control::ImplInitSettings; @@ -510,8 +510,8 @@ protected: private: SAL_DLLPRIVATE void ImplInitStyle(); - ImageButton( const ImageButton & ) SAL_DELETED_FUNCTION; - ImageButton & operator= ( const ImageButton & ) SAL_DELETED_FUNCTION; + ImageButton( const ImageButton & ) = delete; + ImageButton & operator= ( const ImageButton & ) = delete; public: ImageButton( vcl::Window* pParent, WinBits nStyle = 0 ); @@ -520,8 +520,8 @@ public: class VCL_DLLPUBLIC ImageRadioButton : public RadioButton { - ImageRadioButton( const ImageRadioButton & ) SAL_DELETED_FUNCTION; - ImageRadioButton & operator= ( const ImageRadioButton & ) SAL_DELETED_FUNCTION; + ImageRadioButton( const ImageRadioButton & ) = delete; + ImageRadioButton & operator= ( const ImageRadioButton & ) = delete; public: explicit ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 ); @@ -529,8 +529,8 @@ public: class VCL_DLLPUBLIC TriStateBox : public CheckBox { - TriStateBox( const TriStateBox & ) SAL_DELETED_FUNCTION; - TriStateBox & operator= ( const TriStateBox & ) SAL_DELETED_FUNCTION; + TriStateBox( const TriStateBox & ) = delete; + TriStateBox & operator= ( const TriStateBox & ) = delete; public: explicit TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 ); diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 28bf572b54ac..7fe2411d6b21 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -47,8 +47,8 @@ private: SAL_DLLPRIVATE void ImplInitControlData(); - Control (const Control &) SAL_DELETED_FUNCTION; - Control & operator= (const Control &) SAL_DELETED_FUNCTION; + Control (const Control &) = delete; + Control & operator= (const Control &) = delete; protected: Control( WindowType nType ); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 5fc0708fed02..1ab08d2fb10f 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -55,8 +55,8 @@ private: virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; - SAL_DLLPRIVATE Dialog (const Dialog &) SAL_DELETED_FUNCTION; - SAL_DLLPRIVATE Dialog & operator= (const Dialog &) SAL_DELETED_FUNCTION; + SAL_DLLPRIVATE Dialog (const Dialog &) = delete; + SAL_DLLPRIVATE Dialog & operator= (const Dialog &) = delete; DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncCloseHdl, void*, void ); @@ -129,8 +129,8 @@ public: // - ModelessDialog - class VCL_DLLPUBLIC ModelessDialog : public Dialog { - ModelessDialog (const ModelessDialog &) SAL_DELETED_FUNCTION; - ModelessDialog & operator= (const ModelessDialog &) SAL_DELETED_FUNCTION; + ModelessDialog (const ModelessDialog &) = delete; + ModelessDialog & operator= (const ModelessDialog &) = delete; public: explicit ModelessDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, Dialog::InitFlag eFlag = Dialog::InitFlag::Default ); @@ -149,8 +149,8 @@ protected: private: - SAL_DLLPRIVATE ModalDialog (const ModalDialog &) SAL_DELETED_FUNCTION; - SAL_DLLPRIVATE ModalDialog & operator= (const ModalDialog &) SAL_DELETED_FUNCTION; + SAL_DLLPRIVATE ModalDialog (const ModalDialog &) = delete; + SAL_DLLPRIVATE ModalDialog & operator= (const ModalDialog &) = delete; }; #endif // INCLUDED_VCL_DIALOG_HXX diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index a0ce2d674daa..f7cf79fda498 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -31,8 +31,8 @@ class VCL_DLLPUBLIC DockingAreaWindow : public vcl::Window private: ImplData* mpImplData; - DockingAreaWindow (const DockingAreaWindow &) SAL_DELETED_FUNCTION; - DockingAreaWindow & operator= (const DockingAreaWindow &) SAL_DELETED_FUNCTION; + DockingAreaWindow (const DockingAreaWindow &) = delete; + DockingAreaWindow & operator= (const DockingAreaWindow &) = delete; public: explicit DockingAreaWindow( vcl::Window* pParent ); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 49021e4fd605..b9b51e977082 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -262,8 +262,8 @@ private: SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox); DECL_DLLPRIVATE_LINK_TYPED( ImplHandleLayoutTimerHdl, Idle*, void ); - DockingWindow (const DockingWindow &) SAL_DELETED_FUNCTION; - DockingWindow & operator= (const DockingWindow &) SAL_DELETED_FUNCTION; + DockingWindow (const DockingWindow &) = delete; + DockingWindow & operator= (const DockingWindow &) = delete; protected: using Window::ImplInit; diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 68c43dde59c9..2ce1a6b2ec67 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -115,8 +115,8 @@ private: DECL_DLLPRIVATE_LINK_TYPED( ImplEndPopupModeHdl, void*, void ); virtual void setPosSizeOnContainee(Size aSize, Window &rBox) SAL_OVERRIDE; - FloatingWindow (const FloatingWindow &) SAL_DELETED_FUNCTION; - FloatingWindow & operator= (const FloatingWindow &) SAL_DELETED_FUNCTION; + FloatingWindow (const FloatingWindow &) = delete; + FloatingWindow & operator= (const FloatingWindow &) = delete; protected: using Window::ImplInit; diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 191a6e73208a..05dfed3608e7 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -172,8 +172,8 @@ class VCL_DLLPUBLIC GraphicDescriptor bool ImpDetectSGV( SvStream& rStm, bool bExtendedInfo ); bool ImpDetectEMF( SvStream& rStm, bool bExtendedInfo ); bool ImpDetectSVG( SvStream& rStm, bool bExtendedInfo ); - GraphicDescriptor( const GraphicDescriptor& ) SAL_DELETED_FUNCTION; - GraphicDescriptor& operator=( const GraphicDescriptor& ) SAL_DELETED_FUNCTION; + GraphicDescriptor( const GraphicDescriptor& ) = delete; + GraphicDescriptor& operator=( const GraphicDescriptor& ) = delete; public: diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 62933f1e45a9..d2672eb9bc47 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -47,8 +47,8 @@ private: SAL_DLLPRIVATE void ImplInitMenuButtonData(); DECL_DLLPRIVATE_LINK_TYPED( ImplMenuTimeoutHdl, Timer*, void ); - MenuButton( const MenuButton & ) SAL_DELETED_FUNCTION; - MenuButton& operator=( const MenuButton & ) SAL_DELETED_FUNCTION; + MenuButton( const MenuButton & ) = delete; + MenuButton& operator=( const MenuButton & ) = delete; protected: using Window::ImplInit; diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index 7a7c7d30c860..ba2393d4123e 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -212,8 +212,8 @@ private: sal_uInt32 mnRefCount; // prevent assignment and copy construction - FontCharMap( const FontCharMap& ) SAL_DELETED_FUNCTION; - void operator=( const FontCharMap& ) SAL_DELETED_FUNCTION; + FontCharMap( const FontCharMap& ) = delete; + void operator=( const FontCharMap& ) = delete; }; inline void intrusive_ptr_add_ref(FontCharMap* pFontCharMap) diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index 01a6e95da5cf..e03f9d4956de 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -39,8 +39,8 @@ private: MapUnit meUnit; bool mbState; - MoreButton( const MoreButton & ) SAL_DELETED_FUNCTION; - MoreButton& operator=( const MoreButton & ) SAL_DELETED_FUNCTION; + MoreButton( const MoreButton & ) = delete; + MoreButton& operator=( const MoreButton & ) = delete; SAL_DLLPRIVATE void ShowState(); protected: diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx index 50783f278eb9..437b4350101a 100644 --- a/include/vcl/opengl/OpenGLHelper.hxx +++ b/include/vcl/opengl/OpenGLHelper.hxx @@ -37,7 +37,7 @@ // All member functions static and VCL_DLLPUBLIC. Basically a glorified namespace. struct VCL_DLLPUBLIC OpenGLHelper { - OpenGLHelper() SAL_DELETED_FUNCTION; // Should not be instantiated + OpenGLHelper() = delete; // Should not be instantiated public: diff --git a/include/vcl/opengl/OpenGLWrapper.hxx b/include/vcl/opengl/OpenGLWrapper.hxx index 4d3a9e9ab57b..e73aa08466be 100644 --- a/include/vcl/opengl/OpenGLWrapper.hxx +++ b/include/vcl/opengl/OpenGLWrapper.hxx @@ -17,7 +17,7 @@ // All member functions static and VCL_DLLPUBLIC. Basically a glorified namespace. struct VCL_DLLPUBLIC OpenGLWrapper { - OpenGLWrapper() SAL_DELETED_FUNCTION; // Should not be instantiated + OpenGLWrapper() = delete; // Should not be instantiated /** * Returns true if VCL has OpenGL rendering enabled diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 20bd81ae197f..f4cbc5f06704 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -351,8 +351,8 @@ private: } private: - OutputDevice(const OutputDevice&) SAL_DELETED_FUNCTION; - OutputDevice& operator=(const OutputDevice&) SAL_DELETED_FUNCTION; + OutputDevice(const OutputDevice&) = delete; + OutputDevice& operator=(const OutputDevice&) = delete; mutable SalGraphics* mpGraphics; ///< Graphics context to draw on mutable VclPtr<OutputDevice> mpPrevGraphics; ///< Previous output device in list @@ -633,7 +633,7 @@ protected: private: // not implemented; to detect misuses of DrawOutDev(...OutputDevice&); - SAL_DLLPRIVATE void DrawOutDev( const Point&, const Size&, const Point&, const Size&, const Printer&) SAL_DELETED_FUNCTION; + SAL_DLLPRIVATE void DrawOutDev( const Point&, const Size&, const Point&, const Size&, const Printer&) = delete; ///@} diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index d382f12cafe7..9d5fafb5efb9 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -236,8 +236,8 @@ private: private: SAL_DLLPRIVATE bool EndJob(); - Printer( const Printer& rPrinter ) SAL_DELETED_FUNCTION; - Printer& operator =( const Printer& rPrinter ) SAL_DELETED_FUNCTION; + Printer( const Printer& rPrinter ) = delete; + Printer& operator =( const Printer& rPrinter ) = delete; public: SAL_DLLPRIVATE void ImplStartPage(); diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx index d68b4fa8bbe4..2eba2495481f 100644 --- a/include/vcl/quickselectionengine.hxx +++ b/include/vcl/quickselectionengine.hxx @@ -80,8 +80,8 @@ namespace vcl bool bEnabled; private: - QuickSelectionEngine( const QuickSelectionEngine& ) SAL_DELETED_FUNCTION; - QuickSelectionEngine& operator=( const QuickSelectionEngine& ) SAL_DELETED_FUNCTION; + QuickSelectionEngine( const QuickSelectionEngine& ) = delete; + QuickSelectionEngine& operator=( const QuickSelectionEngine& ) = delete; }; diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 069712aca2cf..7ef3eba0273d 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -53,8 +53,8 @@ private: SAL_DLLPRIVATE void ImplRestoreSplitter(); SAL_DLLPRIVATE void ImplInitHorVer(bool bNew); - Splitter (const Splitter &) SAL_DELETED_FUNCTION; - Splitter& operator= (const Splitter &) SAL_DELETED_FUNCTION; + Splitter (const Splitter &) = delete; + Splitter& operator= (const Splitter &) = delete; protected: using Window::ImplInit; diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 4cec7d07645b..2e9066be7b89 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -120,8 +120,8 @@ private: long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos ); SAL_DLLPRIVATE void ImplDrawSplitTracking(const Point& rPos); - SplitWindow (const SplitWindow &) SAL_DELETED_FUNCTION; - SplitWindow & operator= (const SplitWindow &) SAL_DELETED_FUNCTION; + SplitWindow (const SplitWindow &) = delete; + SplitWindow & operator= (const SplitWindow &) = delete; public: SplitWindow( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SplitWindow(); diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index a5fb8fe0e4df..e1d8320404bc 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1501,8 +1501,8 @@ private: class VCL_DLLPUBLIC SolarMutexGuard { private: - SolarMutexGuard( const SolarMutexGuard& ) SAL_DELETED_FUNCTION; - const SolarMutexGuard& operator = ( const SolarMutexGuard& ) SAL_DELETED_FUNCTION; + SolarMutexGuard( const SolarMutexGuard& ) = delete; + const SolarMutexGuard& operator = ( const SolarMutexGuard& ) = delete; comphelper::SolarMutex& m_solarMutex; public: @@ -1523,8 +1523,8 @@ public: class VCL_DLLPUBLIC SolarMutexClearableGuard SAL_FINAL { - SolarMutexClearableGuard( const SolarMutexClearableGuard& ) SAL_DELETED_FUNCTION; - const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& ) SAL_DELETED_FUNCTION; + SolarMutexClearableGuard( const SolarMutexClearableGuard& ) = delete; + const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& ) = delete; bool m_bCleared; public: /** Acquires mutex @@ -1561,8 +1561,8 @@ protected: class VCL_DLLPUBLIC SolarMutexResettableGuard SAL_FINAL { - SolarMutexResettableGuard( const SolarMutexResettableGuard& ) SAL_DELETED_FUNCTION; - const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& ) SAL_DELETED_FUNCTION; + SolarMutexResettableGuard( const SolarMutexResettableGuard& ) = delete; + const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& ) = delete; bool m_bCleared; public: /** Acquires mutex @@ -1621,8 +1621,8 @@ private: #endif comphelper::SolarMutex& m_rSolarMutex; - SolarMutexTryAndBuyGuard(const SolarMutexTryAndBuyGuard&) SAL_DELETED_FUNCTION; - SolarMutexTryAndBuyGuard& operator=(const SolarMutexTryAndBuyGuard&) SAL_DELETED_FUNCTION; + SolarMutexTryAndBuyGuard(const SolarMutexTryAndBuyGuard&) = delete; + SolarMutexTryAndBuyGuard& operator=(const SolarMutexTryAndBuyGuard&) = delete; public: diff --git a/include/vcl/svgdata.hxx b/include/vcl/svgdata.hxx index b234c1083de0..84a625e935d1 100644 --- a/include/vcl/svgdata.hxx +++ b/include/vcl/svgdata.hxx @@ -57,8 +57,8 @@ private: void ensureReplacement(); void ensureSequenceAndRange(); - SvgData(const SvgData&) SAL_DELETED_FUNCTION; - SvgData& operator=(const SvgData&) SAL_DELETED_FUNCTION; + SvgData(const SvgData&) = delete; + SvgData& operator=(const SvgData&) = delete; public: SvgData(const SvgDataArray& rSvgDataArray, const OUString& rPath); diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx index 928c1861b52a..ec72bf5ecb7c 100644 --- a/include/vcl/syschild.hxx +++ b/include/vcl/syschild.hxx @@ -34,8 +34,8 @@ private: SAL_DLLPRIVATE void ImplTestJavaException( void* pEnv ); // Copy assignment is forbidden and not implemented. - SystemChildWindow (const SystemChildWindow &) SAL_DELETED_FUNCTION; - SystemChildWindow & operator= (const SystemChildWindow &) SAL_DELETED_FUNCTION; + SystemChildWindow (const SystemChildWindow &) = delete; + SystemChildWindow & operator= (const SystemChildWindow &) = delete; public: explicit SystemChildWindow( vcl::Window* pParent, WinBits nStyle = 0 ); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 732e6f5eb645..5b08217e0a5d 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -229,8 +229,8 @@ private: DECL_DLLPRIVATE_LINK_TYPED( ImplCustomMenuListener, VclMenuEvent&, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplDropdownLongClickHdl, Timer*, void ); - ToolBox (const ToolBox &) SAL_DELETED_FUNCTION; - ToolBox& operator= (const ToolBox &) SAL_DELETED_FUNCTION; + ToolBox (const ToolBox &) = delete; + ToolBox& operator= (const ToolBox &) = delete; public: SAL_DLLPRIVATE void ImplFloatControl( bool bStart, FloatingWindow* pWindow = NULL ); diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx index 2614886e9723..ce2cd3518e1a 100644 --- a/include/vcl/vclptr.hxx +++ b/include/vcl/vclptr.hxx @@ -352,12 +352,12 @@ public: private: // Most likely we don't want this default copy-construtor. - ScopedVclPtr (const ScopedVclPtr<reference_type> &) SAL_DELETED_FUNCTION; + ScopedVclPtr (const ScopedVclPtr<reference_type> &) = delete; // And certainly we don't want a default assignment operator. - ScopedVclPtr<reference_type>& operator= (const ScopedVclPtr<reference_type> &) SAL_DELETED_FUNCTION; + ScopedVclPtr<reference_type>& operator= (const ScopedVclPtr<reference_type> &) = delete; // And disallow reset as that doesn't call disposeAndClear on the original reference - void reset() SAL_DELETED_FUNCTION; - void reset(reference_type *pBody) SAL_DELETED_FUNCTION; + void reset() = delete; + void reset(reference_type *pBody) = delete; protected: inline ScopedVclPtr (reference_type * pBody, __sal_NoAcquire) diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 669a224741ad..e2e555933f49 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -51,8 +51,8 @@ private: const basebmp::RawMemorySharedArray &pAlphaBuffer, const bool bTopDown ); - VirtualDevice (const VirtualDevice &) SAL_DELETED_FUNCTION; - VirtualDevice & operator= (const VirtualDevice &) SAL_DELETED_FUNCTION; + VirtualDevice (const VirtualDevice &) = delete; + VirtualDevice & operator= (const VirtualDevice &) = delete; /** Used for alpha VDev, to set areas to opaque diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 467e54ad4e9b..0a8b3cd1249a 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -62,8 +62,8 @@ private: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); private: - WorkWindow( const WorkWindow& rWin ) SAL_DELETED_FUNCTION; - WorkWindow& operator =( const WorkWindow& rWin ) SAL_DELETED_FUNCTION; + WorkWindow( const WorkWindow& rWin ) = delete; + WorkWindow& operator =( const WorkWindow& rWin ) = delete; protected: explicit WorkWindow( WindowType nType ); diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx index f39cc200a6ca..af57413061bd 100644 --- a/include/xmloff/DocumentSettingsContext.hxx +++ b/include/xmloff/DocumentSettingsContext.hxx @@ -47,8 +47,8 @@ public: virtual void EndElement() SAL_OVERRIDE; private: - XMLDocumentSettingsContext( const XMLDocumentSettingsContext& ) SAL_DELETED_FUNCTION; - XMLDocumentSettingsContext& operator=( const XMLDocumentSettingsContext& ) SAL_DELETED_FUNCTION; + XMLDocumentSettingsContext( const XMLDocumentSettingsContext& ) = delete; + XMLDocumentSettingsContext& operator=( const XMLDocumentSettingsContext& ) = delete; }; #endif diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx index 3585d64d1a03..36f8d402a061 100644 --- a/include/xmloff/SchXMLExportHelper.hxx +++ b/include/xmloff/SchXMLExportHelper.hxx @@ -56,8 +56,8 @@ public: void SetDestinationShellID( const OUString& rShellID ); private: - SchXMLExportHelper(SchXMLExportHelper &) SAL_DELETED_FUNCTION; - void operator =(SchXMLExportHelper &) SAL_DELETED_FUNCTION; + SchXMLExportHelper(SchXMLExportHelper &) = delete; + void operator =(SchXMLExportHelper &) = delete; private: SchXMLExportHelper_Impl* m_pImpl; diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index a07c8136b183..63fb6ff00aee 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -25,8 +25,8 @@ class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext { - XMLCharContext(const XMLCharContext&) SAL_DELETED_FUNCTION; - void operator =(const XMLCharContext&) SAL_DELETED_FUNCTION; + XMLCharContext(const XMLCharContext&) = delete; + void operator =(const XMLCharContext&) = delete; protected: sal_Int16 m_nControl; sal_uInt16 m_nCount; diff --git a/include/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx index e5d608c8cf37..515a69cfbfe7 100644 --- a/include/xmloff/prhdlfac.hxx +++ b/include/xmloff/prhdlfac.hxx @@ -41,8 +41,8 @@ class XMLOFF_DLLPUBLIC XMLPropertyHandlerFactory : public salhelper::SimpleRefer struct Impl; Impl* mpImpl; - XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ) SAL_DELETED_FUNCTION; - XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ) SAL_DELETED_FUNCTION; + XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ) = delete; + XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ) = delete; public: XMLPropertyHandlerFactory(); diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index 8ce29d50ed2b..db250e1f69b3 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -54,8 +54,8 @@ private: static OldFillStyleDefinitionSet maFooterSet; static OldFillStyleDefinitionSet maParaSet; - XMLPropStyleContext(XMLPropStyleContext &) SAL_DELETED_FUNCTION; - void operator =(XMLPropStyleContext &) SAL_DELETED_FUNCTION; + XMLPropStyleContext(XMLPropStyleContext &) = delete; + void operator =(XMLPropStyleContext &) = delete; protected: diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 9783a9bed237..d507e508f926 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -368,8 +368,8 @@ enum XMLTextType class XMLOFF_DLLPUBLIC XMLTextImportHelper : public salhelper::SimpleReferenceObject { private: - XMLTextImportHelper(const XMLTextImportHelper&) SAL_DELETED_FUNCTION; - XMLTextImportHelper& operator=(const XMLTextImportHelper&) SAL_DELETED_FUNCTION; + XMLTextImportHelper(const XMLTextImportHelper&) = delete; + XMLTextImportHelper& operator=(const XMLTextImportHelper&) = delete; struct Impl; std::unique_ptr<Impl> m_xImpl; diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 96c2afc48174..68e23c66ac13 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -673,7 +673,7 @@ public: void PopTextListsHelper(); private: - XMLTextParagraphExport(XMLTextParagraphExport &) SAL_DELETED_FUNCTION; + XMLTextParagraphExport(XMLTextParagraphExport &) = delete; }; inline const XMLTextListAutoStylePool& diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx index 59807ecd0216..9011c21a3645 100644 --- a/include/xmloff/xmlimppr.hxx +++ b/include/xmloff/xmlimppr.hxx @@ -57,8 +57,8 @@ class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public salhelper::SimpleRefer SvXMLImport& rImport; // access to error handling - SvXMLImportPropertyMapper(SvXMLImportPropertyMapper &) SAL_DELETED_FUNCTION; - void operator =(SvXMLImportPropertyMapper &) SAL_DELETED_FUNCTION; + SvXMLImportPropertyMapper(SvXMLImportPropertyMapper &) = delete; + void operator =(SvXMLImportPropertyMapper &) = delete; protected: diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx index 569adfa6552b..7fc7a720a27f 100644 --- a/include/xmloff/xmlprmap.hxx +++ b/include/xmloff/xmlprmap.hxx @@ -39,8 +39,8 @@ class XMLOFF_DLLPUBLIC XMLPropertySetMapper : public salhelper::SimpleReferenceO Impl* mpImpl; - XMLPropertySetMapper( const XMLPropertySetMapper& ) SAL_DELETED_FUNCTION; - XMLPropertySetMapper& operator= ( const XMLPropertySetMapper& ) SAL_DELETED_FUNCTION; + XMLPropertySetMapper( const XMLPropertySetMapper& ) = delete; + XMLPropertySetMapper& operator= ( const XMLPropertySetMapper& ) = delete; public: /** The last element of the XMLPropertyMapEntry-array must contain NULL-values. diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index 7c24399ac7c3..92fa85c4a4ec 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -183,8 +183,8 @@ class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext SAL_DLLPRIVATE const SvXMLTokenMap& GetStyleStylesElemTokenMap(); - SvXMLStylesContext(SvXMLStylesContext &) SAL_DELETED_FUNCTION; - void operator =(SvXMLStylesContext &) SAL_DELETED_FUNCTION; + SvXMLStylesContext(SvXMLStylesContext &) = delete; + void operator =(SvXMLStylesContext &) = delete; protected: diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index 94f8c43f18b8..74bc8143c519 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -78,8 +78,8 @@ public: class XMLOFF_DLLPUBLIC SvXMLUnitConverter { private: - SvXMLUnitConverter(const SvXMLUnitConverter&) SAL_DELETED_FUNCTION; - SvXMLUnitConverter& operator=(const SvXMLUnitConverter&) SAL_DELETED_FUNCTION; + SvXMLUnitConverter(const SvXMLUnitConverter&) = delete; + SvXMLUnitConverter& operator=(const SvXMLUnitConverter&) = delete; struct Impl; ::std::unique_ptr<Impl> m_pImpl; diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx index 27a4be2aa425..5d46b1cc706e 100644 --- a/include/xmlreader/xmlreader.hxx +++ b/include/xmlreader/xmlreader.hxx @@ -68,8 +68,8 @@ public: const OUString& getUrl() const { return fileUrl_;} private: - XmlReader(const XmlReader&) SAL_DELETED_FUNCTION; - XmlReader& operator=(const XmlReader&) SAL_DELETED_FUNCTION; + XmlReader(const XmlReader&) = delete; + XmlReader& operator=(const XmlReader&) = delete; typedef std::vector< Span > NamespaceIris; |