commit b7835c1d7465db6bea4cc80b6d0c2f71596938f1
author Jochen Nitschke <j.nitschke+logerrit@ok.de> Mon Oct 08 12:17:48 2018 +0200
committer Jochen Nitschke <j.nitschke+logerrit@ok.de> Mon Oct 08 15:01:08 2018 +0200
tree b4e75aa081f7cf6558860a96b04d412bc99adcf7
parent d75a96d50bb62e40d69d7ab432ca94f23d36e82f

cppcheck: duplicateExpressionTernary

HTML_FRMOPTS_MULTICOL_CNTNR is the same as HTML_FRMOPTS_MULTICOL

since commit 7b0b5cdfeed656b279bc32cd929630d5fc25878b
Date:   Mon Sep 18 16:15:01 2000 +0000

    initial import

in htmlfly.cxx

Change-Id: I54d04b77f4f281205d3ca89f36c12ff34ba12c12
Reviewed-on: https://gerrit.libreoffice.org/61522
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>

sw/source/filter/html/htmlflywriter.cxx

diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index f4f0da7..cfb474f 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -105,8 +105,7 @@ const HtmlFrmOpts HTML_FRMOPTS_MULTICOL       =
    HtmlFrmOpts::AnySize |
    HtmlFrmOpts::AbsSize |
    HtmlFrmOpts::Dir;
const HtmlFrmOpts HTML_FRMOPTS_MULTICOL_CNTNR =
    HTML_FRMOPTS_MULTICOL;

const HtmlFrmOpts HTML_FRMOPTS_MULTICOL_CSS1  =
    HtmlFrmOpts::SAlign |
    HtmlFrmOpts::SSize |
@@ -1611,8 +1610,7 @@ static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt,
    rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );

    // WIDTH
    HtmlFrmOpts nFrameFlags = bInCntnr ? HTML_FRMOPTS_MULTICOL_CNTNR
                                : HTML_FRMOPTS_MULTICOL;
    HtmlFrmOpts nFrameFlags = HTML_FRMOPTS_MULTICOL;
    if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
        nFrameFlags |= HTML_FRMOPTS_MULTICOL_CSS1;
    rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrameFlags );