summaryrefslogtreecommitdiff
path: root/l10ntools
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 /l10ntools
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 'l10ntools')
-rw-r--r--l10ntools/inc/cfgmerge.hxx4
-rw-r--r--l10ntools/inc/xmlparse.hxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 55a1670f6c94..b938a1139c3e 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -151,7 +151,7 @@ public:
const OString &rOutputFile,
const OString &rFilePath
);
- ~CfgExport();
+ virtual ~CfgExport();
};
/// Merge strings to *.xcu files
@@ -177,7 +177,7 @@ public:
CfgMerge(
const OString &rMergeSource, const OString &rOutputFile,
const OString &rFilename, const OString &rLanguage );
- ~CfgMerge();
+ virtual ~CfgMerge();
};
#endif
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 6db78a5ab07b..cabce4198dd2 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -152,7 +152,7 @@ public:
const OString &rFileName // the file name, empty if created from memory stream
);
XMLFile( const XMLFile& rObj ) ;
- ~XMLFile();
+ virtual ~XMLFile();
void Print( XMLNode *pCur = NULL, sal_uInt16 nLevel = 0 );
virtual void SearchL10NElements( XMLParentNode *pCur, int pos = 0 );
@@ -220,7 +220,7 @@ public:
XMLParentNode *pParent // parent node of this element
);
- ~XMLElement();
+ virtual ~XMLElement();
XMLElement(const XMLElement&);
XMLElement& operator=(const XMLElement& rObj);