Skip to content

C
core
Kaydet (Commit) 4c49af25 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Related: fdo#56554 fix multi-script html field export 

Change-Id: I05257bed8161e0a63814c9a563d79e5750f626ff
üst 5c87141d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
sw/source/filter/html/htmlfldw.cxx
Dosyayı görüntüle @ 4c49af25
...@@ -375,6 +375,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, ...@@ -375,6 +375,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
SwHTMLWriter::GetCSS1ScriptForScriptType( nScriptType ); SwHTMLWriter::GetCSS1ScriptForScriptType( nScriptType );
xub_StrLen nEndPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript( xub_StrLen nEndPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript(
sExpand, nPos, nScriptType ); sExpand, nPos, nScriptType );
xub_StrLen nChunkLen = nEndPos - nPos;
if( nScript != CSS1_OUTMODE_ANY_SCRIPT && if( nScript != CSS1_OUTMODE_ANY_SCRIPT &&
/* #108791# */ nScript != rHTMLWrt.nCSS1Script ) /* #108791# */ nScript != rHTMLWrt.nCSS1Script )
{ {
...@@ -404,7 +405,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, ...@@ -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.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
rHTMLWrt.bTagOn = sal_False; rHTMLWrt.bTagOn = sal_False;
...@@ -414,7 +415,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, ...@@ -414,7 +415,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
} }
else else
{ {
HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.Copy( nPos, nEndPos ), HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.Copy( nPos, nChunkLen ),
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
} }
nPos = nEndPos; nPos = nEndPos;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment