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

[Julien Nabet]

 sw/source/filter/html/swhtml.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7feb9a9c711835d852f4551670793b24e2fa82b6
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Feb 25 20:28:46 2014 +0100

    Fix a crashtest + default value + fix a wrong copy paste
    
    Change-Id: Ic7a4ff410b2e4450c5f5220c6201931ca3e15a02
    Reviewed-on: https://gerrit.libreoffice.org/8307
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 1bc33ef..b348b96 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2414,6 +2414,12 @@ void SwHTMLParser::AddParSpace()
         }
         else
         {
+            if (!pTxtNode->HasHints())
+            {
+                pTxtNode->SetAttr(
+                    SvxULSpaceItem( rULSpace.GetUpper(), HTML_PARSPACE, RES_UL_SPACE )  );
+                return;
+            }
             //What I do here, is that I examine the attributes, and if
             //I find out, that it's CJK/CTL, then I set the paragraph space
             //to the value set in HTML_CJK_PARSPACE/HTML_CTL_PARSPACE.
@@ -3629,7 +3635,7 @@ void SwHTMLParser::NewBasefontAttr()
         SvxFontHeightItem aFontHeightCJK( aFontHeights[nSize-1], 100, RES_CHRATR_CJK_FONTSIZE );
         InsertAttr( &aAttrTab.pFontHeightCJK, aFontHeightCJK, pCntxt );
         SvxFontHeightItem aFontHeightCTL( aFontHeights[nSize-1], 100, RES_CHRATR_CTL_FONTSIZE );
-        InsertAttr( &aAttrTab.pFontHeightCJK, aFontHeightCTL, pCntxt );
+        InsertAttr( &aAttrTab.pFontHeightCTL, aFontHeightCTL, pCntxt );
     }
 
     // den Kontext merken