diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-12-18 21:14:24 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-12-19 09:07:06 +0100 |
| commit | 09121d24b667081ba8da9b521dff457d22150214 (patch) | |
| tree | 1fc38322a0e743adadc4906f76e460837fdd8fde /sw | |
| parent | 343408484c4610e34c793e2dc0ed87d2b772d23b (diff) | |
sw: avoid 'else if' after return
And also don't declare multiple variables with a single statement, so
e.g. their constness can be changed separately.
Change-Id: I0786369b22d2947a561d753ef79534879bb41f5b
Reviewed-on: https://gerrit.libreoffice.org/85425
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 8a7fbb01bf2b..512c5cb77b15 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2323,7 +2323,8 @@ void RtfAttributeOutput::CharCrossedOut(const SvxCrossedOutItem& rCrossedOut) void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEscapement) { - short nEsc = rEscapement.GetEsc(), nProp = rEscapement.GetProportionalHeight(); + short nEsc = rEscapement.GetEsc(); + short nProp = rEscapement.GetProportionalHeight(); sal_Int32 nProp100 = nProp * 100; if (DFLT_ESC_PROP == nProp || nProp < 1 || nProp > 100) { @@ -2333,7 +2334,7 @@ void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEscapement) m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SUPER); return; } - else if (DFLT_ESC_AUTO_SUPER == nEsc) + if (DFLT_ESC_AUTO_SUPER == nEsc) { nEsc = .8 * (100 - nProp); ++nProp100; // A 1 afterwards means 'automatic' according to editeng/rtf/rtfitem.cxx |