diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-02-20 20:19:07 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-21 12:45:45 +0000 |
| commit | 9ffb9d0baa22f85cc7c22a198760f90a4a857458 (patch) | |
| tree | 7fc2b864b3d2b528265e1dd79d4a8f9ee21d3ac7 | |
| parent | 703566b1dd752f7099d589da8617382a255b1d5e (diff) | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3ba02e9ec03df980803f35c4b16ce8b8ce90cb66)
Reviewed-on: https://gerrit.libreoffice.org/8157
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | dtrans/source/win32/dtobj/FmtFilter.cxx | 10 | ||||
| -rw-r--r-- | vcl/aqua/source/dtrans/HtmlFmtFlt.cxx | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index 199d30163d06..561571529392 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 e629f11e982e..f5e0b2282004 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) { |