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

[Caolán McNamara]

 sw/source/filter/html/htmlatr.cxx |    4 +---
 sw/source/filter/html/wrthtml.hxx |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit f08b396a39ab2e06ad26b28322a0f0d47aebd82d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 27 15:45:51 2018 +0100

    drop newly unused HTMLMODE_NO_BR_AT_PAREND
    
    Change-Id: I4e1c0355a10e0334439beb04c54bde24dada0dd2
    Reviewed-on: https://gerrit.libreoffice.org/51960
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 76306190a831..1f3dc216c0e4 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2515,9 +2515,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
             HtmlWriter aHtml(rHTMLWrt.Strm(), rHTMLWrt.maNamespace);
             aHtml.single(OOO_STRING_SVTOOLS_HTML_linebreak);
             const SvxULSpaceItem& rULSpace = pNd->GetSwAttrSet().Get(RES_UL_SPACE);
-            if (rULSpace.GetLower() > 0 &&
-                !bEndOfCell &&
-                !rHTMLWrt.IsHTMLMode(HTMLMODE_NO_BR_AT_PAREND) )
+            if (rULSpace.GetLower() > 0 && !bEndOfCell)
             {
                 aHtml.single(OOO_STRING_SVTOOLS_HTML_linebreak);
             }
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 639f07103ccd..c10b8e695b07 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -113,7 +113,7 @@ namespace o3tl {
 #define HTMLMODE_VERT_SPACER        0x00040000
 #define HTMLMODE_NBSP_IN_TABLES     0x00080000
 #define HTMLMODE_LSPACE_IN_NUMBUL   0x00100000
-#define HTMLMODE_NO_BR_AT_PAREND    0x00200000
+//was HTMLMODE_NO_BR_AT_PAREND    0x00200000
 #define HTMLMODE_PRINT_EXT          0x00400000
 #define HTMLMODE_ABS_POS_FLY        0x00800000
 #define HTMLMODE_ABS_POS_DRAW       0x01000000