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 --- include/oox/core/contexthandler.hxx | 2 +- include/oox/core/contexthandler2.hxx | 2 +- include/oox/drawingml/chart/chartconverter.hxx | 4 ++-- include/oox/dump/dumperbase.hxx | 16 ++++++++-------- include/oox/helper/binarystreambase.hxx | 4 ++-- include/oox/helper/storagebase.hxx | 4 ++-- include/oox/ole/vbaproject.hxx | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'include/oox') diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx index a6de85d3e56b..78e519df4d26 100644 --- a/include/oox/core/contexthandler.hxx +++ b/include/oox/core/contexthandler.hxx @@ -98,7 +98,7 @@ protected: #endif private: - ContextHandler& operator=( const ContextHandler& ) SAL_DELETED_FUNCTION; + ContextHandler& operator=( const ContextHandler& ) = delete; private: FragmentBaseDataRef mxBaseData; ///< Base data of the fragment. diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index 048a2eca11f2..c94bda415ded 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -190,7 +190,7 @@ protected: void implEndRecord( sal_Int32 nRecId ); private: - ContextHandler2Helper& operator=( const ContextHandler2Helper& ) SAL_DELETED_FUNCTION; + ContextHandler2Helper& operator=( const ContextHandler2Helper& ) = delete; ElementInfo& pushElementInfo( sal_Int32 nElement ); void popElementInfo(); diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx index 2be69748e99e..d459f54bc428 100644 --- a/include/oox/drawingml/chart/chartconverter.hxx +++ b/include/oox/drawingml/chart/chartconverter.hxx @@ -89,8 +89,8 @@ public: const DataSequenceModel& rDataSeq, const OUString& rRole ); private: - ChartConverter( const ChartConverter& ) SAL_DELETED_FUNCTION; - ChartConverter& operator=( const ChartConverter& ) SAL_DELETED_FUNCTION; + ChartConverter( const ChartConverter& ) = delete; + ChartConverter& operator=( const ChartConverter& ) = delete; }; diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index f9d3a1b9b34d..8e5355e2069d 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -1094,8 +1094,8 @@ public: explicit IndentGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.incIndent(); } ~IndentGuard() { mrOut.decIndent(); } private: - IndentGuard( const IndentGuard& ) SAL_DELETED_FUNCTION; - IndentGuard& operator=( const IndentGuard& ) SAL_DELETED_FUNCTION; + IndentGuard( const IndentGuard& ) = delete; + IndentGuard& operator=( const IndentGuard& ) = delete; private: Output& mrOut; }; @@ -1117,8 +1117,8 @@ public: ~TableGuard() { mrOut.endTable(); } void tab( size_t nCol ) { mrOut.tab( nCol ); } private: - TableGuard( const TableGuard& ) SAL_DELETED_FUNCTION; - TableGuard& operator=( const TableGuard& ) SAL_DELETED_FUNCTION; + TableGuard( const TableGuard& ) = delete; + TableGuard& operator=( const TableGuard& ) = delete; private: Output& mrOut; }; @@ -1133,8 +1133,8 @@ public: ~ItemGuard() { mrOut.endItem(); } void cont() { mrOut.contItem(); } private: - ItemGuard( const ItemGuard& ) SAL_DELETED_FUNCTION; - ItemGuard& operator=( const ItemGuard& ) SAL_DELETED_FUNCTION; + ItemGuard( const ItemGuard& ) = delete; + ItemGuard& operator=( const ItemGuard& ) = delete; private: Output& mrOut; }; @@ -1147,8 +1147,8 @@ public: explicit MultiItemsGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.startMultiItems(); } ~MultiItemsGuard() { mrOut.endMultiItems(); } private: - MultiItemsGuard( const MultiItemsGuard& ) SAL_DELETED_FUNCTION; - MultiItemsGuard& operator=( const MultiItemsGuard& ) SAL_DELETED_FUNCTION; + MultiItemsGuard( const MultiItemsGuard& ) = delete; + MultiItemsGuard& operator=( const MultiItemsGuard& ) = delete; private: Output& mrOut; }; diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index 9f669a9fff30..4078fc68f5ac 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -107,8 +107,8 @@ protected: explicit BinaryStreamBase( bool bSeekable ) : mbEof( false ), mbSeekable( bSeekable ) {} private: - BinaryStreamBase( const BinaryStreamBase& ) SAL_DELETED_FUNCTION; - BinaryStreamBase& operator=( const BinaryStreamBase& ) SAL_DELETED_FUNCTION; + BinaryStreamBase( const BinaryStreamBase& ) = delete; + BinaryStreamBase& operator=( const BinaryStreamBase& ) = delete; protected: bool mbEof; ///< End of stream flag. diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index 52196dab93c1..f073b292de2d 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -138,8 +138,8 @@ protected: explicit StorageBase( const StorageBase& rParentStorage, const OUString& rStorageName, bool bReadOnly ); private: - StorageBase( const StorageBase& ) SAL_DELETED_FUNCTION; - StorageBase& operator=( const StorageBase& ) SAL_DELETED_FUNCTION; + StorageBase( const StorageBase& ) = delete; + StorageBase& operator=( const StorageBase& ) = delete; /** Returns true, if the object represents a valid storage. */ virtual bool implIsStorage() const = 0; diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 6325b23fe12a..dac147affb23 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -153,8 +153,8 @@ protected: virtual void prepareImport(); private: - VbaProject( const VbaProject& ) SAL_DELETED_FUNCTION; - VbaProject& operator=( const VbaProject& ) SAL_DELETED_FUNCTION; + VbaProject( const VbaProject& ) = delete; + VbaProject& operator=( const VbaProject& ) = delete; /** Returns the Basic or dialog library container. */ ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > -- cgit