summaryrefslogtreecommitdiff
path: root/dbaccess/source/core/recovery
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /dbaccess/source/core/recovery
parentb66d87086804460c1986df1b832fd6b2ea075a90 (diff)
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked "override," but at least some MSVC versions complain about it, so at least make sure such destructors are explicitly marked "virtual." Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'dbaccess/source/core/recovery')
-rw-r--r--dbaccess/source/core/recovery/settingsimport.hxx8
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.hxx2
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.hxx4
3 files changed, 7 insertions, 7 deletions
diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx
index 7d0aedb3669d..8ea1c2d078d5 100644
--- a/dbaccess/source/core/recovery/settingsimport.hxx
+++ b/dbaccess/source/core/recovery/settingsimport.hxx
@@ -89,7 +89,7 @@ namespace dbaccess
) SAL_OVERRIDE;
private:
- ~IgnoringSettingsImport()
+ virtual ~IgnoringSettingsImport()
{
}
};
@@ -106,7 +106,7 @@ namespace dbaccess
) SAL_OVERRIDE;
protected:
- ~OfficeSettingsImport();
+ virtual ~OfficeSettingsImport();
private:
// the settings collection to which |this| will contribute a single setting
@@ -120,7 +120,7 @@ namespace dbaccess
ConfigItemImport( ::comphelper::NamedValueCollection& o_rSettings );
protected:
- ~ConfigItemImport();
+ virtual ~ConfigItemImport();
public:
// SettingsImport overridables
@@ -146,7 +146,7 @@ namespace dbaccess
ConfigItemSetImport( ::comphelper::NamedValueCollection& o_rSettings );
protected:
- ~ConfigItemSetImport();
+ virtual ~ConfigItemSetImport();
public:
// SettingsImport overridables
diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx
index a63c5e12e66b..ae12baf8ba38 100644
--- a/dbaccess/source/core/recovery/storagetextstream.hxx
+++ b/dbaccess/source/core/recovery/storagetextstream.hxx
@@ -37,7 +37,7 @@ namespace dbaccess
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
const OUString& i_rStreamName
);
- ~StorageTextOutputStream();
+ virtual ~StorageTextOutputStream();
void writeLine( const OUString& i_rLine );
void writeLine();
diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx
index 7c0e50ef161b..bc130d647c3f 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.hxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.hxx
@@ -40,7 +40,7 @@ namespace dbaccess
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
const OUString& i_rStreamName
);
- ~StorageXMLOutputStream();
+ virtual ~StorageXMLOutputStream();
// StorageOutputStream overridables
virtual void close() SAL_OVERRIDE;
@@ -72,7 +72,7 @@ namespace dbaccess
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
const OUString& i_rStreamName
);
- ~StorageXMLInputStream();
+ virtual ~StorageXMLInputStream();
void import(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& i_rHandler