summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 15:25:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:26 +0200
commitbff4c13475957863bfa7da5bc3bcf82a64a7503a (patch)
tree23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /chart2
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/accessibility/AccessibleViewForwarder.hxx4
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ChartType_UNO.hxx4
-rw-r--r--chart2/source/inc/DiagramHelper.hxx2
-rw-r--r--chart2/source/inc/LifeTime.hxx4
-rw-r--r--chart2/source/inc/ModifyListenerCallBack.hxx2
-rw-r--r--chart2/source/inc/RelativeSizeHelper.hxx2
-rw-r--r--chart2/source/view/inc/VDiagram.hxx2
8 files changed, 11 insertions, 11 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
index a1cbca5c9355..ce5f20cde68d 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
@@ -42,8 +42,8 @@ public:
virtual Size LogicToPixel( const Size& rSize ) const SAL_OVERRIDE;
private:
- AccessibleViewForwarder( AccessibleViewForwarder& ) SAL_DELETED_FUNCTION;
- AccessibleViewForwarder& operator=( AccessibleViewForwarder& ) SAL_DELETED_FUNCTION;
+ AccessibleViewForwarder( AccessibleViewForwarder& ) = delete;
+ AccessibleViewForwarder& operator=( AccessibleViewForwarder& ) = delete;
AccessibleChartView* m_pAccChartView;
VclPtr<vcl::Window> m_pWindow;
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index a04101b0595a..60cc12b30696 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -183,7 +183,7 @@ private:
DECL_LINK_TYPED( SeriesHeaderGotFocus, Control&, void );
DECL_LINK_TYPED( SeriesHeaderChanged, impl::SeriesHeaderEdit*, void );
- DataBrowser( const DataBrowser & ) SAL_DELETED_FUNCTION;
+ DataBrowser( const DataBrowser & ) = delete;
};
} // namespace chart
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index 611db51fff52..01aab488f4fc 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -59,8 +59,8 @@ private:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
- ChartTypeUnoDlg(const ChartTypeUnoDlg&) SAL_DELETED_FUNCTION;
- void operator =(const ChartTypeUnoDlg&) SAL_DELETED_FUNCTION;
+ ChartTypeUnoDlg(const ChartTypeUnoDlg&) = delete;
+ void operator =(const ChartTypeUnoDlg&) = delete;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel;
};
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index 2272d9a20bc0..fa168fb87327 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -346,7 +346,7 @@ public:
, bool bConvertAlsoFromAutoPositioning );
private:
- DiagramHelper() SAL_DELETED_FUNCTION;
+ DiagramHelper() = delete;
};
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 715b57351eb4..687f15a2d4e4 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -203,8 +203,8 @@ private:
bool m_bLongLastingCallRegistered;
private:
- LifeTimeGuard( const LifeTimeGuard& ) SAL_DELETED_FUNCTION;
- LifeTimeGuard& operator= ( const LifeTimeGuard& ) SAL_DELETED_FUNCTION;
+ LifeTimeGuard( const LifeTimeGuard& ) = delete;
+ LifeTimeGuard& operator= ( const LifeTimeGuard& ) = delete;
};
template<class T>
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx
index 60fff63eb7ba..ad1b2b3d2083 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -43,7 +43,7 @@ public:
SAL_DLLPRIVATE void stopListening();
private: //methods
- ModifyListenerCallBack( const ModifyListenerCallBack& ) SAL_DELETED_FUNCTION;
+ ModifyListenerCallBack( const ModifyListenerCallBack& ) = delete;
private: //member
ModifyListenerCallBack_impl* pModifyListener_impl;
diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx
index a6fa1a665dd5..dfc2df420c10 100644
--- a/chart2/source/inc/RelativeSizeHelper.hxx
+++ b/chart2/source/inc/RelativeSizeHelper.hxx
@@ -41,7 +41,7 @@ public:
const ::com::sun::star::awt::Size & rNewReferenceSize );
private:
- RelativeSizeHelper() SAL_DELETED_FUNCTION;
+ RelativeSizeHelper() = delete;
};
} // namespace chart
diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx
index 8b4b0e9bc3d4..89eecfa41f31 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -78,7 +78,7 @@ private: //methods
void adjustAspectRatio3d( const ::com::sun::star::awt::Size& rAvailableSize );
private: //members
- VDiagram(const VDiagram& rD) SAL_DELETED_FUNCTION;
+ VDiagram(const VDiagram& rD) = delete;
::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes > m_xTarget;