From bff4c13475957863bfa7da5bc3bcf82a64a7503a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 15:25:41 +0200 Subject: Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3 --- sc/inc/attarray.hxx | 4 ++-- sc/inc/bulkdatahint.hxx | 4 ++-- sc/inc/cellvalues.hxx | 8 ++++---- sc/inc/chart2uno.hxx | 4 ++-- sc/inc/chartarr.hxx | 2 +- sc/inc/chartlis.hxx | 6 +++--- sc/inc/chartlock.hxx | 4 ++-- sc/inc/chartpos.hxx | 4 ++-- sc/inc/chgtrack.hxx | 12 ++++++------ sc/inc/column.hxx | 4 ++-- sc/inc/compare.hxx | 4 ++-- sc/inc/conditio.hxx | 2 +- sc/inc/dapiuno.hxx | 2 +- sc/inc/document.hxx | 2 +- sc/inc/dpdimsave.hxx | 2 +- sc/inc/dpfilteredcache.hxx | 2 +- sc/inc/drawpage.hxx | 2 +- sc/inc/externalrefmgr.hxx | 6 +++--- sc/inc/formulacell.hxx | 2 +- sc/inc/linkuno.hxx | 4 ++-- sc/inc/listenerquery.hxx | 4 ++-- sc/inc/lookupcache.hxx | 6 +++--- sc/inc/patattr.hxx | 4 ++-- sc/inc/postit.hxx | 4 ++-- sc/inc/progress.hxx | 4 ++-- sc/inc/scmatrix.hxx | 4 ++-- sc/inc/token.hxx | 4 ++-- sc/inc/unitconv.hxx | 2 +- sc/source/core/inc/bcaslot.hxx | 4 ++-- sc/source/core/inc/jumpmatrix.hxx | 4 ++-- sc/source/filter/inc/biffhelper.hxx | 4 ++-- sc/source/filter/inc/xestream.hxx | 4 ++-- sc/source/ui/inc/docsh.hxx | 4 ++-- sc/source/ui/inc/reffact.hxx | 24 ++++++++++++------------ sc/source/ui/inc/undobase.hxx | 2 +- sc/source/ui/unoobj/celllistsource.hxx | 4 ++-- sc/source/ui/unoobj/cellvaluebinding.hxx | 4 ++-- 37 files changed, 83 insertions(+), 83 deletions(-) (limited to 'sc') diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index c555a12a433d..1b0a646d5ee9 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -95,8 +95,8 @@ friend class ScHorizontalAttrIterator; void RemoveCellCharAttribs( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, ScEditDataArray* pDataArray ); - ScAttrArray(const ScAttrArray&) SAL_DELETED_FUNCTION; - ScAttrArray& operator=(const ScAttrArray&) SAL_DELETED_FUNCTION; + ScAttrArray(const ScAttrArray&) = delete; + ScAttrArray& operator=(const ScAttrArray&) = delete; public: ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ); diff --git a/sc/inc/bulkdatahint.hxx b/sc/inc/bulkdatahint.hxx index f5361ac3452f..450a19f08931 100644 --- a/sc/inc/bulkdatahint.hxx +++ b/sc/inc/bulkdatahint.hxx @@ -23,8 +23,8 @@ class BulkDataHint : public SfxSimpleHint struct Impl; Impl* mpImpl; - BulkDataHint( const BulkDataHint& ) SAL_DELETED_FUNCTION; - BulkDataHint& operator= ( const BulkDataHint& ) SAL_DELETED_FUNCTION; + BulkDataHint( const BulkDataHint& ) = delete; + BulkDataHint& operator= ( const BulkDataHint& ) = delete; public: BulkDataHint( ScDocument& rDoc, const ColumnSpanSet* pSpans ); diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx index 83f8f784f1bc..6aaf32673868 100644 --- a/sc/inc/cellvalues.hxx +++ b/sc/inc/cellvalues.hxx @@ -42,8 +42,8 @@ class CellValues { CellValuesImpl* mpImpl; - CellValues( const CellValues& ) SAL_DELETED_FUNCTION; - CellValues& operator= ( const CellValues& ) SAL_DELETED_FUNCTION; + CellValues( const CellValues& ) = delete; + CellValues& operator= ( const CellValues& ) = delete; public: CellValues(); @@ -88,8 +88,8 @@ class TableValues Impl* mpImpl; - TableValues( const TableValues& ) SAL_DELETED_FUNCTION; - TableValues& operator= ( const TableValues& ) SAL_DELETED_FUNCTION; + TableValues( const TableValues& ) = delete; + TableValues& operator= ( const TableValues& ) = delete; public: diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 6dbebe699a33..2f72a6ea4be5 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -373,7 +373,7 @@ private: DECL_LINK_TYPED( ValueListenerHdl, const SfxHint&, void ); private: - ScChart2DataSequence(const ScChart2DataSequence& r) SAL_DELETED_FUNCTION; + ScChart2DataSequence(const ScChart2DataSequence& r) = delete; class ExternalRefListener : public ScExternalRefManager::LinkListener { @@ -386,7 +386,7 @@ private: const std::unordered_set& getAllFileIds() { return maFileIds;} private: - ExternalRefListener(const ExternalRefListener& r) SAL_DELETED_FUNCTION; + ExternalRefListener(const ExternalRefListener& r) = delete; ScChart2DataSequence& mrParent; std::unordered_set maFileIds; diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index 4cefe81aad3a..0a60e4036b0e 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -39,7 +39,7 @@ class ScMemChart OUString* pColText; OUString* pRowText; - ScMemChart(const ScMemChart& rMemChart) SAL_DELETED_FUNCTION; + ScMemChart(const ScMemChart& rMemChart) = delete; public: ScMemChart(SCCOL nCols, SCROW nRows); diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index b634b91602e9..c42385ed1acc 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -52,7 +52,7 @@ public: std::unordered_set& getAllFileIds() { return maFileIds;} private: - ExternalRefListener(const ExternalRefListener& r) SAL_DELETED_FUNCTION; + ExternalRefListener(const ExternalRefListener& r) = delete; ScChartListener& mrParent; std::unordered_set maFileIds; @@ -71,7 +71,7 @@ private: bool bDirty:1; bool bSeriesRangesScheduled:1; - ScChartListener& operator=( const ScChartListener& ) SAL_DELETED_FUNCTION; + ScChartListener& operator=( const ScChartListener& ) = delete; public: ScChartListener( const OUString& rName, ScDocument* pDoc, @@ -147,7 +147,7 @@ private: DECL_LINK_TYPED(TimerHdl, Idle *, void); - ScChartListenerCollection& operator=( const ScChartListenerCollection& ) SAL_DELETED_FUNCTION; + ScChartListenerCollection& operator=( const ScChartListenerCollection& ) = delete; public: ScChartListenerCollection( ScDocument* pDoc ); diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx index 1853bc9da09a..e7680397568e 100644 --- a/sc/inc/chartlock.hxx +++ b/sc/inc/chartlock.hxx @@ -44,7 +44,7 @@ private: std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > > maChartModels; - ScChartLockGuard( const ScChartLockGuard& ) SAL_DELETED_FUNCTION; + ScChartLockGuard( const ScChartLockGuard& ) = delete; }; /** Use this to lock all charts in the calc for a little time. @@ -68,7 +68,7 @@ private: DECL_LINK_TYPED(TimeoutHdl, Timer *, void); - ScTemporaryChartLock( const ScTemporaryChartLock& ) SAL_DELETED_FUNCTION; + ScTemporaryChartLock( const ScTemporaryChartLock& ) = delete; }; #endif diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index c3693b0d91cc..33eba6a1b88d 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -48,8 +48,8 @@ class ScChartPositionMap ); ~ScChartPositionMap(); //! deletes all ScAddress* - ScChartPositionMap( const ScChartPositionMap& ) SAL_DELETED_FUNCTION; - ScChartPositionMap& operator=( const ScChartPositionMap& ) SAL_DELETED_FUNCTION; + ScChartPositionMap( const ScChartPositionMap& ) = delete; + ScChartPositionMap& operator=( const ScChartPositionMap& ) = delete; public: SCCOL GetColCount() const { return nColCount; } diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 88bdb277a4f8..34941bc06197 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -96,8 +96,8 @@ class ScChangeAction; class ScChangeActionLinkEntry { - ScChangeActionLinkEntry( const ScChangeActionLinkEntry& ) SAL_DELETED_FUNCTION; - ScChangeActionLinkEntry& operator=( const ScChangeActionLinkEntry& ) SAL_DELETED_FUNCTION; + ScChangeActionLinkEntry( const ScChangeActionLinkEntry& ) = delete; + ScChangeActionLinkEntry& operator=( const ScChangeActionLinkEntry& ) = delete; protected: @@ -206,8 +206,8 @@ class ScChangeAction friend class ScChangeActionMove; friend class ScChangeActionContent; - ScChangeAction( const ScChangeAction& ) SAL_DELETED_FUNCTION; - ScChangeAction& operator=( const ScChangeAction& ) SAL_DELETED_FUNCTION; + ScChangeAction( const ScChangeAction& ) = delete; + ScChangeAction& operator=( const ScChangeAction& ) = delete; protected: @@ -914,8 +914,8 @@ class ScChangeTrack : public utl::ConfigurationListener bool bUseFixDateTime:1; bool bTimeNanoSeconds:1; - ScChangeTrack( const ScChangeTrack& ) SAL_DELETED_FUNCTION; - ScChangeTrack& operator=( const ScChangeTrack& ) SAL_DELETED_FUNCTION; + ScChangeTrack( const ScChangeTrack& ) = delete; + ScChangeTrack& operator=( const ScChangeTrack& ) = delete; static SCROW InitContentRowsPerSlot(); diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 6d41babaf63c..7817df6fb38f 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -158,8 +158,8 @@ friend class sc::EditTextIterator; friend class sc::CellValues; friend class sc::TableValues; - ScColumn(const ScColumn&) SAL_DELETED_FUNCTION; - ScColumn& operator= (const ScColumn&) SAL_DELETED_FUNCTION; + ScColumn(const ScColumn&) = delete; + ScColumn& operator= (const ScColumn&) = delete; bool ParseString( ScCellValue& rCell, diff --git a/sc/inc/compare.hxx b/sc/inc/compare.hxx index e04b5dbf60b8..19e2a4155e97 100644 --- a/sc/inc/compare.hxx +++ b/sc/inc/compare.hxx @@ -56,8 +56,8 @@ struct CompareOptions CompareOptions( ScDocument* pDoc, const ScQueryEntry& rEntry, bool bReg ); private: - CompareOptions( const CompareOptions & ) SAL_DELETED_FUNCTION; - CompareOptions& operator=( const CompareOptions & ) SAL_DELETED_FUNCTION; + CompareOptions( const CompareOptions & ) = delete; + CompareOptions& operator=( const CompareOptions & ) = delete; }; /** @param pOptions diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 839c5b0080ae..a5ed2927728b 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -449,7 +449,7 @@ private: comphelper::UniquePtrValueLess> ConditionalFormatContainer; ConditionalFormatContainer m_ConditionalFormats; - void operator =(ScConditionalFormatList const &) SAL_DELETED_FUNCTION; + void operator =(ScConditionalFormatList const &) = delete; public: ScConditionalFormatList() {} diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index 20105b09259c..a6e5bd362776 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -415,7 +415,7 @@ protected: ScFieldIdentifier maFieldId; private: - ScDataPilotChildObjBase& operator=( const ScDataPilotChildObjBase& ) SAL_DELETED_FUNCTION; + ScDataPilotChildObjBase& operator=( const ScDataPilotChildObjBase& ) = delete; }; typedef ::cppu::WeakImplHelper diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 7c70ae6ab0f3..5f2406d497a4 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1878,7 +1878,7 @@ public: std::set GetDocColors(); private: - ScDocument(const ScDocument& r) SAL_DELETED_FUNCTION; + ScDocument(const ScDocument& r) = delete; void FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ) const; diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx index f3bc3b24006a..b05769398d73 100644 --- a/sc/inc/dpdimsave.hxx +++ b/sc/inc/dpdimsave.hxx @@ -202,7 +202,7 @@ private: typedef ::std::vector< ScDPSaveGroupDimension > ScDPSaveGroupDimVec; typedef ::std::map ScDPSaveNumGroupDimMap; - ScDPDimensionSaveData& operator=( const ScDPDimensionSaveData& ) SAL_DELETED_FUNCTION; + ScDPDimensionSaveData& operator=( const ScDPDimensionSaveData& ) = delete; ScDPSaveGroupDimVec maGroupDims; ScDPSaveNumGroupDimMap maNumGroupDims; diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index 857ab7661d27..848b1d5751ca 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -150,7 +150,7 @@ public: #endif private: - ScDPFilteredCache(const ScDPFilteredCache&) SAL_DELETED_FUNCTION; + ScDPFilteredCache(const ScDPFilteredCache&) = delete; /** * Check if a given row meets all specified criteria. diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx index 25734349cab7..424b943723fa 100644 --- a/sc/inc/drawpage.hxx +++ b/sc/inc/drawpage.hxx @@ -26,7 +26,7 @@ class ScDrawLayer; class ScDrawPage: public FmFormPage { - ScDrawPage& operator=(const ScDrawPage&) SAL_DELETED_FUNCTION; + ScDrawPage& operator=(const ScDrawPage&) = delete; public: explicit ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage = false); diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index f7e3819cf0d2..cbd5061c1c86 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -75,8 +75,8 @@ public: void SetDoReferesh(bool b); private: - ScExternalRefLink() SAL_DELETED_FUNCTION; - ScExternalRefLink(const ScExternalRefLink&) SAL_DELETED_FUNCTION; + ScExternalRefLink() = delete; + ScExternalRefLink(const ScExternalRefLink&) = delete; sal_uInt16 mnFileId; OUString maFilterName; @@ -709,7 +709,7 @@ public: void enableDocTimer( bool bEnable ); private: - ScExternalRefManager(const ScExternalRefManager&) SAL_DELETED_FUNCTION; + ScExternalRefManager(const ScExternalRefManager&) = delete; void refreshAllRefCells(sal_uInt16 nFileId); diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 3deb9e30583d..61478f16b99e 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -147,7 +147,7 @@ private: bool UpdateReferenceOnCopy( const sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc, const ScAddress* pUndoCellPos ); - ScFormulaCell( const ScFormulaCell& ) SAL_DELETED_FUNCTION; + ScFormulaCell( const ScFormulaCell& ) = delete; public: enum CompareState { NotEqual = 0, EqualInvariant, EqualRelativeRef }; diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index 9789dc5e8dbb..63306cc64d28 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -513,7 +513,7 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - ScExternalSheetCacheObj(const ScExternalSheetCacheObj&) SAL_DELETED_FUNCTION; + ScExternalSheetCacheObj(const ScExternalSheetCacheObj&) = delete; private: ScDocShell* mpDocShell; @@ -607,7 +607,7 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - ScExternalDocLinksObj(const ScExternalDocLinksObj&) SAL_DELETED_FUNCTION; + ScExternalDocLinksObj(const ScExternalDocLinksObj&) = delete; private: ScDocShell* mpDocShell; diff --git a/sc/inc/listenerquery.hxx b/sc/inc/listenerquery.hxx index 960ad9cd9232..796116e56d1a 100644 --- a/sc/inc/listenerquery.hxx +++ b/sc/inc/listenerquery.hxx @@ -52,8 +52,8 @@ class QueryRange : public SvtListener::QueryBase struct Impl; Impl* mpImpl; - QueryRange( const QueryRange& ) SAL_DELETED_FUNCTION; - QueryRange& operator= ( const QueryRange& ) SAL_DELETED_FUNCTION; + QueryRange( const QueryRange& ) = delete; + QueryRange& operator= ( const QueryRange& ) = delete; public: QueryRange(); diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx index 8c566a463d7d..a3f9bbc83d79 100644 --- a/sc/inc/lookupcache.hxx +++ b/sc/inc/lookupcache.hxx @@ -74,7 +74,7 @@ public: delete mpStr; } - QueryCriteria & operator=( const QueryCriteria & r ) SAL_DELETED_FUNCTION; + QueryCriteria & operator=( const QueryCriteria & r ) = delete; public: @@ -190,8 +190,8 @@ private: ScRange maRange; ScDocument * mpDoc; - ScLookupCache( const ScLookupCache & ) SAL_DELETED_FUNCTION; - ScLookupCache & operator=( const ScLookupCache & ) SAL_DELETED_FUNCTION; + ScLookupCache( const ScLookupCache & ) = delete; + ScLookupCache & operator=( const ScLookupCache & ) = delete; }; diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index efb2a67c9ad8..432357c3356e 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -144,8 +144,8 @@ class ScFontToSubsFontConverter_AutoPtr DestroyFontToSubsFontConverter( h ); } - ScFontToSubsFontConverter_AutoPtr( const ScFontToSubsFontConverter_AutoPtr& ) SAL_DELETED_FUNCTION; - ScFontToSubsFontConverter_AutoPtr& operator=( const ScFontToSubsFontConverter_AutoPtr& ) SAL_DELETED_FUNCTION; + ScFontToSubsFontConverter_AutoPtr( const ScFontToSubsFontConverter_AutoPtr& ) = delete; + ScFontToSubsFontConverter_AutoPtr& operator=( const ScFontToSubsFontConverter_AutoPtr& ) = delete; public: ScFontToSubsFontConverter_AutoPtr() diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index 98a89f7329c5..8640e480e33b 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -142,8 +142,8 @@ public: void UpdateCaptionPos( const ScAddress& rPos ); private: - ScPostIt( const ScPostIt& ) SAL_DELETED_FUNCTION; - ScPostIt& operator=( const ScPostIt& ) SAL_DELETED_FUNCTION; + ScPostIt( const ScPostIt& ) = delete; + ScPostIt& operator=( const ScPostIt& ) = delete; /** Creates the caption object from initial caption data if existing. */ void CreateCaptionFromInitData( const ScAddress& rPos ) const; diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx index e9bd5afef8e7..4b6acb861e44 100644 --- a/sc/inc/progress.hxx +++ b/sc/inc/progress.hxx @@ -53,8 +53,8 @@ private: SfxProgress* pProgress; - ScProgress( const ScProgress& ) SAL_DELETED_FUNCTION; - ScProgress& operator=( const ScProgress& ) SAL_DELETED_FUNCTION; + ScProgress( const ScProgress& ) = delete; + ScProgress& operator=( const ScProgress& ) = delete; static void CalcGlobalPercent( sal_uLong nVal ) { diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index f54028db74e8..affae039dfe9 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -122,8 +122,8 @@ class SC_DLLPUBLIC ScMatrix // only delete via Delete() ~ScMatrix(); - ScMatrix( const ScMatrix& ) SAL_DELETED_FUNCTION; - ScMatrix& operator=( const ScMatrix&) SAL_DELETED_FUNCTION; + ScMatrix( const ScMatrix& ) = delete; + ScMatrix& operator=( const ScMatrix&) = delete; public: enum Op { Add, Sub, Mul, Div }; diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index e13039c9e73f..d6c8a9824a05 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -416,8 +416,8 @@ class SingleDoubleRefModifier ScSingleRefData* pS; ScComplexRefData* pD; - SingleDoubleRefModifier( const SingleDoubleRefModifier& ) SAL_DELETED_FUNCTION; - SingleDoubleRefModifier& operator=( const SingleDoubleRefModifier& ) SAL_DELETED_FUNCTION; + SingleDoubleRefModifier( const SingleDoubleRefModifier& ) = delete; + SingleDoubleRefModifier& operator=( const SingleDoubleRefModifier& ) = delete; public: SingleDoubleRefModifier( formula::FormulaToken& rT ) diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index 94bc16a8eba7..2afa84dbf04a 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -27,7 +27,7 @@ class ScUnitConverterData { OUString maIndexString; double mfValue; - ScUnitConverterData& operator=( const ScUnitConverterData& ) SAL_DELETED_FUNCTION; + ScUnitConverterData& operator=( const ScUnitConverterData& ) = delete; public: ScUnitConverterData( const OUString& rFromUnit, 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 { private: - ScDescriptiveStatisticsDialogWrapper() SAL_DELETED_FUNCTION; + ScDescriptiveStatisticsDialogWrapper() = delete; }; class ScSamplingDialogWrapper : public ChildWindowWrapper { private: - ScSamplingDialogWrapper() SAL_DELETED_FUNCTION; + ScSamplingDialogWrapper() = delete; }; class ScRandomNumberGeneratorDialogWrapper : public ChildWindowWrapper { private: - ScRandomNumberGeneratorDialogWrapper() SAL_DELETED_FUNCTION; + ScRandomNumberGeneratorDialogWrapper() = delete; }; class ScAnalysisOfVarianceDialogWrapper : public ChildWindowWrapper { private: - ScAnalysisOfVarianceDialogWrapper() SAL_DELETED_FUNCTION; + ScAnalysisOfVarianceDialogWrapper() = delete; }; class ScCorrelationDialogWrapper : public ChildWindowWrapper { private: - ScCorrelationDialogWrapper() SAL_DELETED_FUNCTION; + ScCorrelationDialogWrapper() = delete; }; class ScCovarianceDialogWrapper : public ChildWindowWrapper { private: - ScCovarianceDialogWrapper() SAL_DELETED_FUNCTION; + ScCovarianceDialogWrapper() = delete; }; class ScExponentialSmoothingDialogWrapper : public ChildWindowWrapper { private: - ScExponentialSmoothingDialogWrapper() SAL_DELETED_FUNCTION; + ScExponentialSmoothingDialogWrapper() = delete; }; class ScMovingAverageDialogWrapper : public ChildWindowWrapper { private: - ScMovingAverageDialogWrapper() SAL_DELETED_FUNCTION; + ScMovingAverageDialogWrapper() = delete; }; class ScTTestDialogWrapper : public ChildWindowWrapper { private: - ScTTestDialogWrapper() SAL_DELETED_FUNCTION; + ScTTestDialogWrapper() = delete; }; class ScFTestDialogWrapper : public ChildWindowWrapper { private: - ScFTestDialogWrapper() SAL_DELETED_FUNCTION; + ScFTestDialogWrapper() = delete; }; class ScZTestDialogWrapper : public ChildWindowWrapper { private: - ScZTestDialogWrapper() SAL_DELETED_FUNCTION; + ScZTestDialogWrapper() = delete; }; class ScChiSquareTestDialogWrapper : public ChildWindowWrapper { 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 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 -- cgit