summaryrefslogtreecommitdiffstats
path: root/sc/source
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 /sc/source
parentHAVE_CXX11_DELETE is required on all supported toolchains (diff)
downloadcore-bff4c13475957863bfa7da5bc3bcf82a64a7503a.tar.gz
core-bff4c13475957863bfa7da5bc3bcf82a64a7503a.zip
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/core/inc/bcaslot.hxx4
-rw-r--r--sc/source/core/inc/jumpmatrix.hxx4
-rw-r--r--sc/source/filter/inc/biffhelper.hxx4
-rw-r--r--sc/source/filter/inc/xestream.hxx4
-rw-r--r--sc/source/ui/inc/docsh.hxx4
-rw-r--r--sc/source/ui/inc/reffact.hxx24
-rw-r--r--sc/source/ui/inc/undobase.hxx2
-rw-r--r--sc/source/ui/unoobj/celllistsource.hxx4
-rw-r--r--sc/source/ui/unoobj/cellvaluebinding.hxx4
9 files changed, 27 insertions, 27 deletions
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index e51cfb40fe3c..27ff119e8125 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -279,8 +279,8 @@ private:
private:
ScBroadcastAreaSlot** ppSlots;
- TableSlots( const TableSlots& ) SAL_DELETED_FUNCTION;
- TableSlots& operator=( const TableSlots& ) SAL_DELETED_FUNCTION;
+ TableSlots( const TableSlots& ) = delete;
+ TableSlots& operator=( const TableSlots& ) = delete;
};
typedef ::std::map< SCTAB, TableSlots* > TableSlotsMap;
diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx
index 62b6a58e05aa..9d280833e0c8 100644
--- a/sc/source/core/inc/jumpmatrix.hxx
+++ b/sc/source/core/inc/jumpmatrix.hxx
@@ -89,8 +89,8 @@ class ScJumpMatrix
/** Flush different types or non-consecutive buffers. */
void FlushBufferOtherThan( BufferType eType, SCSIZE nC, SCSIZE nR );
- ScJumpMatrix( const ScJumpMatrix& ) SAL_DELETED_FUNCTION;
- ScJumpMatrix& operator=( const ScJumpMatrix& ) SAL_DELETED_FUNCTION;
+ ScJumpMatrix( const ScJumpMatrix& ) = delete;
+ ScJumpMatrix& operator=( const ScJumpMatrix& ) = delete;
public:
ScJumpMatrix( SCSIZE nColsP, SCSIZE nRowsP );
diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx
index 33d8bd202884..3a0c39c6ad0b 100644
--- a/sc/source/filter/inc/biffhelper.hxx
+++ b/sc/source/filter/inc/biffhelper.hxx
@@ -627,8 +627,8 @@ public:
static bool skipRecordBlock( BiffInputStream& rStrm, sal_uInt16 nEndRecId );
private:
- BiffHelper() SAL_DELETED_FUNCTION;
- ~BiffHelper() SAL_DELETED_FUNCTION;
+ BiffHelper() = delete;
+ ~BiffHelper() = delete;
};
/** BIFF12 stream operator for an OUString, reads 32-bit string length and Unicode array. */
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index dce1cd4cc85f..57838a58cd9a 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -252,8 +252,8 @@ class XclXmlUtils
{
XclXmlUtils();
~XclXmlUtils();
- XclXmlUtils(const XclXmlUtils&) SAL_DELETED_FUNCTION;
- XclXmlUtils& operator=(const XclXmlUtils&) SAL_DELETED_FUNCTION;
+ XclXmlUtils(const XclXmlUtils&) = delete;
+ XclXmlUtils& operator=(const XclXmlUtils&) = delete;
public:
static void GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& sType, OUString& rValue);
static OUString GetStreamName( const char* sStreamDir, const char* sStream, sal_Int32 nId );
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 0b5fdcdecc95..9ae154bdc4d0 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -457,8 +457,8 @@ class SC_DLLPUBLIC ScDocShellModificator
bool bAutoCalcShellDisabled;
bool bIdleEnabled;
- ScDocShellModificator( const ScDocShellModificator& ) SAL_DELETED_FUNCTION;
- ScDocShellModificator& operator=( const ScDocShellModificator& ) SAL_DELETED_FUNCTION;
+ ScDocShellModificator( const ScDocShellModificator& ) = delete;
+ ScDocShellModificator& operator=( const ScDocShellModificator& ) = delete;
public:
ScDocShellModificator( ScDocShell& );
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index ae843fc95f7d..5be200c9569f 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -56,84 +56,84 @@ class ScDescriptiveStatisticsDialogWrapper :
public ChildWindowWrapper<SID_DESCRIPTIVE_STATISTICS_DIALOG>
{
private:
- ScDescriptiveStatisticsDialogWrapper() SAL_DELETED_FUNCTION;
+ ScDescriptiveStatisticsDialogWrapper() = delete;
};
class ScSamplingDialogWrapper :
public ChildWindowWrapper<SID_SAMPLING_DIALOG>
{
private:
- ScSamplingDialogWrapper() SAL_DELETED_FUNCTION;
+ ScSamplingDialogWrapper() = delete;
};
class ScRandomNumberGeneratorDialogWrapper :
public ChildWindowWrapper<SID_RANDOM_NUMBER_GENERATOR_DIALOG>
{
private:
- ScRandomNumberGeneratorDialogWrapper() SAL_DELETED_FUNCTION;
+ ScRandomNumberGeneratorDialogWrapper() = delete;
};
class ScAnalysisOfVarianceDialogWrapper :
public ChildWindowWrapper<SID_ANALYSIS_OF_VARIANCE_DIALOG>
{
private:
- ScAnalysisOfVarianceDialogWrapper() SAL_DELETED_FUNCTION;
+ ScAnalysisOfVarianceDialogWrapper() = delete;
};
class ScCorrelationDialogWrapper :
public ChildWindowWrapper<SID_CORRELATION_DIALOG>
{
private:
- ScCorrelationDialogWrapper() SAL_DELETED_FUNCTION;
+ ScCorrelationDialogWrapper() = delete;
};
class ScCovarianceDialogWrapper :
public ChildWindowWrapper<SID_COVARIANCE_DIALOG>
{
private:
- ScCovarianceDialogWrapper() SAL_DELETED_FUNCTION;
+ ScCovarianceDialogWrapper() = delete;
};
class ScExponentialSmoothingDialogWrapper :
public ChildWindowWrapper<SID_EXPONENTIAL_SMOOTHING_DIALOG>
{
private:
- ScExponentialSmoothingDialogWrapper() SAL_DELETED_FUNCTION;
+ ScExponentialSmoothingDialogWrapper() = delete;
};
class ScMovingAverageDialogWrapper :
public ChildWindowWrapper<SID_MOVING_AVERAGE_DIALOG>
{
private:
- ScMovingAverageDialogWrapper() SAL_DELETED_FUNCTION;
+ ScMovingAverageDialogWrapper() = delete;
};
class ScTTestDialogWrapper :
public ChildWindowWrapper<SID_TTEST_DIALOG>
{
private:
- ScTTestDialogWrapper() SAL_DELETED_FUNCTION;
+ ScTTestDialogWrapper() = delete;
};
class ScFTestDialogWrapper :
public ChildWindowWrapper<SID_FTEST_DIALOG>
{
private:
- ScFTestDialogWrapper() SAL_DELETED_FUNCTION;
+ ScFTestDialogWrapper() = delete;
};
class ScZTestDialogWrapper :
public ChildWindowWrapper<SID_ZTEST_DIALOG>
{
private:
- ScZTestDialogWrapper() SAL_DELETED_FUNCTION;
+ ScZTestDialogWrapper() = delete;
};
class ScChiSquareTestDialogWrapper :
public ChildWindowWrapper<SID_CHI_SQUARE_TEST_DIALOG>
{
private:
- ScChiSquareTestDialogWrapper() SAL_DELETED_FUNCTION;
+ ScChiSquareTestDialogWrapper() = delete;
};
class ScAcceptChgDlgWrapper: public SfxChildWindow
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 67ecb454d784..7d6326e55bf5 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -36,7 +36,7 @@ class ScDBData;
class ScSimpleUndo: public SfxUndoAction
{
- ScSimpleUndo(const ScSimpleUndo&) SAL_DELETED_FUNCTION;
+ ScSimpleUndo(const ScSimpleUndo&) = delete;
public:
typedef boost::ptr_map<SCTAB,sc::ColumnSpanSet> DataSpansType;
diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx
index e42f92c922b3..5df49eefa6cb 100644
--- a/sc/source/ui/unoobj/celllistsource.hxx
+++ b/sc/source/ui/unoobj/celllistsource.hxx
@@ -143,8 +143,8 @@ namespace calc
void notifyModified();
private:
- OCellListSource( const OCellListSource& ) SAL_DELETED_FUNCTION;
- OCellListSource& operator=( const OCellListSource& ) SAL_DELETED_FUNCTION;
+ OCellListSource( const OCellListSource& ) = delete;
+ OCellListSource& operator=( const OCellListSource& ) = delete;
};
} // namespace calc
diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx
index 612ad1c6dd61..8b23bb56d4f2 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.hxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.hxx
@@ -138,8 +138,8 @@ namespace calc
void setBooleanFormat();
private:
- OCellValueBinding( const OCellValueBinding& ) SAL_DELETED_FUNCTION;
- OCellValueBinding& operator=( const OCellValueBinding& ) SAL_DELETED_FUNCTION;
+ OCellValueBinding( const OCellValueBinding& ) = delete;
+ OCellValueBinding& operator=( const OCellValueBinding& ) = delete;
};
} // namespace calc