diff options
| -rw-r--r-- | cui/source/options/opthtml.cxx | 15 | ||||
| -rw-r--r-- | cui/source/options/opthtml.src | 1 | ||||
| -rw-r--r-- | svtools/source/config/htmlcfg.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/config/viewopt.cxx | 2 |
4 files changed, 5 insertions, 15 deletions
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 7c1c3ef6862f..62dacb07287c 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -40,20 +40,17 @@ // Umwandlung der Modi zu den Positionen in der Listbox const sal_uInt16 aPosToExportArr[] = { - HTML_CFG_HTML32, HTML_CFG_MSIE, HTML_CFG_NS40, HTML_CFG_WRITER }; -//#define DEPRECATED_ENTRY 0xFFFF - const sal_uInt16 aExportToPosArr[] = { - 0, //HTML 3.2 - 1, //MS Internet Explorer 4.0 - 3, //StarWriter - 2 //Netscape Navigator 4.0 + 1, //HTML 3.2 (removed, map to Netscape Navigator 4.0) + 0, //MS Internet Explorer 4.0 + 2, //StarWriter + 1 //Netscape Navigator 4.0 }; // ----------------------------------------------------------------------- @@ -185,10 +182,8 @@ void OfaHtmlTabPage::Reset( const SfxItemSet& ) aIgnoreFontNamesCB.Check(rHtmlOpt.IsIgnoreFontFamily()); sal_uInt16 nExport = rHtmlOpt.GetExportMode(); if( nExport >= SAL_N_ELEMENTS( aExportToPosArr ) ) - nExport = 4; // default for bad config entry is NS 4.0 + nExport = 3; // default for bad config entry is NS 4.0 sal_uInt16 nPosArr = aExportToPosArr[ nExport ]; -// if( nPosArr == DEPRECATED_ENTRY ) -// nPosArr = aExportToPosArr[ 4 ]; // again: NS 4.0 is default aExportLB.SelectEntryPos( nPosArr ); aExportLB.SaveValue(); diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src index 5de010b58948..4d8c0b5547f2 100644 --- a/cui/source/options/opthtml.src +++ b/cui/source/options/opthtml.src @@ -249,7 +249,6 @@ TabPage RID_OFAPAGE_HTMLOPT DropDown = TRUE ; StringList = { - < "HTML 3.2" ; > ; < "Microsoft Internet Explorer" ; > ; < "Netscape Navigator"; > ; < "%PRODUCTNAME Writer" ; > ; diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index 4818208f3113..c021637eefac 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -162,7 +162,6 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames ) pValues[nProp] >>= nExpMode; switch( nExpMode ) { - case 0: nExpMode = HTML_CFG_HTML32; break; case 1: nExpMode = HTML_CFG_MSIE; break; case 3: nExpMode = HTML_CFG_WRITER; break; case 4: nExpMode = HTML_CFG_NS40; break; @@ -231,7 +230,6 @@ void SvxHtmlOptions::Commit() switch( nExpMode ) { - case HTML_CFG_HTML32: nExpMode = 0; break; case HTML_CFG_MSIE: nExpMode = 1; break; case HTML_CFG_WRITER: nExpMode = 3; break; case HTML_CFG_NS40: nExpMode = 4; break; diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 9d40d700d41a..4d5023632f05 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -353,8 +353,6 @@ sal_uInt16 GetHtmlMode(const SwDocShell* pShell) HTMLMODE_BLINK|HTMLMODE_DROPCAPS|HTMLMODE_GRAPH_POS| HTMLMODE_FULL_ABS_POS|HTMLMODE_SOME_ABS_POS; break; - case HTML_CFG_HTML32: - break; } } return nRet; |