diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-11-05 15:08:29 +0000 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2012-11-12 22:17:39 +0200 |
| commit | 81d9ca8be4f3abdbd4214110f07a34bd6246f7d8 (patch) | |
| tree | 47dc8af56de688954a44a0570c206fd597ad5afa | |
| parent | 283fd1bda90f3d1325a7adeeb4c33a891efb4a4a (diff) | |
Related: fdo#56554 fix multi-script html field export
Change-Id: I05257bed8161e0a63814c9a563d79e5750f626ff
(cherry picked from commit 4c49af256a456af48f0b29262c0b23aa1f6a9cd5)
Signed-off-by: Lior Kaplan <kaplanlior@gmail.com>
| -rw-r--r-- | sw/source/filter/html/htmlfldw.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index ed72fccab639..35150a08f261 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -374,6 +374,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 ) { @@ -403,7 +404,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; @@ -413,7 +414,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; |