Remove extra #define

HTML_CFG_MSIE was an alias for HTML_CFG_MSIE_40, just use it everywhere
for clarity.

5 files changed, 9 insertions, 10 deletions

diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index a3016e6f55e0..7c1c3ef6862f 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -41,7 +41,7 @@
 const sal_uInt16 aPosToExportArr[] =
 {
     HTML_CFG_HTML32,
-    HTML_CFG_MSIE_40,
+    HTML_CFG_MSIE,
     HTML_CFG_NS40,
     HTML_CFG_WRITER
 };
@@ -225,7 +225,7 @@ IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox)
     sal_uInt16 nExport = aPosToExportArr[ pBox->GetSelectEntryPos() ];
     switch( nExport )
     {
-        case HTML_CFG_MSIE_40:
+        case HTML_CFG_MSIE:
         case HTML_CFG_NS40  :
         case HTML_CFG_WRITER :
             aPrintExtensionCB.Enable(sal_True);
diff --git a/svtools/inc/svtools/htmlcfg.hxx b/svtools/inc/svtools/htmlcfg.hxx
index c668324069bd..26bb48a09cb0 100644
--- a/svtools/inc/svtools/htmlcfg.hxx
+++ b/svtools/inc/svtools/htmlcfg.hxx
@@ -39,8 +39,7 @@
 // !!!be aware!!!: the following defines are _not_ used as values in the configuration file
 //                  this is because of compatibility reasons
 #define HTML_CFG_HTML32     0   // Html 3.2
-#define HTML_CFG_MSIE_40    1   // Internet Explorer 4.0
-#define HTML_CFG_MSIE       HTML_CFG_MSIE_40
+#define HTML_CFG_MSIE       1   // Internet Explorer
 #define HTML_CFG_WRITER     2   // Writer
 #define HTML_CFG_NS40       3   // Netscape 4.0
 #define HTML_CFG_MSIE_40_OLD 4   // Internet Explorer 4.0 - alter Wert
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 4b4f3424e1dd..5de4c38d3bf0 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -163,7 +163,7 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames )
                             switch( nExpMode )
                             {
                                 case 0:     nExpMode = HTML_CFG_HTML32;     break;
-                                case 1:     nExpMode = HTML_CFG_MSIE_40;    break;
+                                case 1:     nExpMode = HTML_CFG_MSIE;    break;
                                 case 3:     nExpMode = HTML_CFG_WRITER;     break;
                                 case 4:     nExpMode = HTML_CFG_NS40;       break;
                                 case 5:     nExpMode = HTML_CFG_MSIE_40_OLD;break;
@@ -233,7 +233,7 @@ void    SvxHtmlOptions::Commit()
                     switch( nExpMode )
                     {
                         case HTML_CFG_HTML32:       nExpMode = 0;   break;
-                        case HTML_CFG_MSIE_40:      nExpMode = 1;   break;
+                        case HTML_CFG_MSIE:      nExpMode = 1;   break;
                         case HTML_CFG_WRITER:       nExpMode = 3;   break;
                         case HTML_CFG_NS40:         nExpMode = 4;   break;
                         case HTML_CFG_MSIE_40_OLD:  nExpMode = 5;   break;
@@ -388,7 +388,7 @@ sal_Bool    SvxHtmlOptions::IsPrintLayoutExtension() const
     sal_Bool bRet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION);
     switch( pImp->nExportMode )
     {
-        case HTML_CFG_MSIE_40:
+        case HTML_CFG_MSIE:
         case HTML_CFG_NS40  :
         case HTML_CFG_WRITER :
         break;
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 24065184ffa4..9d40d700d41a 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -338,7 +338,7 @@ sal_uInt16      GetHtmlMode(const SwDocShell* pShell)
         SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
         switch ( rHtmlOpt.GetExportMode() )
         {
-            case HTML_CFG_MSIE_40:
+            case HTML_CFG_MSIE:
                 nRet |= HTMLMODE_SMALL_CAPS|
                         HTMLMODE_FULL_STYLES|HTMLMODE_GRAPH_POS|
                         HTMLMODE_FULL_ABS_POS|HTMLMODE_SOME_ABS_POS;
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index b7353106c99e..e46d7d30ef5d 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -517,7 +517,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
             sal_uInt16 nExport = rHtmlOpt.GetExportMode();
             if( HTML_CFG_MSIE == nExport ||
                 HTML_CFG_HTML32 == nExport ||
-                HTML_CFG_MSIE_40 == nExport ||
+                HTML_CFG_MSIE == nExport ||
                 HTML_CFG_HTML32 == nExport )
             {
                 bSingleCol = sal_True;
@@ -801,7 +801,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
                 {
                     SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
                     sal_uInt16 nExport = rHtmlOpt.GetExportMode();
-                    if(HTML_CFG_MSIE_40 != nExport && HTML_CFG_WRITER != nExport )
+                    if(HTML_CFG_MSIE != nExport && HTML_CFG_WRITER != nExport )
                         rSet.DisableItem(nWhich);
                 }
             }