diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 2ba9016346f8..55c9227f075d 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -43,11 +43,9 @@ class SvKeyValueIterator;
 #define HTMLFONTSZ6_DFLT 24
 #define HTMLFONTSZ7_DFLT 36
 
-enum class HTMLTableFrame { Void, Above, Below,
-    HSides, LHS, RHS, VSides, Box };
+enum class HTMLTableFrame { Void, Above, Below, HSides, LHS, RHS, VSides, Box };
 
-enum HTMLTableRules { HTML_TR_NONE, HTML_TR_GROUPS, HTML_TR_ROWS,
-    HTML_TR_COLS, HTML_TR_ALL };
+enum class HTMLTableRules { NONE, Groups, Rows, Cols, All };
 
 enum class HTMLInputType
 {
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 2da387814c40..463b35511f69 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -86,11 +86,11 @@ static HTMLOptionEnum<HTMLTableFrame> const aTableFrameOptEnums[] =
 // <TABLE RULES=xxx>
 static HTMLOptionEnum<HTMLTableRules> const aTableRulesOptEnums[] =
 {
-    { OOO_STRING_SVTOOLS_HTML_TR_none,   HTML_TR_NONE      },
-    { OOO_STRING_SVTOOLS_HTML_TR_groups, HTML_TR_GROUPS    },
-    { OOO_STRING_SVTOOLS_HTML_TR_rows,   HTML_TR_ROWS      },
-    { OOO_STRING_SVTOOLS_HTML_TR_cols,   HTML_TR_COLS      },
-    { OOO_STRING_SVTOOLS_HTML_TR_all,    HTML_TR_ALL       },
+    { OOO_STRING_SVTOOLS_HTML_TR_none,   HTMLTableRules::NONE      },
+    { OOO_STRING_SVTOOLS_HTML_TR_groups, HTMLTableRules::Groups    },
+    { OOO_STRING_SVTOOLS_HTML_TR_rows,   HTMLTableRules::Rows      },
+    { OOO_STRING_SVTOOLS_HTML_TR_cols,   HTMLTableRules::Cols      },
+    { OOO_STRING_SVTOOLS_HTML_TR_all,    HTMLTableRules::All       },
     { nullptr,                           (HTMLTableRules)0 }
 };
 
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 57117341f640..225901c57612 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1878,16 +1878,16 @@ void HTMLTable::SetBorders()
 {
     sal_uInt16 i;
     for( i=1; i<m_nCols; i++ )
-        if( HTML_TR_ALL==m_eRules || HTML_TR_COLS==m_eRules ||
-            ((HTML_TR_ROWS==m_eRules || HTML_TR_GROUPS==m_eRules) &&
+        if( HTMLTableRules::All==m_eRules || HTMLTableRules::Cols==m_eRules ||
+            ((HTMLTableRules::Rows==m_eRules || HTMLTableRules::Groups==m_eRules) &&
              ((*m_pColumns)[i-1])->IsEndOfGroup()))
         {
             ((*m_pColumns)[i])->bLeftBorder = true;
         }
 
     for( i=0; i<m_nRows-1; i++ )
-        if( HTML_TR_ALL==m_eRules || HTML_TR_ROWS==m_eRules ||
-            ((HTML_TR_COLS==m_eRules || HTML_TR_GROUPS==m_eRules) &&
+        if( HTMLTableRules::All==m_eRules || HTMLTableRules::Rows==m_eRules ||
+            ((HTMLTableRules::Cols==m_eRules || HTMLTableRules::Groups==m_eRules) &&
              (*m_pRows)[i]->IsEndOfGroup()))
         {
             (*m_pRows)[i]->bBottomBorder = true;
@@ -4842,7 +4842,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
     nBorder( USHRT_MAX ),
     nHSpace( 0 ), nVSpace( 0 ),
     eAdjust( eParentAdjust ), eVertOri( text::VertOrientation::CENTER ),
-    eFrame( HTMLTableFrame::Void ), eRules( HTML_TR_NONE ),
+    eFrame( HTMLTableFrame::Void ), eRules( HTMLTableRules::NONE ),
     bPrcWidth( false ),
     bTableAdjust( false ),
     bBGColor( false ),
@@ -4904,7 +4904,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
             if( !bHasFrame )
                 eFrame = ( nBorder ? HTMLTableFrame::Box : HTMLTableFrame::Void );
             if( !bHasRules )
-                eRules = ( nBorder ? HTML_TR_ALL : HTML_TR_NONE );
+                eRules = ( nBorder ? HTMLTableRules::All : HTMLTableRules::NONE );
             break;
         case HTML_O_FRAME:
             eFrame = rOption.GetTableFrame();
@@ -4962,7 +4962,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
     if( 0==nBorder || USHRT_MAX==nBorder )
     {
         eFrame = HTMLTableFrame::Void;
-        eRules = HTML_TR_NONE;
+        eRules = HTMLTableRules::NONE;
     }
 }