[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

Tor Lillqvist tml at collabora.com
Mon Jan 19 03:44:56 PST 2015


 sw/source/filter/html/css1atr.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e02c897a4bbb33d8b506077048557d9c37bd8852
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 16 08:18:15 2014 +0200

    WaE: replace '+' between string literals with juxtaposition
    
    Change-Id: I64690ce1d6960dea52bae6a5bc1d0f1de742cb63
    (cherry picked from commit ab431b632e1e329372b8058bebdb69e1815840c2)

diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index b059fea..def2889 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -255,13 +255,13 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
         if (bCfgPrintLayout) {
             sOut.append(
                 "p." + OString(sCSS2_P_CLASS_leaders) + "{max-width:" + OString::number(DOT_LEADERS_MAX_WIDTH) +
-                    "cm;padding:0;overflow-x:hidden;line-height:120%}" +
+                    "cm;padding:0;overflow-x:hidden;line-height:120%}"
                 "p." + OString(sCSS2_P_CLASS_leaders) + ":after{float:left;width:0;white-space:nowrap;content:\"");
                 for (int i = 0; i < 100; i++ )
                     sOut.append(". ");
                 sOut.append(
-                    "\"}p." + OString(sCSS2_P_CLASS_leaders) + " span:first-child{padding-right:0.33em;background:white}" +
-                    "p." + OString(sCSS2_P_CLASS_leaders) + " span+span{float:right;padding-left:0.33em;" +
+                    "\"}p." + OString(sCSS2_P_CLASS_leaders) + " span:first-child{padding-right:0.33em;background:white}"
+                    "p." + OString(sCSS2_P_CLASS_leaders) + " span+span{float:right;padding-left:0.33em;"
                     "background:white;position:relative;z-index:1}");
         }
         Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );


More information about the Libreoffice-commits mailing list