convert HTML_OPTION_IDS to scoped enum

Change-Id: Ia766dc58a571e5853005fd394283d7b53f02e4a6
Reviewed-on: https://gerrit.libreoffice.org/36748
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 21 insertions, 24 deletions

diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index c27201e6de92..b63d4e3368c8 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -63,39 +63,39 @@ void SfxFrameHTMLParser::ParseFrameOptions(
     {
         switch( rOption.GetToken() )
         {
-        case HTML_O_BORDERCOLOR:
+        case HtmlOptionId::BORDERCOLOR:
             {
                 Color aColor;
                 rOption.GetColor( aColor );
                 pFrame->SetWallpaper( Wallpaper( aColor ) );
                 break;
             }
-        case HTML_O_SRC:
+        case HtmlOptionId::SRC:
             pFrame->SetURL(
                     INetURLObject::GetAbsURL(
                         rBaseURL, rOption.GetString()) );
             break;
-        case HTML_O_NAME:
+        case HtmlOptionId::NAME:
             pFrame->SetName( rOption.GetString() );
             break;
-        case HTML_O_MARGINWIDTH:
+        case HtmlOptionId::MARGINWIDTH:
             aMargin.Width() = rOption.GetNumber();
 
             if( !bMarginHeight )
                 aMargin.Height() = 0;
             bMarginWidth = true;
             break;
-        case HTML_O_MARGINHEIGHT:
+        case HtmlOptionId::MARGINHEIGHT:
             aMargin.Height() = rOption.GetNumber();
 
             if( !bMarginWidth )
                 aMargin.Width() = 0;
             bMarginHeight = true;
             break;
-        case HTML_O_SCROLLING:
+        case HtmlOptionId::SCROLLING:
             pFrame->SetScrollingMode( rOption.GetEnum( aScrollingTable, ScrollingMode::Auto ) );
             break;
-        case HTML_O_FRAMEBORDER:
+        case HtmlOptionId::FRAMEBORDER:
         {
             const OUString& aStr = rOption.GetString();
             bool bBorder = true;
@@ -105,7 +105,7 @@ void SfxFrameHTMLParser::ParseFrameOptions(
             pFrame->SetFrameBorder( bBorder );
             break;
         }
-        case HTML_O_NORESIZE:
+        case HtmlOptionId::NORESIZE:
             pFrame->SetResizable( false );
             break;
         default:
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index abf417eb5c09..406bd63c5d24 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -91,12 +91,8 @@ bool SfxHTMLParser::ParseMapOptions(
     for (size_t i = rOptions.size(); i; )
     {
         const HTMLOption& aOption = rOptions[--i];
-        switch( aOption.GetToken() )
-        {
-        case HTML_O_NAME:
+        if ( aOption.GetToken() == HtmlOptionId::NAME )
             aName = aOption.GetString();
-            break;
-        }
     }
 
     if( !aName.isEmpty() )
@@ -125,39 +121,39 @@ bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBase
         const HTMLOption& rOption = rOptions[--i];
         switch( rOption.GetToken() )
         {
-        case HTML_O_NAME:
+        case HtmlOptionId::NAME:
             aName = rOption.GetString();
             break;
-        case HTML_O_SHAPE:
+        case HtmlOptionId::SHAPE:
             rOption.GetEnum( nShape, aAreaShapeOptEnums );
             break;
-        case HTML_O_COORDS:
+        case HtmlOptionId::COORDS:
             rOption.GetNumbers( aCoords );
             break;
-        case HTML_O_HREF:
+        case HtmlOptionId::HREF:
             aHRef = INetURLObject::GetAbsURL( rBaseURL, rOption.GetString() );
             break;
-        case HTML_O_NOHREF:
+        case HtmlOptionId::NOHREF:
             bNoHRef = true;
             break;
-        case HTML_O_ALT:
+        case HtmlOptionId::ALT:
             aAlt = rOption.GetString();
             break;
-        case HTML_O_TARGET:
+        case HtmlOptionId::TARGET:
             aTarget = rOption.GetString();
             break;
 
-        case HTML_O_ONMOUSEOVER:
+        case HtmlOptionId::ONMOUSEOVER:
             eScrpType = JAVASCRIPT;
             SAL_FALLTHROUGH;
-        case HTML_O_SDONMOUSEOVER:
+        case HtmlOptionId::SDONMOUSEOVER:
             nEvent = nEventMouseOver;
             goto IMAPOBJ_SETEVENT;
 
-        case HTML_O_ONMOUSEOUT:
+        case HtmlOptionId::ONMOUSEOUT:
             eScrpType = JAVASCRIPT;
             SAL_FALLTHROUGH;
-        case HTML_O_SDONMOUSEOUT:
+        case HtmlOptionId::SDONMOUSEOUT:
             nEvent = nEventMouseOut;
             goto IMAPOBJ_SETEVENT;
 IMAPOBJ_SETEVENT:
@@ -171,6 +167,7 @@ IMAPOBJ_SETEVENT:
                 }
             }
             break;
+        default: break;
         }
     }