summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sd/inc/helper/simplereferencecomponent.hxx20
-rw-r--r--sd/inc/stlsheet.hxx2
-rw-r--r--sd/source/ui/inc/AccessibleOutlineEditSource.hxx6
-rw-r--r--sd/source/ui/inc/AccessiblePageShape.hxx10
-rw-r--r--sd/source/ui/inc/AccessiblePresentationShape.hxx11
-rw-r--r--sd/source/ui/inc/AccessibleViewForwarder.hxx4
-rw-r--r--sd/source/ui/inc/MasterPageObserver.hxx6
-rw-r--r--sd/source/ui/inc/WindowUpdater.hxx6
-rw-r--r--sd/source/ui/inc/filedlg.hxx5
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx4
-rw-r--r--sd/source/ui/inc/framework/ModuleController.hxx3
-rw-r--r--sd/source/ui/inc/sdxfer.hxx6
-rw-r--r--sd/source/ui/inc/slideshow.hxx5
-rw-r--r--sd/source/ui/inc/smarttag.hxx8
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx6
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx7
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx6
18 files changed, 38 insertions, 81 deletions
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index 795f176d6d35..3bb1de4d471f 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -78,25 +78,13 @@ protected:
private:
oslInterlockedCount m_nCount;
- /** not implemented
- @internal
- */
- SimpleReferenceComponent(SimpleReferenceComponent &);
+ SimpleReferenceComponent(SimpleReferenceComponent &) SAL_DELETED_FUNCTION;
- /** not implemented
- @internal
- */
- void operator =(SimpleReferenceComponent);
+ void operator =(SimpleReferenceComponent) SAL_DELETED_FUNCTION;
- /** not implemented (see general class documentation)
- @internal
- */
- static void * operator new[](std::size_t);
+ static void * operator new[](std::size_t) SAL_DELETED_FUNCTION;
- /** not implemented (see general class documentation)
- @internal
- */
- static void operator delete[](void * pPtr);
+ static void operator delete[](void * pPtr) SAL_DELETED_FUNCTION;
bool mbDisposed;
};
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index cf3243a9f254..41253670a83b 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -149,7 +149,7 @@ protected:
boost::scoped_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
private:
- SdStyleSheet& operator=( const SdStyleSheet& ); // not implemented
+ SdStyleSheet& operator=( const SdStyleSheet& ) SAL_DELETED_FUNCTION;
};
typedef rtl::Reference< SdStyleSheet > SdStyleSheetRef;
diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
index 4f46a73309f1..e4a35bdeded2 100644
--- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
@@ -73,10 +73,8 @@ namespace accessibility
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
private:
-
- // declared, but not defined
- AccessibleOutlineEditSource( const AccessibleOutlineEditSource& );
- AccessibleOutlineEditSource& operator=( const AccessibleOutlineEditSource& );
+ AccessibleOutlineEditSource( const AccessibleOutlineEditSource& ) SAL_DELETED_FUNCTION;
+ AccessibleOutlineEditSource& operator=( const AccessibleOutlineEditSource& ) SAL_DELETED_FUNCTION;
DECL_LINK( NotifyHdl, EENotify* );
diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx
index d0b83caf1253..cddb7a414ca1 100644
--- a/sd/source/ui/inc/AccessiblePageShape.hxx
+++ b/sd/source/ui/inc/AccessiblePageShape.hxx
@@ -150,14 +150,8 @@ private:
::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage> mxPage;
- /** Don't use the default constructor. Use the public constructor that
- takes the original shape and the parent as arguments instead.
- */
- explicit AccessiblePageShape (void);
- /// Don't use the copy constructor. Is there any use for it?
- explicit AccessiblePageShape (const AccessiblePageShape&);
- /// Don't use the assignment operator. Do we need this?
- AccessibleShape& operator= (const AccessiblePageShape&);
+ AccessiblePageShape (const AccessiblePageShape&) SAL_DELETED_FUNCTION;
+ AccessibleShape& operator= (const AccessiblePageShape&) SAL_DELETED_FUNCTION;
};
} // end of namespace accessibility
diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx
index 97a052febcd1..200ee7b14964 100644
--- a/sd/source/ui/inc/AccessiblePresentationShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx
@@ -58,16 +58,9 @@ public:
OUString GetStyle() SAL_OVERRIDE;
private:
- /** Don't use the default constructor. Use the public constructor that
- takes the original shape and the parent as arguments instead.
- */
- AccessiblePresentationShape (void);
-
- /// Don't use the constructor. Not yet implemented.
- AccessiblePresentationShape (const AccessiblePresentationShape&);
+ AccessiblePresentationShape (const AccessiblePresentationShape&) SAL_DELETED_FUNCTION;
- /// Don't use the assignment operator. Not yet implemented.
- AccessiblePresentationShape& operator= (const AccessiblePresentationShape&);
+ AccessiblePresentationShape& operator= (const AccessiblePresentationShape&) SAL_DELETED_FUNCTION;
};
} // end of namespace accessibility
diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx
index c0567bf0b9e7..b50b91b7651b 100644
--- a/sd/source/ui/inc/AccessibleViewForwarder.hxx
+++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx
@@ -118,8 +118,8 @@ protected:
OutputDevice& mrDevice;
private:
- AccessibleViewForwarder (AccessibleViewForwarder&);
- AccessibleViewForwarder& operator= (AccessibleViewForwarder&);
+ AccessibleViewForwarder (AccessibleViewForwarder&) SAL_DELETED_FUNCTION;
+ AccessibleViewForwarder& operator= (AccessibleViewForwarder&) SAL_DELETED_FUNCTION;
};
} // end of namespace accessibility
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index 0c8d7f657d65..0e2f8f77632c 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -80,11 +80,9 @@ private:
MasterPageObserver (void);
virtual ~MasterPageObserver (void);
- /// The copy constructor is not implemented. Do not use!
- MasterPageObserver (const MasterPageObserver&);
+ MasterPageObserver (const MasterPageObserver&) SAL_DELETED_FUNCTION;
- /// The assignment operator is not implemented. Do not use!
- MasterPageObserver& operator= (const MasterPageObserver&);
+ MasterPageObserver& operator= (const MasterPageObserver&) SAL_DELETED_FUNCTION;
};
/** 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 d768be7fb92e..b35c73c82a0c 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -113,11 +113,9 @@ private:
/// The document rendered in the output devices.
SdDrawDocument* mpDocument;
- /// Copy constructor not supported.
- WindowUpdater (const WindowUpdater& rUpdater);
+ WindowUpdater (const WindowUpdater& rUpdater) SAL_DELETED_FUNCTION;
- /// Assignment operator not supported.
- WindowUpdater operator= (const WindowUpdater& rUpdater);
+ WindowUpdater operator= (const WindowUpdater& rUpdater) SAL_DELETED_FUNCTION;
/** 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 232752216c07..eec497eb91c6 100644
--- a/sd/source/ui/inc/filedlg.hxx
+++ b/sd/source/ui/inc/filedlg.hxx
@@ -40,9 +40,8 @@ class SD_DLLPUBLIC SdOpenSoundFileDialog
{
const std::unique_ptr< SdFileDialog_Imp > mpImpl;
- // forbidden and not implemented
- SdOpenSoundFileDialog (const SdOpenSoundFileDialog &);
- SdOpenSoundFileDialog & operator= (const SdOpenSoundFileDialog &);
+ SdOpenSoundFileDialog (const SdOpenSoundFileDialog &) SAL_DELETED_FUNCTION;
+ SdOpenSoundFileDialog & operator= (const SdOpenSoundFileDialog &) SAL_DELETED_FUNCTION;
public:
SdOpenSoundFileDialog();
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index ca2a33db4919..749c57d6fc65 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -320,10 +320,10 @@ private:
mxDisposeListener;
FrameworkHelper (ViewShellBase& rBase);
- FrameworkHelper (const FrameworkHelper& rHelper); // Not implemented.
+ FrameworkHelper (const FrameworkHelper& rHelper) SAL_DELETED_FUNCTION;
virtual ~FrameworkHelper (void);
class Deleter; friend class Deleter;
- FrameworkHelper& operator= (const FrameworkHelper& rHelper); // Not implemented.
+ FrameworkHelper& operator= (const FrameworkHelper& rHelper) SAL_DELETED_FUNCTION;
void Initialize (void);
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 37e3a5f14cce..b1d279c79451 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -97,8 +97,7 @@ private:
ModuleController (
const css::uno::Reference<css::uno::XComponentContext>& rxContext)
throw (std::exception);
- ModuleController (void); // Not implemented.
- ModuleController (const ModuleController&); // Not implemented.
+ ModuleController (const ModuleController&) SAL_DELETED_FUNCTION;
virtual ~ModuleController (void) 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 a395bdfe779a..797d5205429f 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -138,10 +138,8 @@ private:
bool mbIsUnoObj : 1;
::std::vector<boost::shared_ptr<UserData> > maUserData;
- // not available
- SdTransferable();
- SdTransferable( const SdTransferable& );
- SdTransferable& operator=( const SdTransferable& );
+ SdTransferable( const SdTransferable& ) SAL_DELETED_FUNCTION;
+ SdTransferable& operator=( const SdTransferable& ) SAL_DELETED_FUNCTION;
void CreateObjectReplacement( SdrObject* pObj );
void CreateData();
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 418da148ed06..f4cc6c2909c2 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -197,9 +197,8 @@ private:
void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::vcl::Window* pParentWindow );
WorkWindow *GetWorkWindow();
- // default: disabled copy/assignment
- SlideShow(const SlideShow&);
- SlideShow& operator=( const SlideShow& );
+ SlideShow(const SlideShow&) SAL_DELETED_FUNCTION;
+ SlideShow& operator=( const SlideShow& ) SAL_DELETED_FUNCTION;
SvxItemPropertySet maPropSet;
diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx
index f227e417d911..0051ce18a33f 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& ); // not implemented
- SmartTag& operator=( const SmartTag& ); // not implemented
+ SmartTag( const SmartTag& ) SAL_DELETED_FUNCTION;
+ SmartTag& operator=( const SmartTag& ) SAL_DELETED_FUNCTION;
};
typedef rtl::Reference< SmartTag > SmartTagReference;
@@ -142,8 +142,8 @@ public:
void CheckPossibilities();
private:
- SmartTagSet( const SmartTagSet& ); // not implemented
- SmartTagSet& operator=( const SmartTagSet& ); // not implemented
+ SmartTagSet( const SmartTagSet& ) SAL_DELETED_FUNCTION;
+ SmartTagSet& operator=( const SmartTagSet& ) SAL_DELETED_FUNCTION;
/** 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 37af4a8199e3..c4725f678d1b 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -98,11 +98,9 @@ private:
*/
void LateInit (void);
- /// The copy constructor is not implemented. Do not use!
- RecentlyUsedMasterPages (const RecentlyUsedMasterPages&);
+ RecentlyUsedMasterPages (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION;
- /// The assignment operator is not implemented. Do not use!
- RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&);
+ RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION;
void SendEvent (void);
DECL_LINK(MasterPageChangeListener, MasterPageObserverEvent*);
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 0f584cdfa4c8..5506007286f8 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -229,8 +229,8 @@ public:
void mouseButtonUp(const MouseEvent& rMEvt);
private:
- SlideshowImpl(SlideshowImpl &); // not defined
- void operator =(SlideshowImpl &); // not defined
+ SlideshowImpl(SlideshowImpl &) SAL_DELETED_FUNCTION;
+ void operator =(SlideshowImpl &) SAL_DELETED_FUNCTION;
virtual ~SlideshowImpl();
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index 2bcb359308c2..3638af33dd86 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -135,12 +135,9 @@ private:
bool mbIsMouseOver : 1;
bool mbHasTransition : 1;
- // Do not use the copy constructor operator. It is not implemented.
- PageDescriptor (const PageDescriptor& rDescriptor);
+ PageDescriptor (const PageDescriptor& rDescriptor) SAL_DELETED_FUNCTION;
- // Do not use the assignment operator. It is not implemented
- // (mrPage can not be assigned).
- PageDescriptor& operator= (const PageDescriptor& rDescriptor);
+ PageDescriptor& operator= (const PageDescriptor& rDescriptor) SAL_DELETED_FUNCTION;
};
} } } // 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 23459c74543f..d901f8353a71 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
@@ -65,10 +65,8 @@ private:
FontProvider (void);
virtual ~FontProvider (void);
- // Copy constructor is not implemented.
- FontProvider (const FontProvider&);
- // Assignment operator is not implemented.
- FontProvider& operator= (const FontProvider&);
+ FontProvider (const FontProvider&) SAL_DELETED_FUNCTION;
+ FontProvider& operator= (const FontProvider&) SAL_DELETED_FUNCTION;
};
} } } // end of namespace ::sd::slidesorter::view
generated by cgit (git 2.34.1) at 2025-03-01 20:30:03 +0000