summaryrefslogtreecommitdiff
path: root/dbaccess
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 /dbaccess
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/api/RowSetRow.hxx4
-rw-r--r--dbaccess/source/core/api/querydescriptor.hxx4
-rw-r--r--dbaccess/source/core/inc/DatabaseDataProvider.hxx4
-rw-r--r--dbaccess/source/core/inc/veto.hxx4
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.hxx8
-rw-r--r--dbaccess/source/sdbtools/connection/connectiontools.hxx4
-rw-r--r--dbaccess/source/sdbtools/connection/datasourcemetadata.hxx4
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.hxx4
-rw-r--r--dbaccess/source/sdbtools/connection/tablename.hxx4
-rw-r--r--dbaccess/source/ui/inc/moduledbu.hxx2
10 files changed, 21 insertions, 21 deletions
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index 203639c97da8..5d3d9c13f373 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -35,8 +35,8 @@ namespace dbaccess
{
ORowSetRow m_aRow;
- ORowSetOldRowHelper& operator=(const ORowSetOldRowHelper& _rRH) SAL_DELETED_FUNCTION;
- ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh) SAL_DELETED_FUNCTION;
+ ORowSetOldRowHelper& operator=(const ORowSetOldRowHelper& _rRH) = delete;
+ ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh) = delete;
public:
ORowSetOldRowHelper(){}
explicit ORowSetOldRowHelper(const ORowSetRow& _rRow)
diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx
index bd44067f0a95..9133f7fd5005 100644
--- a/dbaccess/source/core/api/querydescriptor.hxx
+++ b/dbaccess/source/core/api/querydescriptor.hxx
@@ -112,8 +112,8 @@ class OQueryDescriptor : public comphelper::OMutexAndBroadcastHelper
,public ::comphelper::OPropertyArrayUsageHelper< OQueryDescriptor_Base >
,public ODataSettings
{
- OQueryDescriptor(const OQueryDescriptor&) SAL_DELETED_FUNCTION;
- void operator =(const OQueryDescriptor&) SAL_DELETED_FUNCTION;
+ OQueryDescriptor(const OQueryDescriptor&) = delete;
+ void operator =(const OQueryDescriptor&) = delete;
// helper
void registerProperties();
protected:
diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index c1f43bc93b83..93c1ea9a6d45 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
@@ -207,8 +207,8 @@ private:
virtual double SAL_CALL getNotANumber()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isNotANumber(double nNumber )throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- DatabaseDataProvider(DatabaseDataProvider &) SAL_DELETED_FUNCTION;
- void operator =(DatabaseDataProvider &) SAL_DELETED_FUNCTION;
+ DatabaseDataProvider(DatabaseDataProvider &) = delete;
+ void operator =(DatabaseDataProvider &) = delete;
virtual ~DatabaseDataProvider() {}
diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx
index db4bfe7aa095..937b01eca234 100644
--- a/dbaccess/source/core/inc/veto.hxx
+++ b/dbaccess/source/core/inc/veto.hxx
@@ -48,8 +48,8 @@ namespace dbaccess
virtual ~Veto();
private:
- Veto( const Veto& ) SAL_DELETED_FUNCTION;
- Veto& operator=( const Veto& ) SAL_DELETED_FUNCTION;
+ Veto( const Veto& ) = delete;
+ Veto& operator=( const Veto& ) = delete;
};
} // namespace dbaccess
diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx
index ea0c8b60f838..100c56f5c892 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.hxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.hxx
@@ -54,8 +54,8 @@ namespace dbaccess
void characters( const OUString& i_rCharacters ) const;
private:
- StorageXMLOutputStream( const StorageXMLOutputStream& ) SAL_DELETED_FUNCTION;
- StorageXMLOutputStream& operator=( const StorageXMLOutputStream& ) SAL_DELETED_FUNCTION;
+ StorageXMLOutputStream( const StorageXMLOutputStream& ) = delete;
+ StorageXMLOutputStream& operator=( const StorageXMLOutputStream& ) = delete;
private:
::std::unique_ptr< StorageXMLOutputStream_Data > m_pData;
@@ -78,8 +78,8 @@ namespace dbaccess
);
private:
- StorageXMLInputStream( const StorageXMLInputStream& ) SAL_DELETED_FUNCTION;
- StorageXMLInputStream& operator=( const StorageXMLInputStream& ) SAL_DELETED_FUNCTION;
+ StorageXMLInputStream( const StorageXMLInputStream& ) = delete;
+ StorageXMLInputStream& operator=( const StorageXMLInputStream& ) = delete;
private:
::std::unique_ptr< StorageXMLInputStream_Data > m_pData;
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx
index 65602e6bb845..c7899390860e 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx
@@ -80,8 +80,8 @@ namespace sdbtools
virtual ~ConnectionTools();
private:
- ConnectionTools( const ConnectionTools& ) SAL_DELETED_FUNCTION;
- ConnectionTools& operator=( const ConnectionTools& ) SAL_DELETED_FUNCTION;
+ ConnectionTools( const ConnectionTools& ) = delete;
+ ConnectionTools& operator=( const ConnectionTools& ) = delete;
};
} // namespace sdbtools
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
index 8ef42b9153bf..d6c633be19b9 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
@@ -64,8 +64,8 @@ namespace sdbtools
virtual ~DataSourceMetaData();
private:
- DataSourceMetaData( const DataSourceMetaData& ) SAL_DELETED_FUNCTION;
- DataSourceMetaData& operator=( const DataSourceMetaData& ) SAL_DELETED_FUNCTION;
+ DataSourceMetaData( const DataSourceMetaData& ) = delete;
+ DataSourceMetaData& operator=( const DataSourceMetaData& ) = delete;
};
} // namespace sdbtools
diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx
index 4ac124973f3d..24869b27d936 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.hxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.hxx
@@ -70,8 +70,8 @@ namespace sdbtools
virtual ~ObjectNames();
private:
- ObjectNames( const ObjectNames& ) SAL_DELETED_FUNCTION;
- ObjectNames& operator=( const ObjectNames& ) SAL_DELETED_FUNCTION;
+ ObjectNames( const ObjectNames& ) = delete;
+ ObjectNames& operator=( const ObjectNames& ) = delete;
};
} // namespace sdbtools
diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx
index 795e7d7c3aae..e6102fe916be 100644
--- a/dbaccess/source/sdbtools/connection/tablename.hxx
+++ b/dbaccess/source/sdbtools/connection/tablename.hxx
@@ -76,8 +76,8 @@ namespace sdbtools
virtual ~TableName();
private:
- TableName( const TableName& ) SAL_DELETED_FUNCTION;
- TableName& operator=( const TableName& ) SAL_DELETED_FUNCTION;
+ TableName( const TableName& ) = delete;
+ TableName& operator=( const TableName& ) = delete;
};
} // namespace sdbtools
diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx
index 636740972b50..d4e7463eb301 100644
--- a/dbaccess/source/ui/inc/moduledbu.hxx
+++ b/dbaccess/source/ui/inc/moduledbu.hxx
@@ -35,7 +35,7 @@ class OModule
friend class OModuleClient;
private:
- OModule() SAL_DELETED_FUNCTION; //TODO: get rid of this class
+ OModule() = delete; //TODO: get rid of this class
protected:
static ::osl::Mutex s_aMutex; /// access safety