sw/source/filter/html/htmlfldw.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 4c49af256a456af48f0b29262c0b23aa1f6a9cd5 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Nov 5 15:08:29 2012 +0000 Related: fdo#56554 fix multi-script html field export Change-Id: I05257bed8161e0a63814c9a563d79e5750f626ff diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index adc4aa9..36e5b42 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -375,6 +375,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, SwHTMLWriter::GetCSS1ScriptForScriptType( nScriptType ); xub_StrLen nEndPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript( sExpand, nPos, nScriptType ); + xub_StrLen nChunkLen = nEndPos - nPos; if( nScript != CSS1_OUTMODE_ANY_SCRIPT && /* #108791# */ nScript != rHTMLWrt.nCSS1Script ) { @@ -404,7 +405,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, } } - HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.Copy( nPos, nEndPos ), + HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.Copy( nPos, nChunkLen ), rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); rHTMLWrt.bTagOn = sal_False; @@ -414,7 +415,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, } else { - HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.Copy( nPos, nEndPos ), + HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.Copy( nPos, nChunkLen ), rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); } nPos = nEndPos;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits