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

[Libreoffice Gerrit user]

 sw/source/filter/html/htmlflywriter.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit b7835c1d7465db6bea4cc80b6d0c2f71596938f1
Author:     Jochen Nitschke <j.nitschke+loger...@ok.de>
AuthorDate: Mon Oct 8 12:17:48 2018 +0200
Commit:     Jochen Nitschke <j.nitschke+loger...@ok.de>
CommitDate: Mon Oct 8 15:01:08 2018 +0200

    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.gran...@collabora.co.uk>
    Tested-by: Jenkins
    Reviewed-by: Jochen Nitschke <j.nitschke+loger...@ok.de>

diff --git a/sw/source/filter/html/htmlflywriter.cxx 
b/sw/source/filter/html/htmlflywriter.cxx
index f4f0da70c2f1..cfb474f4e48f 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits