summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/sdr/contact/viewcontactofunocontrol.hxx4
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx8
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.hxx4
-rw-r--r--svx/source/engine3d/view3d.cxx4
-rw-r--r--svx/source/inc/datanavi.hxx4
-rw-r--r--svx/source/inc/delayedevent.hxx4
-rw-r--r--svx/source/inc/fmobj.hxx2
-rw-r--r--svx/source/inc/fmpgeimp.hxx4
-rw-r--r--svx/source/inc/formcontrolling.hxx4
-rw-r--r--svx/source/svdraw/svdfmtf.hxx4
-rw-r--r--svx/source/table/accessiblecell.hxx4
-rw-r--r--svx/source/table/tablertfimporter.cxx4
-rw-r--r--svx/source/unogallery/unogalitem.hxx4
13 files changed, 27 insertions, 27 deletions
diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
index 9544170bc834..3e271d1bde79 100644
--- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
@@ -73,8 +73,8 @@ namespace sdr { namespace contact {
virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) SAL_OVERRIDE;
private:
- ViewContactOfUnoControl( const ViewContactOfUnoControl& ) SAL_DELETED_FUNCTION;
- ViewContactOfUnoControl& operator=( const ViewContactOfUnoControl& ) SAL_DELETED_FUNCTION;
+ ViewContactOfUnoControl( const ViewContactOfUnoControl& ) = delete;
+ ViewContactOfUnoControl& operator=( const ViewContactOfUnoControl& ) = delete;
protected:
// This method is responsible for creating the graphical visualisation data
diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
index 2d461f849b1d..25a7229c5200 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -100,8 +100,8 @@ namespace sdr { namespace contact {
void impl_onControlChangedOrModified();
private:
- ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& ) SAL_DELETED_FUNCTION;
- ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ) SAL_DELETED_FUNCTION;
+ ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& ) = delete;
+ ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ) = delete;
};
class SVX_DLLPRIVATE UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl
@@ -111,8 +111,8 @@ namespace sdr { namespace contact {
virtual ~UnoControlPrintOrPreviewContact();
private:
- UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& ) SAL_DELETED_FUNCTION;
- UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ) SAL_DELETED_FUNCTION;
+ UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& ) = delete;
+ UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ) = delete;
virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const SAL_OVERRIDE;
};
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index ccacc2d582ad..dbe40fac7beb 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -363,8 +363,8 @@ private:
*/
sal_Int32 mnNewNameIndex;
- ChildrenManagerImpl (const ChildrenManagerImpl&) SAL_DELETED_FUNCTION;
- ChildrenManagerImpl& operator= (const ChildrenManagerImpl&) SAL_DELETED_FUNCTION;
+ ChildrenManagerImpl (const ChildrenManagerImpl&) = delete;
+ ChildrenManagerImpl& operator= (const ChildrenManagerImpl&) = delete;
/** This member points to the currently focused shape. It is NULL when
there is no focused shape.
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index ec2045604711..8efce1078997 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -93,8 +93,8 @@ class Impl3DMirrorConstructOverlay
drawinglayer::primitive2d::Primitive2DSequence maFullOverlay;
// Copy assignment is forbidden and not implemented.
- Impl3DMirrorConstructOverlay (const Impl3DMirrorConstructOverlay &) SAL_DELETED_FUNCTION;
- Impl3DMirrorConstructOverlay & operator= (const Impl3DMirrorConstructOverlay &) SAL_DELETED_FUNCTION;
+ Impl3DMirrorConstructOverlay (const Impl3DMirrorConstructOverlay &) = delete;
+ Impl3DMirrorConstructOverlay & operator= (const Impl3DMirrorConstructOverlay &) = delete;
public:
explicit Impl3DMirrorConstructOverlay(const E3dView& rView);
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 49bf3cbd74bf..df846f608216 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -160,7 +160,7 @@ namespace svxform
OUString m_sInstance_API;
OUString m_sNone_API;
- ReplaceString( const ReplaceString& ) SAL_DELETED_FUNCTION;
+ ReplaceString( const ReplaceString& ) = delete;
public:
ReplaceString() :
@@ -208,7 +208,7 @@ namespace svxform
OUString m_sPut_API;
OUString m_sGet_API;
- MethodString( const MethodString& ) SAL_DELETED_FUNCTION;
+ MethodString( const MethodString& ) = delete;
public:
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index 113948a8e404..d5a33dd6ecfc 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -69,8 +69,8 @@ namespace svxform
DECL_LINK_TYPED( OnCall, void*, void );
private:
- DelayedEvent( const DelayedEvent& ) SAL_DELETED_FUNCTION;
- DelayedEvent& operator=( const DelayedEvent& ) SAL_DELETED_FUNCTION;
+ DelayedEvent( const DelayedEvent& ) = delete;
+ DelayedEvent& operator=( const DelayedEvent& ) = delete;
};
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 38ff2b6906be..133d18f97383 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -29,7 +29,7 @@
class SVX_DLLPUBLIC FmFormObj: public SdrUnoObj
{
- FmFormObj( const FmFormObj& ) SAL_DELETED_FUNCTION;
+ FmFormObj( const FmFormObj& ) = delete;
::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > aEvts; // events des Objects
::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor> m_aEventsHistory;
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 7ee1c1813c54..dccda1cd3f37 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -141,8 +141,8 @@ private:
impl_createControlShapeMap_nothrow();
private:
- FmFormPageImpl( const FmFormPageImpl& ) SAL_DELETED_FUNCTION;
- FmFormPageImpl& operator=( const FmFormPageImpl& ) SAL_DELETED_FUNCTION;
+ FmFormPageImpl( const FmFormPageImpl& ) = delete;
+ FmFormPageImpl& operator=( const FmFormPageImpl& ) = delete;
};
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index f3b1f7d1730f..57bab7e5caa4 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -209,8 +209,8 @@ namespace svx
}
private:
- FormControllerHelper( const FormControllerHelper& ) SAL_DELETED_FUNCTION;
- FormControllerHelper& operator=( const FormControllerHelper& ) SAL_DELETED_FUNCTION;
+ FormControllerHelper( const FormControllerHelper& ) = delete;
+ FormControllerHelper& operator=( const FormControllerHelper& ) = delete;
};
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index c290ceb978fc..7e253091dd60 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -154,8 +154,8 @@ protected:
private:
// Copy assignment is forbidden and not implemented.
- ImpSdrGDIMetaFileImport (const ImpSdrGDIMetaFileImport &) SAL_DELETED_FUNCTION;
- ImpSdrGDIMetaFileImport & operator= (const ImpSdrGDIMetaFileImport &) SAL_DELETED_FUNCTION;
+ ImpSdrGDIMetaFileImport (const ImpSdrGDIMetaFileImport &) = delete;
+ ImpSdrGDIMetaFileImport & operator= (const ImpSdrGDIMetaFileImport &) = delete;
public:
ImpSdrGDIMetaFileImport(
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index b7497fcf71c0..44518b83865b 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -131,8 +131,8 @@ protected:
AccessibleTableShape *pAccTable;
private:
- AccessibleCell(const AccessibleCell&) SAL_DELETED_FUNCTION;
- AccessibleCell& operator=(const AccessibleCell&) SAL_DELETED_FUNCTION;
+ AccessibleCell(const AccessibleCell&) = delete;
+ AccessibleCell& operator=(const AccessibleCell&) = delete;
};
} // end of namespace accessibility
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index d37f07cac3b2..1efb02a67baa 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -121,8 +121,8 @@ private:
Reference< XTable > mxTable;
// Copy assignment is forbidden and not implemented.
- SdrTableRTFParser (const SdrTableRTFParser &) SAL_DELETED_FUNCTION;
- SdrTableRTFParser & operator= (const SdrTableRTFParser &) SAL_DELETED_FUNCTION;
+ SdrTableRTFParser (const SdrTableRTFParser &) = delete;
+ SdrTableRTFParser & operator= (const SdrTableRTFParser &) = delete;
};
SdrTableRTFParser::SdrTableRTFParser( SdrTableObj& rTableObj )
diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx
index e1bb9a22044f..349e0a5404d7 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -95,8 +95,8 @@ private:
const ::GalleryObject* implGetObject() const { return mpGalleryObject;}
void implSetInvalid();
- GalleryItem( const GalleryItem& ) SAL_DELETED_FUNCTION;
- GalleryItem& operator=( const GalleryItem& ) SAL_DELETED_FUNCTION;
+ GalleryItem( const GalleryItem& ) = delete;
+ GalleryItem& operator=( const GalleryItem& ) = delete;
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 19:52:57 +0000