From 362d4f0cd4e50111edfae9d30c90602c37ed65a2 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 1 Apr 2014 19:18:35 +0200 Subject: 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 --- l10ntools/inc/cfgmerge.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'l10ntools/inc/cfgmerge.hxx') 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 -- cgit '>distro/capgemini/cg-4.1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/postprocess
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-16 14:14:43 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-02-17 11:33:57 +0000
commit2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch)
tree1f335918a854319df9269329d165a91d711d2108 /postprocess
parentd6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff)
use consistent #define checks for the Windows platform
stage 2 of replacing usage of various checks for the windows platform with the compiler-defined '_WIN32' macro In this stage we focus on replacing usage of the WIN macro Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84 Reviewed-on: https://gerrit.libreoffice.org/22393 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>