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 /sd | |
parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/helper/simplereferencecomponent.hxx | 8 | ||||
-rw-r--r-- | sd/inc/sdpage.hxx | 2 | ||||
-rw-r--r-- | sd/inc/stlsheet.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessiblePageShape.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessiblePresentationShape.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessibleViewForwarder.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/MasterPageObserver.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/WindowUpdater.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/filedlg.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/framework/FrameworkHelper.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/framework/ModuleController.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/sdxfer.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/slideshow.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/smarttag.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx | 4 |
19 files changed, 39 insertions, 39 deletions
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx index 3bb1de4d471f..6993a6255fd6 100644 --- a/sd/inc/helper/simplereferencecomponent.hxx +++ b/sd/inc/helper/simplereferencecomponent.hxx @@ -78,13 +78,13 @@ protected: private: oslInterlockedCount m_nCount; - SimpleReferenceComponent(SimpleReferenceComponent &) SAL_DELETED_FUNCTION; + SimpleReferenceComponent(SimpleReferenceComponent &) = delete; - void operator =(SimpleReferenceComponent) SAL_DELETED_FUNCTION; + void operator =(SimpleReferenceComponent) = delete; - static void * operator new[](std::size_t) SAL_DELETED_FUNCTION; + static void * operator new[](std::size_t) = delete; - static void operator delete[](void * pPtr) SAL_DELETED_FUNCTION; + static void operator delete[](void * pPtr) = delete; bool mbDisposed; }; diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index cf5191d2bb7d..99d49ac8de01 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -92,7 +92,7 @@ namespace sd { class SD_DLLPUBLIC SdPage : public FmFormPage, public SdrObjUserCall { - SdPage& operator=(const SdPage&) SAL_DELETED_FUNCTION; + SdPage& operator=(const SdPage&) = delete; friend class SdGenericDrawPage; friend class SdDrawPage; diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index d1e64baa7f61..575758fdd23a 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -149,7 +149,7 @@ protected: std::unique_ptr< ModifyListenerForewarder > mpModifyListenerForewarder; private: - SdStyleSheet& operator=( const SdStyleSheet& ) SAL_DELETED_FUNCTION; + SdStyleSheet& operator=( const SdStyleSheet& ) = delete; }; typedef rtl::Reference< SdStyleSheet > SdStyleSheetRef; diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index 72b9b8a534b4..b2d65a7bc2e5 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -73,8 +73,8 @@ namespace accessibility virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; private: - AccessibleOutlineEditSource( const AccessibleOutlineEditSource& ) SAL_DELETED_FUNCTION; - AccessibleOutlineEditSource& operator=( const AccessibleOutlineEditSource& ) SAL_DELETED_FUNCTION; + AccessibleOutlineEditSource( const AccessibleOutlineEditSource& ) = delete; + AccessibleOutlineEditSource& operator=( const AccessibleOutlineEditSource& ) = delete; DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 8781db72eb34..aa851e84fa63 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -150,8 +150,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage> mxPage; - AccessiblePageShape (const AccessiblePageShape&) SAL_DELETED_FUNCTION; - AccessibleShape& operator= (const AccessiblePageShape&) SAL_DELETED_FUNCTION; + AccessiblePageShape (const AccessiblePageShape&) = delete; + AccessibleShape& operator= (const AccessiblePageShape&) = delete; }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index ddf5b39ffa45..d118a61d8b20 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -58,9 +58,9 @@ public: OUString GetStyle() SAL_OVERRIDE; private: - AccessiblePresentationShape (const AccessiblePresentationShape&) SAL_DELETED_FUNCTION; + AccessiblePresentationShape (const AccessiblePresentationShape&) = delete; - AccessiblePresentationShape& operator= (const AccessiblePresentationShape&) SAL_DELETED_FUNCTION; + AccessiblePresentationShape& operator= (const AccessiblePresentationShape&) = delete; }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 704dba20bd42..7b050f72f13c 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -87,8 +87,8 @@ protected: OutputDevice& mrDevice; private: - AccessibleViewForwarder (AccessibleViewForwarder&) SAL_DELETED_FUNCTION; - AccessibleViewForwarder& operator= (AccessibleViewForwarder&) SAL_DELETED_FUNCTION; + AccessibleViewForwarder (AccessibleViewForwarder&) = delete; + AccessibleViewForwarder& operator= (AccessibleViewForwarder&) = delete; }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index 057ef8e99ab1..55f603fa7b3e 100644 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx @@ -82,9 +82,9 @@ private: MasterPageObserver(); virtual ~MasterPageObserver(); - MasterPageObserver (const MasterPageObserver&) SAL_DELETED_FUNCTION; + MasterPageObserver (const MasterPageObserver&) = delete; - MasterPageObserver& operator= (const MasterPageObserver&) SAL_DELETED_FUNCTION; + MasterPageObserver& operator= (const MasterPageObserver&) = delete; }; /** Objects of this class are sent to listeners of the MasterPageObserver diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 626dda1bbe34..2ba2764c59e8 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -114,9 +114,9 @@ private: /// The document rendered in the output devices. SdDrawDocument* mpDocument; - WindowUpdater (const WindowUpdater& rUpdater) SAL_DELETED_FUNCTION; + WindowUpdater (const WindowUpdater& rUpdater) = delete; - WindowUpdater operator= (const WindowUpdater& rUpdater) SAL_DELETED_FUNCTION; + WindowUpdater operator= (const WindowUpdater& rUpdater) = delete; /** Type and data member for a list of devices that have to be kept up-to-date. diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx index eec497eb91c6..538c935fe4c8 100644 --- a/sd/source/ui/inc/filedlg.hxx +++ b/sd/source/ui/inc/filedlg.hxx @@ -40,8 +40,8 @@ class SD_DLLPUBLIC SdOpenSoundFileDialog { const std::unique_ptr< SdFileDialog_Imp > mpImpl; - SdOpenSoundFileDialog (const SdOpenSoundFileDialog &) SAL_DELETED_FUNCTION; - SdOpenSoundFileDialog & operator= (const SdOpenSoundFileDialog &) SAL_DELETED_FUNCTION; + SdOpenSoundFileDialog (const SdOpenSoundFileDialog &) = delete; + SdOpenSoundFileDialog & operator= (const SdOpenSoundFileDialog &) = delete; public: SdOpenSoundFileDialog(); diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 36dfe6d8a220..19711d689d74 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -318,10 +318,10 @@ private: mxDisposeListener; FrameworkHelper (ViewShellBase& rBase); - FrameworkHelper (const FrameworkHelper& rHelper) SAL_DELETED_FUNCTION; + FrameworkHelper (const FrameworkHelper& rHelper) = delete; virtual ~FrameworkHelper(); class Deleter; friend class Deleter; - FrameworkHelper& operator= (const FrameworkHelper& rHelper) SAL_DELETED_FUNCTION; + FrameworkHelper& operator= (const FrameworkHelper& rHelper) = delete; void Initialize(); diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index 6edab02a4e24..5f2861dee2c2 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -97,7 +97,7 @@ private: ModuleController ( const css::uno::Reference<css::uno::XComponentContext>& rxContext) throw (std::exception); - ModuleController (const ModuleController&) SAL_DELETED_FUNCTION; + ModuleController (const ModuleController&) = delete; virtual ~ModuleController() throw(); /** Load a list of URL to service mappings from the diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 539031147709..5b6910d3b8eb 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -138,8 +138,8 @@ private: bool mbIsUnoObj : 1; ::std::vector<std::shared_ptr<UserData> > maUserData; - SdTransferable( const SdTransferable& ) SAL_DELETED_FUNCTION; - SdTransferable& operator=( const SdTransferable& ) SAL_DELETED_FUNCTION; + SdTransferable( const SdTransferable& ) = delete; + SdTransferable& operator=( const SdTransferable& ) = delete; void CreateObjectReplacement( SdrObject* pObj ); void CreateData(); diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 5b5f7dc92c7d..573bbf465024 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -201,8 +201,8 @@ private: void CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::Window* pParentWindow ); WorkWindow *GetWorkWindow(); - SlideShow(const SlideShow&) SAL_DELETED_FUNCTION; - SlideShow& operator=( const SlideShow& ) SAL_DELETED_FUNCTION; + SlideShow(const SlideShow&) = delete; + SlideShow& operator=( const SlideShow& ) = delete; SvxItemPropertySet maPropSet; diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index 291c600a1cdb..fc3d996b1b98 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -85,8 +85,8 @@ protected: bool mbSelected; private: - SmartTag( const SmartTag& ) SAL_DELETED_FUNCTION; - SmartTag& operator=( const SmartTag& ) SAL_DELETED_FUNCTION; + SmartTag( const SmartTag& ) = delete; + SmartTag& operator=( const SmartTag& ) = delete; }; typedef rtl::Reference< SmartTag > SmartTagReference; @@ -142,8 +142,8 @@ public: void CheckPossibilities(); private: - SmartTagSet( const SmartTagSet& ) SAL_DELETED_FUNCTION; - SmartTagSet& operator=( const SmartTagSet& ) SAL_DELETED_FUNCTION; + SmartTagSet( const SmartTagSet& ) = delete; + SmartTagSet& operator=( const SmartTagSet& ) = delete; /** adds a new smart tag to this set */ void add( const SmartTagReference& xTag ); diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx index 778b97dfbea4..7c01cc775bc2 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx @@ -98,9 +98,9 @@ private: */ void LateInit(); - RecentlyUsedMasterPages (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION; + RecentlyUsedMasterPages (const RecentlyUsedMasterPages&) = delete; - RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION; + RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&) = delete; void SendEvent(); DECL_LINK_TYPED(MasterPageChangeListener, MasterPageObserverEvent&, void); diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 21a23ecc3f6c..557a0f609a02 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -231,8 +231,8 @@ public: void mouseButtonUp(const MouseEvent& rMEvt); private: - SlideshowImpl(SlideshowImpl &) SAL_DELETED_FUNCTION; - void operator =(SlideshowImpl &) SAL_DELETED_FUNCTION; + SlideshowImpl(SlideshowImpl &) = delete; + void operator =(SlideshowImpl &) = delete; virtual ~SlideshowImpl(); diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 412971e995c6..d807070e8112 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -135,9 +135,9 @@ private: bool mbIsMouseOver : 1; bool mbHasTransition : 1; - PageDescriptor (const PageDescriptor& rDescriptor) SAL_DELETED_FUNCTION; + PageDescriptor (const PageDescriptor& rDescriptor) = delete; - PageDescriptor& operator= (const PageDescriptor& rDescriptor) SAL_DELETED_FUNCTION; + PageDescriptor& operator= (const PageDescriptor& rDescriptor) = delete; }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index b503109e019a..8f26b7bb002a 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -65,8 +65,8 @@ private: FontProvider(); virtual ~FontProvider(); - FontProvider (const FontProvider&) SAL_DELETED_FUNCTION; - FontProvider& operator= (const FontProvider&) SAL_DELETED_FUNCTION; + FontProvider (const FontProvider&) = delete; + FontProvider& operator= (const FontProvider&) = delete; }; } } } // end of namespace ::sd::slidesorter::view |