sw/source/filter/ww8/ww8par.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 13ba765c444713b0b0b2f4b4231bdafcbbef6ad0 Author: Michael Stahl <[email protected]> AuthorDate: Thu Nov 14 17:37:17 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Nov 15 12:51:11 2019 +0100 sw: WW8 import: instead of control character insert '?' for footnote SwWW8ImplReader::ReadChar() inserts a U+0002 control character to temporarily mark a footnote anchor; this is then deleted and replaced with a real footnote hint by SwWW8ImplReader::End_Footnote(). The assumption is that it is necessary to insert a placeholder character to be able to apply formatting to it. But if the document is corrupted, the control character could survive the import, which sounds less than ideal. So either make this magic character more explicit by documenting it in hintids.hxx and removing any outstanding ones at the end of the import, or use a non-offensive character instead; since this should only affect invalid documents, choose the solution with the least effort. Change-Id: I76d396258b32e0f0fb6393942a58a4dc57912211 Reviewed-on: https://gerrit.libreoffice.org/82760 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 445744b2912a..e2e12947cf13 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3744,7 +3744,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) break; case 0x2: // TODO: Auto-Footnote-Number, should be replaced by SwWW8ImplReader::End_Footnote later if (!m_aFootnoteStack.empty()) - cInsert = 0x2; + cInsert = '?'; break; default: SAL_INFO( "sw.ww8.level2", "<unknownValue val=\"" << nWCharVal << "\">" ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
