diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 15:25:41 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:26 +0200 |
commit | bff4c13475957863bfa7da5bc3bcf82a64a7503a (patch) | |
tree | 23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /include/sfx2 | |
parent | HAVE_CXX11_DELETE is required on all supported toolchains (diff) | |
download | core-bff4c13475957863bfa7da5bc3bcf82a64a7503a.tar.gz core-bff4c13475957863bfa7da5bc3bcf82a64a7503a.zip |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'include/sfx2')
-rw-r--r-- | include/sfx2/Metadatable.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/basedlgs.hxx | 12 | ||||
-rw-r--r-- | include/sfx2/controlwrapper.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/docfac.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/dockwin.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/docstoragemodifylistener.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/itemconnect.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/linkmgr.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/mnumgr.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/opengrf.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/printer.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/querystatus.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/request.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/sfxstatuslistener.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/shell.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/tbxctrl.hxx | 4 |
16 files changed, 34 insertions, 34 deletions
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: |