mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert HTMLTableRules to scoped enum

Browse Source 
Change-Id: Id8758955565579abd1f4687907d7fe06aaefa749
This commit is contained in:
Noel Grandin
2017-03-06 09:47:01 +02:00
parent f36846b145
commit b0f13baae8
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/svtools/parhtml.hxx
View File

@@ -43,11 +43,9 @@ class SvKeyValueIterator;
#define HTMLFONTSZ6_DFLT 24 #define HTMLFONTSZ6_DFLT 24
#define HTMLFONTSZ7_DFLT 36 #define HTMLFONTSZ7_DFLT 36
enum class HTMLTableFrame { Void, Above, Below, enum class HTMLTableFrame { Void, Above, Below, HSides, LHS, RHS, VSides, Box };
HSides, LHS, RHS, VSides, Box };
enum HTMLTableRules { HTML_TR_NONE, HTML_TR_GROUPS, HTML_TR_ROWS, enum class HTMLTableRules { NONE, Groups, Rows, Cols, All };
HTML_TR_COLS, HTML_TR_ALL };
enum class HTMLInputType enum class HTMLInputType
{ {

10
svtools/source/svhtml/parhtml.cxx
View File

@@ -86,11 +86,11 @@ static HTMLOptionEnum<HTMLTableFrame> const aTableFrameOptEnums[] =
// <TABLE RULES=xxx> // <TABLE RULES=xxx>
static HTMLOptionEnum<HTMLTableRules> const aTableRulesOptEnums[] = static HTMLOptionEnum<HTMLTableRules> const aTableRulesOptEnums[] =
{ {
{ OOO_STRING_SVTOOLS_HTML_TR_none, HTML_TR_NONE }, { OOO_STRING_SVTOOLS_HTML_TR_none, HTMLTableRules::NONE },
{ OOO_STRING_SVTOOLS_HTML_TR_groups, HTML_TR_GROUPS }, { OOO_STRING_SVTOOLS_HTML_TR_groups, HTMLTableRules::Groups },
{ OOO_STRING_SVTOOLS_HTML_TR_rows, HTML_TR_ROWS }, { OOO_STRING_SVTOOLS_HTML_TR_rows, HTMLTableRules::Rows },
{ OOO_STRING_SVTOOLS_HTML_TR_cols, HTML_TR_COLS }, { OOO_STRING_SVTOOLS_HTML_TR_cols, HTMLTableRules::Cols },
{ OOO_STRING_SVTOOLS_HTML_TR_all, HTML_TR_ALL }, { OOO_STRING_SVTOOLS_HTML_TR_all, HTMLTableRules::All },
{ nullptr, (HTMLTableRules)0 } { nullptr, (HTMLTableRules)0 }
}; };

14
sw/source/filter/html/htmltab.cxx
View File

@@ -1878,16 +1878,16 @@ void HTMLTable::SetBorders()
{ {
sal_uInt16 i; sal_uInt16 i;
for( i=1; i<m_nCols; i++ ) for( i=1; i<m_nCols; i++ )
if( HTML_TR_ALL==m_eRules || HTML_TR_COLS==m_eRules || if( HTMLTableRules::All==m_eRules || HTMLTableRules::Cols==m_eRules ||
((HTML_TR_ROWS==m_eRules || HTML_TR_GROUPS==m_eRules) && ((HTMLTableRules::Rows==m_eRules || HTMLTableRules::Groups==m_eRules) &&
((*m_pColumns)[i-1])->IsEndOfGroup())) ((*m_pColumns)[i-1])->IsEndOfGroup()))
{ {
((*m_pColumns)[i])->bLeftBorder = true; ((*m_pColumns)[i])->bLeftBorder = true;
} }
for( i=0; i<m_nRows-1; i++ ) for( i=0; i<m_nRows-1; i++ )
if( HTML_TR_ALL==m_eRules || HTML_TR_ROWS==m_eRules || if( HTMLTableRules::All==m_eRules || HTMLTableRules::Rows==m_eRules ||
((HTML_TR_COLS==m_eRules || HTML_TR_GROUPS==m_eRules) && ((HTMLTableRules::Cols==m_eRules || HTMLTableRules::Groups==m_eRules) &&
(*m_pRows)[i]->IsEndOfGroup())) (*m_pRows)[i]->IsEndOfGroup()))
{ {
(*m_pRows)[i]->bBottomBorder = true; (*m_pRows)[i]->bBottomBorder = true;
@@ -4842,7 +4842,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
nBorder( USHRT_MAX ), nBorder( USHRT_MAX ),
nHSpace( 0 ), nVSpace( 0 ), nHSpace( 0 ), nVSpace( 0 ),
eAdjust( eParentAdjust ), eVertOri( text::VertOrientation::CENTER ), eAdjust( eParentAdjust ), eVertOri( text::VertOrientation::CENTER ),
eFrame( HTMLTableFrame::Void ), eRules( HTML_TR_NONE ), eFrame( HTMLTableFrame::Void ), eRules( HTMLTableRules::NONE ),
bPrcWidth( false ), bPrcWidth( false ),
bTableAdjust( false ), bTableAdjust( false ),
bBGColor( false ), bBGColor( false ),
@@ -4904,7 +4904,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
if( !bHasFrame ) if( !bHasFrame )
eFrame = ( nBorder ? HTMLTableFrame::Box : HTMLTableFrame::Void ); eFrame = ( nBorder ? HTMLTableFrame::Box : HTMLTableFrame::Void );
if( !bHasRules ) if( !bHasRules )
eRules = ( nBorder ? HTML_TR_ALL : HTML_TR_NONE ); eRules = ( nBorder ? HTMLTableRules::All : HTMLTableRules::NONE );
break; break;
case HTML_O_FRAME: case HTML_O_FRAME:
eFrame = rOption.GetTableFrame(); eFrame = rOption.GetTableFrame();
@@ -4962,7 +4962,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
if( 0==nBorder || USHRT_MAX==nBorder ) if( 0==nBorder || USHRT_MAX==nBorder )
{ {
eFrame = HTMLTableFrame::Void; eFrame = HTMLTableFrame::Void;
eRules = HTML_TR_NONE; eRules = HTMLTableRules::NONE;
} }
} }