diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-02-25 20:28:46 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-26 03:09:44 -0600 |
| commit | 7feb9a9c711835d852f4551670793b24e2fa82b6 (patch) | |
| tree | 823e3b2bbdbc15871b66c4fa55235741870ed4af | |
| parent | d5c59404bec65c8a9d9e05c1fcc24e068d170924 (diff) | |
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@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 1bc33ef99df0..b348b96285fd 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 |