[Libreoffice-commits] core.git: sw/source
Thomas Arnhold
thomas at arnhold.org
Sun Oct 6 11:36:23 PDT 2013
sw/source/filter/html/htmlfly.cxx | 4 ++--
sw/source/filter/html/htmlsect.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 028b3ad8e19609ad3cb490135eb0dd5bb8eafcfe
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Oct 6 20:15:08 2013 +0200
fdo#58912 HTML export: headers and footers cause non-validating html
Fix it by using harmless title.
Change-Id: I238034a23f4a446c69dd3c1408ac5ccf038c73dd
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 2abf566..b41acc0 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1582,8 +1582,8 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
rHTMLWrt.OutNewLine();
OStringBuffer sOut;
sOut.append(OOO_STRING_SVTOOLS_HTML_division).append(' ')
- .append(OOO_STRING_SVTOOLS_HTML_O_type).append('=')
- .append(bHeader ? "HEADER" : "FOOTER");
+ .append(OOO_STRING_SVTOOLS_HTML_O_title).append('=')
+ .append( bHeader ? "header" : "footer" );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.makeStringAndClear().getStr() );
rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken;
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index fcf206e..6a68eac 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -100,12 +100,12 @@ void SwHTMLParser::NewDivision( int nToken )
case HTML_O_HREF:
aHRef = rOption.GetString();
break;
- case HTML_O_TYPE:
+ case HTML_O_TITLE:
{
const OUString& rType = rOption.GetString();
- if( rType.equalsIgnoreAsciiCase( "HEADER" ) )
+ if( rType.equalsIgnoreAsciiCase("header") )
bHeader = sal_True;
- else if( rType.equalsIgnoreAsciiCase( "FOOTER" ) )
+ else if( rType.equalsIgnoreAsciiCase("footer") )
bFooter = sal_True;
}
}
More information about the Libreoffice-commits
mailing list