summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorHarri Pitkänen <hatapitk@iki.fi>2011-08-20 12:48:24 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-08-26 17:23:02 +0300
commit3f43b02433b970cd36ee4c9249e425d6b1bd9fbe (patch)
tree082297e77bb207ceadc9dfe2a302341149f20674 /cui
parentb4052c88e4240070623f13ab130f41a703cf7b7d (diff)
Remove HTML 3.2 export option
Diffstat (limited to 'cui')
-rw-r--r--cui/source/options/opthtml.cxx15
-rw-r--r--cui/source/options/opthtml.src1
2 files changed, 5 insertions, 11 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" ; > ;