diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-02-27 15:30:25 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-01 10:07:31 +0100 |
| commit | b4f3af91d344d5f8c18e060615360e2a6633b63f (patch) | |
| tree | e144507a56056cd3c1a7c88b80cf38b8055da693 /sw/source/filter/html/wrthtml.cxx | |
| parent | 7ef644e7e5a91935ce4fd15c40cf9e8338e49ca4 (diff) | |
sw HTML export: handle XHTML ns alias even with HTMLOutFuncs::Out_AsciiTag()
This is meant to be mechanical, full conversion to HtmlWriter has to be
done step by step in follow-up commits.
Change-Id: Ieab096f8c9936f0ecad029fbdfb51da7412ad83e
Reviewed-on: https://gerrit.libreoffice.org/50449
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/html/wrthtml.cxx')
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 3831cee4fbc2..3c673e1845ea 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -437,9 +437,9 @@ ErrCode SwHTMLWriter::WriteStream() OutNewLine(); if (!mbSkipHeaderFooter) { - HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_body, false ); + HTMLOutFuncs::Out_AsciiTag( Strm(), GetNamespace() + OOO_STRING_SVTOOLS_HTML_body, false ); OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_html, false ); + HTMLOutFuncs::Out_AsciiTag( Strm(), GetNamespace() + OOO_STRING_SVTOOLS_HTML_html, false ); } // delete the table with floating frames @@ -666,7 +666,7 @@ static void lcl_html_OutSectionEndTag( SwHTMLWriter& rHTMLWrt ) rHTMLWrt.DecIndentLevel(); if( rHTMLWrt.m_bLFPossible ) rHTMLWrt.OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( rHTMLWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, false ); + HTMLOutFuncs::Out_AsciiTag( rHTMLWrt.Strm(), rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_division, false ); rHTMLWrt.m_bLFPossible = true; } @@ -946,14 +946,14 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) sOut.append(OOO_STRING_SVTOOLS_HTML_doctype " " OOO_STRING_SVTOOLS_XHTML_doctype11); else sOut.append(OOO_STRING_SVTOOLS_HTML_doctype " " OOO_STRING_SVTOOLS_HTML_doctype40); - HTMLOutFuncs::Out_AsciiTag( Strm(), sOut.makeStringAndClear().getStr() ); + HTMLOutFuncs::Out_AsciiTag( Strm(), sOut.makeStringAndClear().getStr() ); // No GetNamespace() here. // build prelude OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_html ); + HTMLOutFuncs::Out_AsciiTag( Strm(), GetNamespace() + OOO_STRING_SVTOOLS_HTML_html ); OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_head ); + HTMLOutFuncs::Out_AsciiTag( Strm(), GetNamespace() + OOO_STRING_SVTOOLS_HTML_head ); IncIndentLevel(); // indent content of <HEAD> @@ -1022,11 +1022,11 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) DecIndentLevel(); // indent content of <HEAD> OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_head, false ); + HTMLOutFuncs::Out_AsciiTag( Strm(), GetNamespace() + OOO_STRING_SVTOOLS_HTML_head, false ); // the body won't be indented, because then everything would be indented! OutNewLine(); - sOut.append("<" OOO_STRING_SVTOOLS_HTML_body); + sOut.append("<" + GetNamespace() + OOO_STRING_SVTOOLS_HTML_body); Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); // language @@ -1075,7 +1075,7 @@ void SwHTMLWriter::OutAnchor( const OUString& rName ) sOut.append("<" OOO_STRING_SVTOOLS_HTML_anchor " " OOO_STRING_SVTOOLS_HTML_O_name "=\""); Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( Strm(), rName, m_eDestEnc, &m_aNonConvertableCharacters ).WriteCharPtr( "\">" ); - HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, false ); + HTMLOutFuncs::Out_AsciiTag( Strm(), GetNamespace() + OOO_STRING_SVTOOLS_HTML_anchor, false ); } void SwHTMLWriter::OutBookmarks() @@ -1422,6 +1422,14 @@ sal_Int32 SwHTMLWriter::indexOfDotLeaders( sal_uInt16 nPoolId, const OUString& r return -1; } +OString SwHTMLWriter::GetNamespace() const +{ + if (maNamespace.isEmpty()) + return OString(); + + return maNamespace + ":"; +} + // Structure caches the current data of the writer to output a // other part of the document, like e.g. header/footer HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt, |