diff options
| -rw-r--r-- | include/svtools/parhtml.hxx | 4 | ||||
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 18 | ||||
| -rw-r--r-- | sw/source/filter/html/htmltab.cxx | 20 |
3 files changed, 21 insertions, 21 deletions
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 9b7634430fd4..2ba9016346f8 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -43,8 +43,8 @@ class SvKeyValueIterator; #define HTMLFONTSZ6_DFLT 24 #define HTMLFONTSZ7_DFLT 36 -enum HTMLTableFrame { HTML_TF_VOID, HTML_TF_ABOVE, HTML_TF_BELOW, - HTML_TF_HSIDES, HTML_TF_LHS, HTML_TF_RHS, HTML_TF_VSIDES, HTML_TF_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 }; diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 77e93354ccaf..2da387814c40 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -71,15 +71,15 @@ static HTMLOptionEnum<HTMLInputType> const aInputTypeOptEnums[] = // <TABLE FRAME=xxx> static HTMLOptionEnum<HTMLTableFrame> const aTableFrameOptEnums[] = { - { OOO_STRING_SVTOOLS_HTML_TF_void, HTML_TF_VOID }, - { OOO_STRING_SVTOOLS_HTML_TF_above, HTML_TF_ABOVE }, - { OOO_STRING_SVTOOLS_HTML_TF_below, HTML_TF_BELOW }, - { OOO_STRING_SVTOOLS_HTML_TF_hsides, HTML_TF_HSIDES }, - { OOO_STRING_SVTOOLS_HTML_TF_lhs, HTML_TF_LHS }, - { OOO_STRING_SVTOOLS_HTML_TF_rhs, HTML_TF_RHS }, - { OOO_STRING_SVTOOLS_HTML_TF_vsides, HTML_TF_VSIDES }, - { OOO_STRING_SVTOOLS_HTML_TF_box, HTML_TF_BOX }, - { OOO_STRING_SVTOOLS_HTML_TF_border, HTML_TF_BOX }, + { OOO_STRING_SVTOOLS_HTML_TF_void, HTMLTableFrame::Void }, + { OOO_STRING_SVTOOLS_HTML_TF_above, HTMLTableFrame::Above }, + { OOO_STRING_SVTOOLS_HTML_TF_below, HTMLTableFrame::Below }, + { OOO_STRING_SVTOOLS_HTML_TF_hsides, HTMLTableFrame::HSides }, + { OOO_STRING_SVTOOLS_HTML_TF_lhs, HTMLTableFrame::LHS }, + { OOO_STRING_SVTOOLS_HTML_TF_rhs, HTMLTableFrame::RHS }, + { OOO_STRING_SVTOOLS_HTML_TF_vsides, HTMLTableFrame::VSides }, + { OOO_STRING_SVTOOLS_HTML_TF_box, HTMLTableFrame::Box }, + { OOO_STRING_SVTOOLS_HTML_TF_border, HTMLTableFrame::Box }, { nullptr, (HTMLTableFrame)0 } }; diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index f7a3395e8537..57117341f640 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -1893,18 +1893,18 @@ void HTMLTable::SetBorders() (*m_pRows)[i]->bBottomBorder = true; } - if( m_bTopAllowed && (HTML_TF_ABOVE==m_eFrame || HTML_TF_HSIDES==m_eFrame || - HTML_TF_BOX==m_eFrame) ) + if( m_bTopAllowed && (HTMLTableFrame::Above==m_eFrame || HTMLTableFrame::HSides==m_eFrame || + HTMLTableFrame::Box==m_eFrame) ) m_bTopBorder = true; - if( HTML_TF_BELOW==m_eFrame || HTML_TF_HSIDES==m_eFrame || - HTML_TF_BOX==m_eFrame ) + if( HTMLTableFrame::Below==m_eFrame || HTMLTableFrame::HSides==m_eFrame || + HTMLTableFrame::Box==m_eFrame ) { (*m_pRows)[m_nRows-1]->bBottomBorder = true; } - if( (HTML_TF_RHS==m_eFrame || HTML_TF_VSIDES==m_eFrame || - HTML_TF_BOX==m_eFrame) ) + if( (HTMLTableFrame::RHS==m_eFrame || HTMLTableFrame::VSides==m_eFrame || + HTMLTableFrame::Box==m_eFrame) ) m_bRightBorder = true; - if( HTML_TF_LHS==m_eFrame || HTML_TF_VSIDES==m_eFrame || HTML_TF_BOX==m_eFrame ) + if( HTMLTableFrame::LHS==m_eFrame || HTMLTableFrame::VSides==m_eFrame || HTMLTableFrame::Box==m_eFrame ) { ((*m_pColumns)[0])->bLeftBorder = true; } @@ -4842,7 +4842,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, nBorder( USHRT_MAX ), nHSpace( 0 ), nVSpace( 0 ), eAdjust( eParentAdjust ), eVertOri( text::VertOrientation::CENTER ), - eFrame( HTML_TF_VOID ), eRules( HTML_TR_NONE ), + eFrame( HTMLTableFrame::Void ), eRules( HTML_TR_NONE ), bPrcWidth( false ), bTableAdjust( false ), bBGColor( false ), @@ -4902,7 +4902,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, nBorder = 1; if( !bHasFrame ) - eFrame = ( nBorder ? HTML_TF_BOX : HTML_TF_VOID ); + eFrame = ( nBorder ? HTMLTableFrame::Box : HTMLTableFrame::Void ); if( !bHasRules ) eRules = ( nBorder ? HTML_TR_ALL : HTML_TR_NONE ); break; @@ -4961,7 +4961,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, // If BORDER=0 or no BORDER given, then there shouldn't be a border if( 0==nBorder || USHRT_MAX==nBorder ) { - eFrame = HTML_TF_VOID; + eFrame = HTMLTableFrame::Void; eRules = HTML_TR_NONE; } } |