summaryrefslogtreecommitdiff
path: root/reportdesign/inc
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/inc')
-rw-r--r--reportdesign/inc/ModuleHelper.hxx2
-rw-r--r--reportdesign/inc/PropertyForward.hxx4
-rw-r--r--reportdesign/inc/ReportDefinition.hxx4
-rw-r--r--reportdesign/inc/RptModel.hxx4
-rw-r--r--reportdesign/inc/RptObject.hxx4
-rw-r--r--reportdesign/inc/RptPage.hxx2
-rw-r--r--reportdesign/inc/UndoActions.hxx8
-rw-r--r--reportdesign/inc/UndoEnv.hxx4
-rw-r--r--reportdesign/inc/conditionalexpression.hxx4
9 files changed, 18 insertions, 18 deletions
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx
index e88971bb45c5..55b58bab9937 100644
--- a/reportdesign/inc/ModuleHelper.hxx
+++ b/reportdesign/inc/ModuleHelper.hxx
@@ -37,7 +37,7 @@ namespace rptui
friend class OModuleClient;
private:
- OModule() SAL_DELETED_FUNCTION; //TODO: get rid of this class
+ OModule() = delete; //TODO: get rid of this class
protected:
static sal_Int32 s_nClients; /// number of registered clients
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index a9c61b71ece3..1e8daa88fb67 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -49,8 +49,8 @@ namespace rptui
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDest;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xDestInfo;
bool m_bInChange;
- OPropertyMediator(OPropertyMediator&) SAL_DELETED_FUNCTION;
- void operator =(OPropertyMediator&) SAL_DELETED_FUNCTION;
+ OPropertyMediator(OPropertyMediator&) = delete;
+ void operator =(OPropertyMediator&) = delete;
protected:
virtual ~OPropertyMediator();
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index adad74da4c79..2d6e7a565418 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -91,8 +91,8 @@ namespace reportdesign
std::shared_ptr<OReportDefinitionImpl> m_pImpl;
private:
- OReportDefinition(const OReportDefinition&) SAL_DELETED_FUNCTION;
- OReportDefinition& operator=(const OReportDefinition&) SAL_DELETED_FUNCTION;
+ OReportDefinition(const OReportDefinition&) = delete;
+ OReportDefinition& operator=(const OReportDefinition&) = delete;
void setSection( const OUString& _sProperty
,const bool& _bOn
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index d3a606240033..793ab26683ff 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -49,8 +49,8 @@ private:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE;
- OReportModel( const OReportModel& ) SAL_DELETED_FUNCTION;
- void operator=(const OReportModel& rSrcModel) SAL_DELETED_FUNCTION;
+ OReportModel( const OReportModel& ) = delete;
+ void operator=(const OReportModel& rSrcModel) = delete;
public:
TYPEINFO_OVERRIDE();
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index a9eff84462ea..76b01b31faa3 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -53,8 +53,8 @@ typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexTo
private:
DlgEdHintKind eHintKind;
- DlgEdHint(DlgEdHint&) SAL_DELETED_FUNCTION;
- void operator =(DlgEdHint&) SAL_DELETED_FUNCTION;
+ DlgEdHint(DlgEdHint&) = delete;
+ void operator =(DlgEdHint&) = delete;
public:
DlgEdHint( DlgEdHintKind eHint );
virtual ~DlgEdHint();
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index e45a9064da48..40df189b9354 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -34,7 +34,7 @@ class OReportModel;
class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
{
- OReportPage& operator=(const OReportPage&) SAL_DELETED_FUNCTION;
+ OReportPage& operator=(const OReportPage&) = delete;
OReportModel& rModel;
::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection;
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 1190412646e8..c6cb8b9ade86 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -61,8 +61,8 @@ namespace rptui
class REPORTDESIGN_DLLPUBLIC OGroupHelper
{
::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup;
- OGroupHelper(const OGroupHelper&) SAL_DELETED_FUNCTION;
- OGroupHelper& operator=(const OGroupHelper&) SAL_DELETED_FUNCTION;
+ OGroupHelper(const OGroupHelper&) = delete;
+ OGroupHelper& operator=(const OGroupHelper&) = delete;
public:
OGroupHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup)
:m_xGroup(_xGroup)
@@ -169,8 +169,8 @@ namespace rptui
class REPORTDESIGN_DLLPUBLIC OUndoContainerAction: public OCommentUndoAction
{
- OUndoContainerAction(OUndoContainerAction&) SAL_DELETED_FUNCTION;
- void operator =(OUndoContainerAction&) SAL_DELETED_FUNCTION;
+ OUndoContainerAction(OUndoContainerAction&) = delete;
+ void operator =(OUndoContainerAction&) = delete;
protected:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
m_xElement; // object not owned by the action
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index 78a36c5c602f..687923e5b13c 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -42,8 +42,8 @@ namespace rptui
{
const ::std::unique_ptr<OXUndoEnvironmentImpl> m_pImpl;
- OXUndoEnvironment(const OXUndoEnvironment&) SAL_DELETED_FUNCTION;
- OXUndoEnvironment& operator=(const OXUndoEnvironment&) SAL_DELETED_FUNCTION;
+ OXUndoEnvironment(const OXUndoEnvironment&) = delete;
+ OXUndoEnvironment& operator=(const OXUndoEnvironment&) = delete;
protected:
virtual ~OXUndoEnvironment();
diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx
index 6ffaad730e83..4e581f2dac0c 100644
--- a/reportdesign/inc/conditionalexpression.hxx
+++ b/reportdesign/inc/conditionalexpression.hxx
@@ -98,8 +98,8 @@ namespace rptui
static size_t getKnownConditionalExpressions( ConditionalExpressions& _out_rCondExp );
private:
- ConditionalExpressionFactory( const ConditionalExpressionFactory& ) SAL_DELETED_FUNCTION;
- ConditionalExpressionFactory& operator=( const ConditionalExpressionFactory& ) SAL_DELETED_FUNCTION;
+ ConditionalExpressionFactory( const ConditionalExpressionFactory& ) = delete;
+ ConditionalExpressionFactory& operator=( const ConditionalExpressionFactory& ) = delete;
};
} // namespace rptui
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 03:42:41 +0000