include/svtools/parhtml.hxx | 40 +++++----- svtools/source/svhtml/htmlsupp.cxx | 12 +-- svtools/source/svhtml/parhtml.cxx | 138 ++++++++++++++++++------------------- sw/source/filter/html/htmlbas.cxx | 4 - sw/source/filter/html/htmlform.cxx | 64 ++++++++--------- sw/source/filter/html/htmltab.cxx | 32 ++++---- sw/source/filter/html/swhtml.cxx | 2 7 files changed, 145 insertions(+), 147 deletions(-)
New commits: commit 02fd5f04fb0c23d788d601ba1037aaf2856b3ce3 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Mon Mar 6 09:51:04 2017 +0200 convert eHtmlMetas to scoped enum Change-Id: I4433bb87e74b909fbd8e1144e00d8cc53954bf05 diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 463b355..82e7641 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1827,38 +1827,38 @@ bool HTMLParser::InternalImgToPrivateURL( OUString& rURL ) return bFound; } -enum eHtmlMetas { - HTML_META_NONE = 0, - HTML_META_AUTHOR, - HTML_META_DESCRIPTION, - HTML_META_KEYWORDS, - HTML_META_REFRESH, - HTML_META_CLASSIFICATION, - HTML_META_CREATED, - HTML_META_CHANGEDBY, - HTML_META_CHANGED, - HTML_META_GENERATOR, - HTML_META_SDFOOTNOTE, - HTML_META_SDENDNOTE, - HTML_META_CONTENT_TYPE +enum class HtmlMeta { + NONE = 0, + Author, + Description, + Keywords, + Refresh, + Classification, + Created, + ChangedBy, + Changed, + Generator, + SDFootnote, + SDEndnote, + ContentType }; // <META NAME=xxx> -static HTMLOptionEnum<eHtmlMetas> const aHTMLMetaNameTable[] = +static HTMLOptionEnum<HtmlMeta> const aHTMLMetaNameTable[] = { - { OOO_STRING_SVTOOLS_HTML_META_author, HTML_META_AUTHOR }, - { OOO_STRING_SVTOOLS_HTML_META_changed, HTML_META_CHANGED }, - { OOO_STRING_SVTOOLS_HTML_META_changedby, HTML_META_CHANGEDBY }, - { OOO_STRING_SVTOOLS_HTML_META_classification,HTML_META_CLASSIFICATION}, - { OOO_STRING_SVTOOLS_HTML_META_content_type, HTML_META_CONTENT_TYPE }, - { OOO_STRING_SVTOOLS_HTML_META_created, HTML_META_CREATED }, - { OOO_STRING_SVTOOLS_HTML_META_description, HTML_META_DESCRIPTION }, - { OOO_STRING_SVTOOLS_HTML_META_keywords, HTML_META_KEYWORDS }, - { OOO_STRING_SVTOOLS_HTML_META_generator, HTML_META_GENERATOR }, - { OOO_STRING_SVTOOLS_HTML_META_refresh, HTML_META_REFRESH }, - { OOO_STRING_SVTOOLS_HTML_META_sdendnote, HTML_META_SDENDNOTE }, - { OOO_STRING_SVTOOLS_HTML_META_sdfootnote, HTML_META_SDFOOTNOTE }, - { nullptr, (eHtmlMetas)0 } + { OOO_STRING_SVTOOLS_HTML_META_author, HtmlMeta::Author }, + { OOO_STRING_SVTOOLS_HTML_META_changed, HtmlMeta::Changed }, + { OOO_STRING_SVTOOLS_HTML_META_changedby, HtmlMeta::ChangedBy }, + { OOO_STRING_SVTOOLS_HTML_META_classification,HtmlMeta::Classification}, + { OOO_STRING_SVTOOLS_HTML_META_content_type, HtmlMeta::ContentType }, + { OOO_STRING_SVTOOLS_HTML_META_created, HtmlMeta::Created }, + { OOO_STRING_SVTOOLS_HTML_META_description, HtmlMeta::Description }, + { OOO_STRING_SVTOOLS_HTML_META_keywords, HtmlMeta::Keywords }, + { OOO_STRING_SVTOOLS_HTML_META_generator, HtmlMeta::Generator }, + { OOO_STRING_SVTOOLS_HTML_META_refresh, HtmlMeta::Refresh }, + { OOO_STRING_SVTOOLS_HTML_META_sdendnote, HtmlMeta::SDEndnote }, + { OOO_STRING_SVTOOLS_HTML_META_sdfootnote, HtmlMeta::SDFootnote }, + { nullptr, (HtmlMeta)0 } }; @@ -1873,7 +1873,7 @@ bool HTMLParser::ParseMetaOptionsImpl( rtl_TextEncoding& o_rEnc ) { OUString aName, aContent; - eHtmlMetas nAction = HTML_META_NONE; + HtmlMeta nAction = HtmlMeta::NONE; bool bHTTPEquiv = false, bChanged = false; for ( size_t i = aOptions.size(); i; ) @@ -1883,7 +1883,7 @@ bool HTMLParser::ParseMetaOptionsImpl( { case HTML_O_NAME: aName = aOption.GetString(); - if ( HTML_META_NONE==nAction ) + if ( HtmlMeta::NONE==nAction ) { aOption.GetEnum( nAction, aHTMLMetaNameTable ); } @@ -1903,7 +1903,7 @@ bool HTMLParser::ParseMetaOptionsImpl( } } - if ( bHTTPEquiv || HTML_META_DESCRIPTION != nAction ) + if ( bHTTPEquiv || HtmlMeta::Description != nAction ) { // if it is not a Description, remove CRs and LFs from CONTENT aContent = aContent.replaceAll("\r", "").replaceAll("\n", ""); @@ -1927,40 +1927,40 @@ bool HTMLParser::ParseMetaOptionsImpl( switch ( nAction ) { - case HTML_META_AUTHOR: + case HtmlMeta::Author: if (i_xDocProps.is()) { i_xDocProps->setAuthor( aContent ); bChanged = true; } break; - case HTML_META_DESCRIPTION: + case HtmlMeta::Description: if (i_xDocProps.is()) { i_xDocProps->setDescription( aContent ); bChanged = true; } break; - case HTML_META_KEYWORDS: + case HtmlMeta::Keywords: if (i_xDocProps.is()) { i_xDocProps->setKeywords( ::comphelper::string::convertCommaSeparated(aContent)); bChanged = true; } break; - case HTML_META_CLASSIFICATION: + case HtmlMeta::Classification: if (i_xDocProps.is()) { i_xDocProps->setSubject( aContent ); bChanged = true; } break; - case HTML_META_CHANGEDBY: + case HtmlMeta::ChangedBy: if (i_xDocProps.is()) { i_xDocProps->setModifiedBy( aContent ); } break; - case HTML_META_CREATED: - case HTML_META_CHANGED: + case HtmlMeta::Created: + case HtmlMeta::Changed: if ( i_xDocProps.is() && !aContent.isEmpty() && comphelper::string::getTokenCount(aContent, ';') == 2 ) { @@ -1968,7 +1968,7 @@ bool HTMLParser::ParseMetaOptionsImpl( tools::Time aTime( (sal_uLong)aContent.getToken(1, ';').toInt32() ); DateTime aDateTime( aDate, aTime ); ::util::DateTime uDT = aDateTime.GetUNODateTime(); - if ( HTML_META_CREATED==nAction ) + if ( HtmlMeta::Created==nAction ) i_xDocProps->setCreationDate( uDT ); else i_xDocProps->setModificationDate( uDT ); @@ -1976,19 +1976,19 @@ bool HTMLParser::ParseMetaOptionsImpl( } break; - case HTML_META_REFRESH: + case HtmlMeta::Refresh: DBG_ASSERT( !bHTTPEquiv || i_pHTTPHeader, "Reload-URL aufgrund unterlassener MUSS-Aenderung verlorengegangen" ); break; - case HTML_META_CONTENT_TYPE: + case HtmlMeta::ContentType: if ( !aContent.isEmpty() ) { o_rEnc = GetEncodingByMIME( aContent ); } break; - case HTML_META_NONE: + case HtmlMeta::NONE: if ( !bHTTPEquiv ) { if (i_xDocProps.is()) commit b0f13baae8f61ed9ee5152fb04dd78d8c941b173 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Mon Mar 6 09:47:01 2017 +0200 convert HTMLTableRules to scoped enum Change-Id: Id8758955565579abd1f4687907d7fe06aaefa749 diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 2ba9016..55c9227 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 2da3878..463b355 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 5711734..225901c 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; } } commit f36846b145e24d5fac4750d46446c189c23df533 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Mon Mar 6 09:42:14 2017 +0200 convert HTMLTableFrame to scoped enum Change-Id: I1353619ca11f867ca37dec3105e50ba9f3d70d54 diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 9b76344..2ba9016 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 77e9335..2da3878 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 f7a3395..5711734 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; } } commit 5a099fef6e804c8fc17647c4ad2279102d0ce383 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Mon Mar 6 09:36:52 2017 +0200 convert HTMLInputType to scoped enum Change-Id: I3f6f6aadd813898ccff93154138a2fbf911b9c8f diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index f2a7731..9b76344 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -49,20 +49,20 @@ enum HTMLTableFrame { HTML_TF_VOID, HTML_TF_ABOVE, HTML_TF_BELOW, enum HTMLTableRules { HTML_TR_NONE, HTML_TR_GROUPS, HTML_TR_ROWS, HTML_TR_COLS, HTML_TR_ALL }; -enum HTMLInputType +enum class HTMLInputType { - HTML_IT_TEXT = 0x01, - HTML_IT_PASSWORD = 0x02, - HTML_IT_CHECKBOX = 0x03, - HTML_IT_RADIO = 0x04, - HTML_IT_RANGE = 0x05, - HTML_IT_SCRIBBLE = 0x06, - HTML_IT_FILE = 0x07, - HTML_IT_HIDDEN = 0x08, - HTML_IT_SUBMIT = 0x09, - HTML_IT_IMAGE = 0x0a, - HTML_IT_RESET = 0x0b, - HTML_IT_BUTTON = 0x0c + Text = 1, + Password, + Checkbox, + Radio, + Range, + Scribble, + File, + Hidden, + Submit, + Image, + Reset, + Button }; enum class HTMLScriptLanguage diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 4e98c30..77e9335 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -53,18 +53,18 @@ const sal_Int32 MAX_ENTITY_LEN( 8L ); // <INPUT TYPE=xxx> static HTMLOptionEnum<HTMLInputType> const aInputTypeOptEnums[] = { - { OOO_STRING_SVTOOLS_HTML_IT_text, HTML_IT_TEXT }, - { OOO_STRING_SVTOOLS_HTML_IT_password, HTML_IT_PASSWORD }, - { OOO_STRING_SVTOOLS_HTML_IT_checkbox, HTML_IT_CHECKBOX }, - { OOO_STRING_SVTOOLS_HTML_IT_radio, HTML_IT_RADIO }, - { OOO_STRING_SVTOOLS_HTML_IT_range, HTML_IT_RANGE }, - { OOO_STRING_SVTOOLS_HTML_IT_scribble, HTML_IT_SCRIBBLE }, - { OOO_STRING_SVTOOLS_HTML_IT_file, HTML_IT_FILE }, - { OOO_STRING_SVTOOLS_HTML_IT_hidden, HTML_IT_HIDDEN }, - { OOO_STRING_SVTOOLS_HTML_IT_submit, HTML_IT_SUBMIT }, - { OOO_STRING_SVTOOLS_HTML_IT_image, HTML_IT_IMAGE }, - { OOO_STRING_SVTOOLS_HTML_IT_reset, HTML_IT_RESET }, - { OOO_STRING_SVTOOLS_HTML_IT_button, HTML_IT_BUTTON }, + { OOO_STRING_SVTOOLS_HTML_IT_text, HTMLInputType::Text }, + { OOO_STRING_SVTOOLS_HTML_IT_password, HTMLInputType::Password }, + { OOO_STRING_SVTOOLS_HTML_IT_checkbox, HTMLInputType::Checkbox }, + { OOO_STRING_SVTOOLS_HTML_IT_radio, HTMLInputType::Radio }, + { OOO_STRING_SVTOOLS_HTML_IT_range, HTMLInputType::Range }, + { OOO_STRING_SVTOOLS_HTML_IT_scribble, HTMLInputType::Scribble }, + { OOO_STRING_SVTOOLS_HTML_IT_file, HTMLInputType::File }, + { OOO_STRING_SVTOOLS_HTML_IT_hidden, HTMLInputType::Hidden }, + { OOO_STRING_SVTOOLS_HTML_IT_submit, HTMLInputType::Submit }, + { OOO_STRING_SVTOOLS_HTML_IT_image, HTMLInputType::Image }, + { OOO_STRING_SVTOOLS_HTML_IT_reset, HTMLInputType::Reset }, + { OOO_STRING_SVTOOLS_HTML_IT_button, HTMLInputType::Button }, { nullptr, (HTMLInputType)0 } }; @@ -198,7 +198,7 @@ void HTMLOption::GetColor( Color& rColor ) const HTMLInputType HTMLOption::GetInputType() const { DBG_ASSERT( nToken==HTML_O_TYPE, "GetInputType: Option not TYPE" ); - return (HTMLInputType)GetEnum( aInputTypeOptEnums, HTML_IT_TEXT ); + return (HTMLInputType)GetEnum( aInputTypeOptEnums, HTMLInputType::Text ); } HTMLTableFrame HTMLOption::GetTableFrame() const diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 4a09292..3a6db55 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -1394,7 +1394,7 @@ void SwHTMLParser::InsertInput() sal_Int16 nMaxLen = 0; sal_Int16 nChecked = TRISTATE_FALSE; sal_Int32 nTabIndex = TABINDEX_MAX + 1; - HTMLInputType eType = HTML_IT_TEXT; + HTMLInputType eType = HTMLInputType::Text; bool bDisabled = false, bValue = false; bool bSetGrfWidth = false, bSetGrfHeight = false; bool bHidden = false; @@ -1530,7 +1530,7 @@ void SwHTMLParser::InsertInput() } } - if( HTML_IT_IMAGE==eType ) + if( HTMLInputType::Image==eType ) { // Image-Controls ohne Image-URL werden ignoriert (wie bei MS) if( sImgSrc.isEmpty() ) @@ -1545,42 +1545,42 @@ void SwHTMLParser::InsertInput() eHoriOri = text::HoriOrientation::NONE; } - // Defaults entsprechen HTML_IT_TEXT + // Defaults entsprechen HTMLInputType::Text const sal_Char *pType = "TextField"; bool bKeepCRLFInValue = false; switch( eType ) { - case HTML_IT_CHECKBOX: + case HTMLInputType::Checkbox: pType = "CheckBox"; bKeepCRLFInValue = true; break; - case HTML_IT_RADIO: + case HTMLInputType::Radio: pType = "RadioButton"; bKeepCRLFInValue = true; break; - case HTML_IT_PASSWORD: + case HTMLInputType::Password: bKeepCRLFInValue = true; break; - case HTML_IT_BUTTON: + case HTMLInputType::Button: bKeepCRLFInValue = true; SAL_FALLTHROUGH; - case HTML_IT_SUBMIT: - case HTML_IT_RESET: + case HTMLInputType::Submit: + case HTMLInputType::Reset: pType = "CommandButton"; break; - case HTML_IT_IMAGE: + case HTMLInputType::Image: pType = "ImageButton"; break; - case HTML_IT_FILE: + case HTMLInputType::File: pType = "FileControl"; break; - case HTML_IT_HIDDEN: + case HTMLInputType::Hidden: pType = "HiddenControl"; bKeepCRLFInValue = true; break; @@ -1617,7 +1617,7 @@ void SwHTMLParser::InsertInput() aTmp <<= sName; xPropSet->setPropertyValue("Name", aTmp ); - if( HTML_IT_HIDDEN != eType ) + if( HTMLInputType::Hidden != eType ) { if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { @@ -1639,8 +1639,8 @@ void SwHTMLParser::InsertInput() bool bUseSize = false; switch( eType ) { - case HTML_IT_CHECKBOX: - case HTML_IT_RADIO: + case HTMLInputType::Checkbox: + case HTMLInputType::Radio: { if( !bValue ) aTmp <<= OUString( OOO_STRING_SVTOOLS_HTML_on ); @@ -1653,7 +1653,7 @@ void SwHTMLParser::InsertInput() // erst gesetzt werden, wenn das Control angelegt und ein // activateTabOrder gerufen wurde, weil es sonst noch zu der // vorhergehenden Gruppe gehoert. - if( HTML_IT_CHECKBOX == eType ) + if( HTMLInputType::Checkbox == eType ) { aTmp <<= (sal_Int16) nChecked ; xPropSet->setPropertyValue("DefaultState", aTmp ); @@ -1670,7 +1670,7 @@ void SwHTMLParser::InsertInput() } break; - case HTML_IT_IMAGE: + case HTMLInputType::Image: { // SIZE = WIDTH aSz.Width() = nSize ? nSize : nWidth; @@ -1690,22 +1690,22 @@ void SwHTMLParser::InsertInput() } break; - case HTML_IT_BUTTON: - case HTML_IT_SUBMIT: - case HTML_IT_RESET: + case HTMLInputType::Button: + case HTMLInputType::Submit: + case HTMLInputType::Reset: { FormButtonType eButtonType; switch( eType ) { - case HTML_IT_BUTTON: + case HTMLInputType::Button: eButtonType = FormButtonType_PUSH; break; - case HTML_IT_SUBMIT: + case HTMLInputType::Submit: eButtonType = FormButtonType_SUBMIT; if (sText.isEmpty()) sText = OOO_STRING_SVTOOLS_HTML_IT_submit; break; - case HTML_IT_RESET: + case HTMLInputType::Reset: eButtonType = FormButtonType_RESET; if (sText.isEmpty()) sText = OOO_STRING_SVTOOLS_HTML_IT_reset; @@ -1725,10 +1725,10 @@ void SwHTMLParser::InsertInput() } break; - case HTML_IT_PASSWORD: - case HTML_IT_TEXT: - case HTML_IT_FILE: - if( HTML_IT_FILE != eType ) + case HTMLInputType::Password: + case HTMLInputType::Text: + case HTMLInputType::File: + if( HTMLInputType::File != eType ) { // Beim File-Control wird der VALUE aus Sicherheitsgruenden ignoriert. xPropSet->setPropertyValue("DefaultText", aTmp ); @@ -1739,7 +1739,7 @@ void SwHTMLParser::InsertInput() } } - if( HTML_IT_PASSWORD == eType ) + if( HTMLInputType::Password == eType ) { aTmp <<= (sal_Int16)'*' ; xPropSet->setPropertyValue("EchoChar", aTmp ); @@ -1753,7 +1753,7 @@ void SwHTMLParser::InsertInput() bMinHeight = true; break; - case HTML_IT_HIDDEN: + case HTMLInputType::Hidden: xPropSet->setPropertyValue("HiddenValue", aTmp ); bHidden = true; break; @@ -1798,7 +1798,7 @@ void SwHTMLParser::InsertInput() // Beim Image-Button bei nicht gegebern Groesse einen sinnvollen Default // setzen - if( HTML_IT_IMAGE== eType ) + if( HTMLInputType::Image== eType ) { if( !aSz.Width() ) { @@ -1831,13 +1831,13 @@ void SwHTMLParser::InsertInput() SetControlSize( xShape, aTextSz, bMinWidth, bMinHeight ); } - if( HTML_IT_RADIO == eType ) + if( HTMLInputType::Radio == eType ) { aTmp <<= (sal_Int16) nChecked ; xPropSet->setPropertyValue("DefaultState", aTmp ); } - if( HTML_IT_IMAGE == eType ) + if( HTMLInputType::Image == eType ) { // Die URL erst nach dem Einfuegen setzen, weil sich der // Download der Grafik erst dann am XModel anmelden kann, commit 1cbef3eb084b78734165f79854b58afc860bac1c Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Mon Mar 6 09:30:34 2017 +0200 convert HTMLScriptLanguage to scoped enum Change-Id: If87863b520da704410a6ad261330bbde7ef8008c diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index a46f07f..f2a7731 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -65,11 +65,11 @@ enum HTMLInputType HTML_IT_BUTTON = 0x0c }; -enum HTMLScriptLanguage +enum class HTMLScriptLanguage { - HTML_SL_STARBASIC, - HTML_SL_JAVASCRIPT, - HTML_SL_UNKNOWN + StarBasic, + JavaScript, + Unknown }; template<typename EnumT> diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx index e1c9d5d..d60c5d5 100644 --- a/svtools/source/svhtml/htmlsupp.cxx +++ b/svtools/source/svhtml/htmlsupp.cxx @@ -28,10 +28,10 @@ // Table for converting option values into strings static HTMLOptionEnum<HTMLScriptLanguage> const aScriptLangOptEnums[] = { - { OOO_STRING_SVTOOLS_HTML_LG_starbasic, HTML_SL_STARBASIC }, - { OOO_STRING_SVTOOLS_HTML_LG_javascript, HTML_SL_JAVASCRIPT }, - { OOO_STRING_SVTOOLS_HTML_LG_javascript11, HTML_SL_JAVASCRIPT }, - { OOO_STRING_SVTOOLS_HTML_LG_livescript, HTML_SL_JAVASCRIPT }, + { OOO_STRING_SVTOOLS_HTML_LG_starbasic, HTMLScriptLanguage::StarBasic }, + { OOO_STRING_SVTOOLS_HTML_LG_javascript, HTMLScriptLanguage::JavaScript }, + { OOO_STRING_SVTOOLS_HTML_LG_javascript11, HTMLScriptLanguage::JavaScript }, + { OOO_STRING_SVTOOLS_HTML_LG_livescript, HTMLScriptLanguage::JavaScript }, { nullptr, (HTMLScriptLanguage)0 } }; @@ -44,7 +44,7 @@ void HTMLParser::ParseScriptOptions( OUString& rLangString, const OUString& rBas const HTMLOptions& aScriptOptions = GetOptions(); rLangString.clear(); - rLang = HTML_SL_JAVASCRIPT; + rLang = HTMLScriptLanguage::JavaScript; rSrc.clear(); rLibrary.clear(); rModule.clear(); @@ -61,7 +61,7 @@ void HTMLParser::ParseScriptOptions( OUString& rLangString, const OUString& rBas if( aOption.GetEnum( nLang, aScriptLangOptEnums ) ) rLang = (HTMLScriptLanguage)nLang; else - rLang = HTML_SL_UNKNOWN; + rLang = HTMLScriptLanguage::Unknown; } break; diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 539c07d..f2b0e98 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -77,7 +77,7 @@ void SwHTMLParser::EndScript() switch( m_eScriptLang ) { - case HTML_SL_STARBASIC: + case HTMLScriptLanguage::StarBasic: bInsIntoBasic = true; break; default: @@ -184,7 +184,7 @@ void SwHTMLParser::AddScriptSource() { // We'll just remember a few strings here if( aToken.getLength() > 2 && - (HTML_SL_STARBASIC==m_eScriptLang && aToken[ 0 ] == '\'') ) + (HTMLScriptLanguage::StarBasic==m_eScriptLang && aToken[ 0 ] == '\'') ) { sal_Int32 nPos = -1; if( m_aBasicLib.isEmpty() ) diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 95fb0b6..e835bc7 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -301,7 +301,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn, m_nEventId = nullptr; m_bUpperSpace = m_bViewCreated = m_bChkJumpMark = false; - m_eScriptLang = HTML_SL_UNKNOWN; + m_eScriptLang = HTMLScriptLanguage::Unknown; rCursor.DeleteMark(); m_pPam = &rCursor; // re-use existing cursor: avoids spurious ~SwIndexReg assert _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits