diff options
| author | Harri Pitkänen <hatapitk@iki.fi> | 2011-10-06 20:58:11 +0300 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-06 20:03:33 +0100 |
| commit | 77cb41a734c507722c652d0a675ccbf18e3d6b99 (patch) | |
| tree | 3dc483301503c3956dbbf22fd2fc94c528bfa0ef /sw | |
| parent | 0e600dd2805f9284b01a1030f0ad1b720acdaeae (diff) | |
Remove code related to previously disabled HTML 3.2 export
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 7 | ||||
| -rw-r--r-- | sw/source/ui/shells/textsh.cxx | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index ff3c73bd7f83..96c4401fd922 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -162,8 +162,7 @@ sal_uLong SwHTMLWriter::WriteStream() if( HTML_CFG_NS40==nExportMode ) nHTMLMode |= HTMLMODE_BORDER_NONE; - if( HTML_CFG_HTML32!=nExportMode ) - nHTMLMode |= HTMLMODE_FONT_GENERIC; + nHTMLMode |= HTMLMODE_FONT_GENERIC; if( HTML_CFG_NS40==nExportMode ) nHTMLMode |= HTMLMODE_NO_CONTROL_CENTERING; @@ -906,9 +905,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) { rtl::OStringBuffer sOut; sOut.append(OOO_STRING_SVTOOLS_HTML_doctype).append(' ') - .append(HTML_CFG_HTML32==nExportMode ? - OOO_STRING_SVTOOLS_HTML_doctype32 : - OOO_STRING_SVTOOLS_HTML_doctype40); + .append(OOO_STRING_SVTOOLS_HTML_doctype40); HTMLOutFuncs::Out_AsciiTag( Strm(), sOut.makeStringAndClear().getStr() ); // baue den Vorspann diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index e46d7d30ef5d..5835e5c169b4 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -515,10 +515,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); sal_uInt16 nExport = rHtmlOpt.GetExportMode(); - if( HTML_CFG_MSIE == nExport || - HTML_CFG_HTML32 == nExport || - HTML_CFG_MSIE == nExport || - HTML_CFG_HTML32 == nExport ) + if( HTML_CFG_MSIE == nExport ) { bSingleCol = sal_True; } |