summaryrefslogtreecommitdiff
path: root/l10ntools/inc/cfgmerge.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /l10ntools/inc/cfgmerge.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'l10ntools/inc/cfgmerge.hxx')
-rw-r--r--l10ntools/inc/cfgmerge.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index c2342b5c12cf..355f4c5c52e5 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -141,10 +141,10 @@ protected:
virtual void WorkOnText(
OString &rText,
const OString &rIsoLang
- ) SAL_OVERRIDE;
+ ) override;
- void WorkOnResourceEnd() SAL_OVERRIDE;
- void Output(const OString& rOutput) SAL_OVERRIDE;
+ void WorkOnResourceEnd() override;
+ void Output(const OString& rOutput) override;
public:
CfgExport(
const OString &rOutputFile,
@@ -167,11 +167,11 @@ private:
std::ofstream pOutputStream;
protected:
- virtual void WorkOnText(OString &rText, const OString &rLangIndex) SAL_OVERRIDE;
+ virtual void WorkOnText(OString &rText, const OString &rLangIndex) override;
- void WorkOnResourceEnd() SAL_OVERRIDE;
+ void WorkOnResourceEnd() override;
- void Output(const OString& rOutput) SAL_OVERRIDE;
+ void Output(const OString& rOutput) override;
public:
CfgMerge(
const OString &rMergeSource, const OString &rOutputFile,