dbaccess/source/ui/misc/TokenWriter.cxx | 2 +-
include/svtools/htmlkywd.hxx | 3 ++-
sc/source/filter/html/htmlexp.cxx | 2 +-
sw/source/filter/html/wrthtml.cxx | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 821d2f8c058f7b7f45e23203d98aa9237289e265
Author: Andreas Heinisch <andreas.heini...@yahoo.de>
AuthorDate: Thu Aug 12 10:48:46 2021 +0200
Commit: Andreas Heinisch <andreas.heini...@yahoo.de>
CommitDate: Mon Aug 16 18:36:57 2021 +0200
tdf#126879 - Drop obsolete DOCTYPE HTML 4.0
and use the HTML5 DOCTYPE declaration
Change-Id: I00a769f2c8da876fd9435343c72f4d7685bc0cb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120378
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heini...@yahoo.de>
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx
b/dbaccess/source/ui/misc/TokenWriter.cxx
index 52a222ebe797..619b10095e4a 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -595,7 +595,7 @@ bool OHTMLImportExport::Write()
ODatabaseImportExport::Write();
if(m_xObject.is())
{
- m_pStream->WriteChar( '<' ).WriteCharPtr(
OOO_STRING_SVTOOLS_HTML_doctype ).WriteChar( ' ' ).WriteCharPtr(
OOO_STRING_SVTOOLS_HTML_doctype40 ).WriteChar( '>' ).WriteCharPtr(
SAL_NEWLINE_STRING ).WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteChar( '<' ).WriteCharPtr(
OOO_STRING_SVTOOLS_HTML_doctype ).WriteChar( ' ' ).WriteCharPtr(
OOO_STRING_SVTOOLS_HTML_doctype5 ).WriteChar( '>' ).WriteCharPtr(
SAL_NEWLINE_STRING ).WriteCharPtr( SAL_NEWLINE_STRING );
TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html );
WriteHeader();
OUT_LF();
diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 24133bd159cd..5d6b7e629fe7 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -21,7 +21,8 @@
#include <sal/config.h>
-#define OOO_STRING_SVTOOLS_HTML_doctype40 "HTML PUBLIC \"-//W3C//DTD HTML 4.0
Transitional//EN\""
+// tdf#126879 - drop obsolete DOCTYPE HTML 4.0 and use the HTML5 DOCTYPE
declaration
+#define OOO_STRING_SVTOOLS_HTML_doctype5 "html"
#define OOO_STRING_SVTOOLS_XHTML_doctype11
\
"html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\" "
\
"\"http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd\"";
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index d48598fd47c4..9c64d56d0f79 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -296,7 +296,7 @@ void ScHTMLExport::Write()
{
if (!mbSkipHeaderFooter)
{
- rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype
).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype40 ).WriteChar(
'>' )
+ rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype
).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype5 ).WriteChar(
'>' )
.WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr(
SAL_NEWLINE_STRING );
TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html );
WriteHeader();
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index 49993c7bc684..3df74ec20818 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -998,7 +998,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16
&rHeaderAttrs )
if (mbXHTML)
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);
+ sOut.append(OOO_STRING_SVTOOLS_HTML_doctype " "
OOO_STRING_SVTOOLS_HTML_doctype5);
HTMLOutFuncs::Out_AsciiTag( Strm(), sOut.makeStringAndClear().getStr()
); // No GetNamespace() here.
// build prelude
