[Libreoffice-commits] core.git: sw/source

[Miklos Vajna (via logerrit)]

 sw/source/filter/ww8/rtfattributeoutput.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 09121d24b667081ba8da9b521dff457d22150214
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Dec 18 21:14:24 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Dec 19 09:07:06 2019 +0100

    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 at collabora.com>

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