dtrans/source/win32/dtobj/FmtFilter.cxx | 10 +++++----- vcl/aqua/source/dtrans/HtmlFmtFlt.cxx | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit 9ffb9d0baa22f85cc7c22a198760f90a4a857458 Author: Kohei Yoshida <[email protected]> Date: Thu Feb 20 20:19:07 2014 -0500 fdo#74584: These tags should be lowercase for correct clipboard handling. Change-Id: I323b96cecbf7158919fad534a202f158965ca99f (cherry picked from commit 88c6cbda921f1e3627910f9028ff2e29f26160e7) Reviewed-on: https://gerrit.libreoffice.org/8154 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 3ba02e9ec03df980803f35c4b16ce8b8ce90cb66) Reviewed-on: https://gerrit.libreoffice.org/8157 Reviewed-by: Michael Stahl <[email protected]> diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index 199d301..5615715 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -357,13 +357,13 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t startFr // the office always writes the start and end html tag in upper cases and // without spaces both tags don't allow parameters -const std::string TAG_HTML = std::string("<HTML>"); -const std::string TAG_END_HTML = std::string("</HTML>"); +const std::string TAG_HTML = std::string("<html>"); +const std::string TAG_END_HTML = std::string("</html>"); // The body tag may have parameters so we need to search for the -// closing '>' manually e.g. <BODY param> #92840# -const std::string TAG_BODY = std::string("<BODY"); -const std::string TAG_END_BODY = std::string("</BODY"); +// closing '>' manually e.g. <body param> #92840# +const std::string TAG_BODY = std::string("<body"); +const std::string TAG_END_BODY = std::string("</body"); Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8>& aTextHtml) { diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx index e629f11..f5e0b22 100644 --- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx +++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx @@ -73,13 +73,13 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t startFr // the office always writes the start and end html tag in upper cases and // without spaces both tags don't allow parameters -const std::string TAG_HTML = std::string("<HTML>"); -const std::string TAG_END_HTML = std::string("</HTML>"); +const std::string TAG_HTML = std::string("<html>"); +const std::string TAG_END_HTML = std::string("</html>"); // The body tag may have parameters so we need to search for the // closing '>' manually e.g. <BODY param> #92840# -const std::string TAG_BODY = std::string("<BODY"); -const std::string TAG_END_BODY = std::string("</BODY"); +const std::string TAG_BODY = std::string("<body"); +const std::string TAG_END_BODY = std::string("</body"); Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8>& aTextHtml) {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
