[Libreoffice-commits] core.git: dbaccess/source editeng/source include/svtools sc/source sfx2/source svtools/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Apr 21 07:21:16 UTC 2017
dbaccess/source/ui/misc/HtmlReader.cxx | 27 +-
editeng/source/editeng/eehtml.cxx | 37 +--
include/svtools/htmltokn.h | 317 +++++++++++++++----------------
include/svtools/parhtml.hxx | 9
sc/source/filter/html/htmlpars.cxx | 103 ++++------
sfx2/source/bastyp/frmhtml.cxx | 16 -
sfx2/source/bastyp/sfxhtml.cxx | 29 +-
svtools/source/svhtml/htmlkywd.cxx | 293 ++++++++++++++--------------
svtools/source/svhtml/htmlsupp.cxx | 9
svtools/source/svhtml/parhtml.cxx | 52 ++---
sw/source/filter/html/htmlcss1.cxx | 9
sw/source/filter/html/htmldrawreader.cxx | 29 +-
sw/source/filter/html/htmlfld.cxx | 17 -
sw/source/filter/html/htmlform.cxx | 147 +++++++-------
sw/source/filter/html/htmlgrin.cxx | 110 +++++-----
sw/source/filter/html/htmlnumreader.cxx | 36 +--
sw/source/filter/html/htmlplug.cxx | 131 ++++++------
sw/source/filter/html/htmlsect.cxx | 36 +--
sw/source/filter/html/htmltab.cxx | 122 ++++++-----
sw/source/filter/html/swhtml.cxx | 162 ++++++++-------
20 files changed, 863 insertions(+), 828 deletions(-)
New commits:
commit c48ad62924754025266f6ed3986beac44d1c2452
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Apr 20 15:47:57 2017 +0200
convert HTML_OPTION_IDS to scoped enum
Change-Id: Ia766dc58a571e5853005fd394283d7b53f02e4a6
Reviewed-on: https://gerrit.libreoffice.org/36748
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 62e3d8e04925..43c96c8aba4e 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -134,13 +134,9 @@ void OHTMLReader::NextToken( int nToken )
const HTMLOptions& rHtmlOptions = GetOptions();
for (const auto & rOption : rHtmlOptions)
{
- switch( rOption.GetToken() )
- {
- case HTML_O_WIDTH:
- { // percentage: of document width respectively outer cell
- m_nColumnWidth = GetWidthPixel( rOption );
- }
- break;
+ if( rOption.GetToken() == HtmlOptionId::WIDTH )
+ { // percentage: of document width respectively outer cell
+ m_nColumnWidth = GetWidthPixel( rOption );
}
}
}
@@ -292,15 +288,16 @@ void OHTMLReader::fetchOptions()
{
switch( rOption.GetToken() )
{
- case HTML_O_SDVAL:
+ case HtmlOptionId::SDVAL:
{
m_sValToken = rOption.GetString();
m_bSDNum = true;
}
break;
- case HTML_O_SDNUM:
+ case HtmlOptionId::SDNUM:
m_sNumToken = rOption.GetString();
break;
+ default: break;
}
}
}
@@ -312,7 +309,7 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
{
switch( rOption.GetToken() )
{
- case HTML_O_ALIGN:
+ case HtmlOptionId::ALIGN:
{
const OUString& rOptVal = rOption.GetString();
if (rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_right ))
@@ -325,9 +322,10 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
eVal = SvxCellHorJustify::Standard;
}
break;
- case HTML_O_WIDTH:
+ case HtmlOptionId::WIDTH:
m_nWidth = GetWidthPixel( rOption );
break;
+ default: break;
}
}
}
@@ -339,14 +337,14 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
{
switch( rOption.GetToken() )
{
- case HTML_O_COLOR:
+ case HtmlOptionId::COLOR:
{
Color aColor;
rOption.GetColor( aColor );
_rTextColor = aColor.GetRGBColor();
}
break;
- case HTML_O_FACE :
+ case HtmlOptionId::FACE :
{
const OUString& rFace = rOption.GetString();
OUString aFontName;
@@ -364,7 +362,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
_rFont.Name = aFontName;
}
break;
- case HTML_O_SIZE :
+ case HtmlOptionId::SIZE :
{
sal_Int16 nSize = (sal_Int16) rOption.GetNumber();
if ( nSize == 0 )
@@ -375,6 +373,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
_rFont.Height = nSize;
}
break;
+ default: break;
}
}
}
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index ca0d8a3d8b9a..46ead623654c 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -113,12 +113,12 @@ void EditHTMLParser::NextToken( int nToken )
const HTMLOption& aOption = aOptions[i];
switch( aOption.GetToken() )
{
- case HTML_O_HTTPEQUIV:
+ case HtmlOptionId::HTTPEQUIV:
{
bEquiv = true;
}
break;
- case HTML_O_CONTENT:
+ case HtmlOptionId::CONTENT:
{
if ( bEquiv )
{
@@ -128,6 +128,7 @@ void EditHTMLParser::NextToken( int nToken )
}
}
break;
+ default: break;
}
}
@@ -700,21 +701,17 @@ void EditHTMLParser::StartPara( bool bReal )
SvxAdjust eAdjust = SvxAdjust::Left;
for (const auto & aOption : aOptions)
{
- switch( aOption.GetToken() )
+ if( aOption.GetToken() == HtmlOptionId::ALIGN )
{
- case HTML_O_ALIGN:
- {
- OUString const& rTmp(aOption.GetString());
- if (rTmp.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_AL_right))
- eAdjust = SvxAdjust::Right;
- else if (rTmp.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_AL_middle))
- eAdjust = SvxAdjust::Center;
- else if (rTmp.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_AL_center))
- eAdjust = SvxAdjust::Center;
- else
- eAdjust = SvxAdjust::Left;
- }
- break;
+ OUString const& rTmp(aOption.GetString());
+ if (rTmp.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_AL_right))
+ eAdjust = SvxAdjust::Right;
+ else if (rTmp.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_AL_middle))
+ eAdjust = SvxAdjust::Center;
+ else if (rTmp.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_AL_center))
+ eAdjust = SvxAdjust::Center;
+ else
+ eAdjust = SvxAdjust::Left;
}
}
SfxItemSet aItemSet = mpEditEngine->GetEmptyItemSet();
@@ -758,12 +755,8 @@ void EditHTMLParser::AnchorStart()
for (const auto & aOption : aOptions)
{
- switch( aOption.GetToken() )
- {
- case HTML_O_HREF:
- aRef = aOption.GetString();
- break;
- }
+ if( aOption.GetToken() == HtmlOptionId::HREF)
+ aRef = aOption.GetString();
}
if ( !aRef.isEmpty() )
diff --git a/include/svtools/htmltokn.h b/include/svtools/htmltokn.h
index c3c0489732b0..8673d466c155 100644
--- a/include/svtools/htmltokn.h
+++ b/include/svtools/htmltokn.h
@@ -26,6 +26,7 @@
namespace rtl {
class OUString;
};
+enum class HtmlOptionId;
// search the char for the CharName
sal_Unicode GetHTMLCharName( const rtl::OUString& rName );
@@ -34,7 +35,7 @@ sal_Unicode GetHTMLCharName( const rtl::OUString& rName );
SVT_DLLPUBLIC int GetHTMLToken( const rtl::OUString& rName );
// search the TokenId for an attribute token
-int GetHTMLOption( const rtl::OUString& rName );
+HtmlOptionId GetHTMLOption( const rtl::OUString& rName );
// search the 24-bit color for a color name (not found = ULONG_MAX)
SVT_DLLPUBLIC sal_uInt32 GetHTMLColor( const rtl::OUString& rName );
@@ -278,185 +279,183 @@ enum HTML_TOKEN_IDS
// HTML attribute token (=Options)
-// always starting from 256 on, greater than a char
-const int HTML_OPTION_START = 0x100;
-
-enum HTML_OPTION_IDS
+enum class HtmlOptionId
{
-HTML_OPTION_BOOL_START = HTML_OPTION_START,
+// always starting from 256 on, greater than a char
+BOOL_START = 0x100,
// attributes without value
- HTML_O_CHECKED = HTML_OPTION_BOOL_START,
- HTML_O_COMPACT,
- HTML_O_DECLARE, // IExplorer 3.0b5
- HTML_O_DISABLED,
- HTML_O_ISMAP,
- HTML_O_MAYSCRIPT, // Netscape 3.0
- HTML_O_MULTIPLE,
- HTML_O_NOHREF, // Netscape
- HTML_O_NORESIZE, // Netscape 2.0
- HTML_O_NOSHADE, // Netscape
- HTML_O_NOWRAP,
- HTML_O_SDFIXED,
- HTML_O_SELECTED,
-HTML_OPTION_BOOL_END,
+ CHECKED = BOOL_START,
+ COMPACT,
+ DECLARE, // IExplorer 3.0b5
+ DISABLED,
+ ISMAP,
+ MAYSCRIPT, // Netscape 3.0
+ MULTIPLE,
+ NOHREF, // Netscape
+ NORESIZE, // Netscape 2.0
+ NOSHADE, // Netscape
+ NOWRAP,
+ SDFIXED,
+ SELECTED,
+BOOL_END,
// attributes with a string as value
-HTML_OPTION_STRING_START = HTML_OPTION_BOOL_END,
- HTML_O_ACCEPT = HTML_OPTION_STRING_START,
- HTML_O_ACCESSKEY,
- HTML_O_ALT,
- HTML_O_AXIS,
- HTML_O_CHAR, // HTML3 Table Model Draft
- HTML_O_CHARSET,
- HTML_O_CLASS,
- HTML_O_CODE, // HotJava
- HTML_O_CODETYPE,
- HTML_O_CONTENT,
- HTML_O_COORDS, // Netscape 2.0
- HTML_O_ENCTYPE,
- HTML_O_FACE, // IExplorer 2.0
- HTML_O_FRAMEBORDER, // IExplorer 3.0
- HTML_O_HTTPEQUIV,
- HTML_O_LANGUAGE, // JavaScript
- HTML_O_NAME,
- HTML_O_PROMPT,
- HTML_O_SHAPE,
- HTML_O_STANDBY,
- HTML_O_STYLE, // Style Sheets
- HTML_O_TITLE,
- HTML_O_VALUE,
- HTML_O_SDVAL, // StarDiv NumberValue
- HTML_O_SDNUM, // StarDiv NumberFormat
- HTML_O_SDLIBRARY,
- HTML_O_SDMODULE,
-HTML_OPTION_STRING_END,
+STRING_START = BOOL_END,
+ ACCEPT = STRING_START,
+ ACCESSKEY,
+ ALT,
+ AXIS,
+ CHAR, // HTML3 Table Model Draft
+ CHARSET,
+ CLASS,
+ CODE, // HotJava
+ CODETYPE,
+ CONTENT,
+ COORDS, // Netscape 2.0
+ ENCTYPE,
+ FACE, // IExplorer 2.0
+ FRAMEBORDER, // IExplorer 3.0
+ HTTPEQUIV,
+ LANGUAGE, // JavaScript
+ NAME,
+ PROMPT,
+ SHAPE,
+ STANDBY,
+ STYLE, // Style Sheets
+ TITLE,
+ VALUE,
+ SDVAL, // StarDiv NumberValue
+ SDNUM, // StarDiv NumberFormat
+ SDLIBRARY,
+ SDMODULE,
+STRING_END,
// attributes with an SGML identifier as value
-HTML_OPTION_SGMLID_START = HTML_OPTION_STRING_END,
- HTML_O_ID = HTML_OPTION_SGMLID_START,
- HTML_O_TARGET, // Netscape 2.0
- HTML_O_TO,
-HTML_OPTION_SGMLID_END,
+SGMLID_START = STRING_END,
+ ID = SGMLID_START,
+ TARGET, // Netscape 2.0
+ TO,
+SGMLID_END,
// attributes with a URI as value
-HTML_OPTION_URI_START = HTML_OPTION_SGMLID_END,
- HTML_O_ACTION = HTML_OPTION_URI_START,
- HTML_O_ARCHIVE,
- HTML_O_BACKGROUND,
- HTML_O_CLASSID,
- HTML_O_CODEBASE, // HotJava
- HTML_O_DATA,
- HTML_O_HREF,
- HTML_O_SCRIPT,
- HTML_O_SRC,
- HTML_O_USEMAP, // Netscape 2.0
-HTML_OPTION_URI_END,
+URI_START = SGMLID_END,
+ ACTION = URI_START,
+ ARCHIVE,
+ BACKGROUND,
+ CLASSID,
+ CODEBASE, // HotJava
+ DATA,
+ HREF,
+ SCRIPT,
+ SRC,
+ USEMAP, // Netscape 2.0
+URI_END,
// attributes with a color as value (all Netscape)
-HTML_OPTION_COLOR_START = HTML_OPTION_URI_END,
- HTML_O_ALINK = HTML_OPTION_COLOR_START,
- HTML_O_BGCOLOR,
- HTML_O_BORDERCOLOR, // IExplorer 2.0
- HTML_O_BORDERCOLORLIGHT, // IExplorer 2.0
- HTML_O_BORDERCOLORDARK, // IExplorer 2.0
- HTML_O_COLOR,
- HTML_O_LINK,
- HTML_O_TEXT,
- HTML_O_VLINK,
-HTML_OPTION_COLOR_END,
+COLOR_START = URI_END,
+ ALINK = COLOR_START,
+ BGCOLOR,
+ BORDERCOLOR, // IExplorer 2.0
+ BORDERCOLORLIGHT, // IExplorer 2.0
+ BORDERCOLORDARK, // IExplorer 2.0
+ COLOR,
+ LINK,
+ TEXT,
+ VLINK,
+COLOR_END,
// attributes with a numeric value
-HTML_OPTION_NUMBER_START = HTML_OPTION_COLOR_END,
- HTML_O_BORDER = HTML_OPTION_NUMBER_START,
- HTML_O_CELLSPACING, // HTML3 Table Model Draft
- HTML_O_CELLPADDING, // HTML3 Table Model Draft
- HTML_O_CHAROFF, // HTML3 Table Model Draft
- HTML_O_COLSPAN,
- HTML_O_FRAMESPACING, // IExplorer 3.0
- HTML_O_GUTTER, // Netscape 3.0b5
- HTML_O_HEIGHT,
- HTML_O_HSPACE, // Netscape
- HTML_O_LEFT,
- HTML_O_LOOP, // IExplorer 2.0
- HTML_O_MARGINWIDTH, // Netscape 2.0
- HTML_O_MARGINHEIGHT, // Netscape 2.0
- HTML_O_MAXLENGTH,
- HTML_O_ROWSPAN,
- HTML_O_SCROLLAMOUNT, // IExplorer 2.0
- HTML_O_SCROLLDELAY, // IExplorer 2.0
- HTML_O_SPAN, // HTML3 Table Model Draft
- HTML_O_TABINDEX,
- HTML_O_VSPACE, // Netscape
- HTML_O_WIDTH,
- HTML_O_ZINDEX,
-HTML_OPTION_NUMBER_END,
+NUMBER_START = COLOR_END,
+ BORDER = NUMBER_START,
+ CELLSPACING, // HTML3 Table Model Draft
+ CELLPADDING, // HTML3 Table Model Draft
+ CHAROFF, // HTML3 Table Model Draft
+ COLSPAN,
+ FRAMESPACING, // IExplorer 3.0
+ GUTTER, // Netscape 3.0b5
+ HEIGHT,
+ HSPACE, // Netscape
+ LEFT,
+ LOOP, // IExplorer 2.0
+ MARGINWIDTH, // Netscape 2.0
+ MARGINHEIGHT, // Netscape 2.0
+ MAXLENGTH,
+ ROWSPAN,
+ SCROLLAMOUNT, // IExplorer 2.0
+ SCROLLDELAY, // IExplorer 2.0
+ SPAN, // HTML3 Table Model Draft
+ TABINDEX,
+ VSPACE, // Netscape
+ WIDTH,
+ ZINDEX,
+NUMBER_END,
// attributes with Enum values
-HTML_OPTION_ENUM_START = HTML_OPTION_NUMBER_END,
- HTML_O_BEHAVIOR = HTML_OPTION_ENUM_START, // IExplorer 2.0
- HTML_O_CLEAR,
- HTML_O_DIR,
- HTML_O_DIRECTION, // IExplorer 2.0
- HTML_O_FORMAT,
- HTML_O_FRAME, // HTML3 Table Model Draft
- HTML_O_LANG,
- HTML_O_METHOD,
- HTML_O_REL,
- HTML_O_REV,
- HTML_O_RULES, // HTML3 Table Model Draft
- HTML_O_SCROLLING, // Netscape 2.0
- HTML_O_SDREADONLY,
- HTML_O_SUBTYPE,
- HTML_O_TYPE,
- HTML_O_VALIGN,
- HTML_O_VALUETYPE,
- HTML_O_WRAP,
-HTML_OPTION_ENUM_END,
+ENUM_START = NUMBER_END,
+ BEHAVIOR = ENUM_START, // IExplorer 2.0
+ CLEAR,
+ DIR,
+ DIRECTION, // IExplorer 2.0
+ FORMAT,
+ FRAME, // HTML3 Table Model Draft
+ LANG,
+ METHOD,
+ REL,
+ REV,
+ RULES, // HTML3 Table Model Draft
+ SCROLLING, // Netscape 2.0
+ SDREADONLY,
+ SUBTYPE,
+ TYPE,
+ VALIGN,
+ VALUETYPE,
+ WRAP,
+ENUM_END,
// attributes with script code as value
-HTML_OPTION_SCRIPT_START = HTML_OPTION_ENUM_END,
- HTML_O_ONABORT = HTML_OPTION_SCRIPT_START, // JavaScript
- HTML_O_ONBLUR, // JavaScript
- HTML_O_ONCHANGE, // JavaScript
- HTML_O_ONCLICK, // JavaScript
- HTML_O_ONERROR, // JavaScript
- HTML_O_ONFOCUS, // JavaScript
- HTML_O_ONLOAD, // JavaScript
- HTML_O_ONMOUSEOUT, // JavaScript
- HTML_O_ONMOUSEOVER, // JavaScript
- HTML_O_ONRESET, // JavaScript
- HTML_O_ONSELECT, // JavaScript
- HTML_O_ONSUBMIT, // JavaScript
- HTML_O_ONUNLOAD, // JavaScript
-
- HTML_O_SDONABORT, // StarBasic
- HTML_O_SDONBLUR, // StarBasic
- HTML_O_SDONCHANGE, // StarBasic
- HTML_O_SDONCLICK, // StarBasic
- HTML_O_SDONERROR, // StarBasic
- HTML_O_SDONFOCUS, // StarBasic
- HTML_O_SDONLOAD, // StarBasic
- HTML_O_SDONMOUSEOUT, // StarBasic
- HTML_O_SDONMOUSEOVER, // StarBasic
- HTML_O_SDONRESET, // StarBasic
- HTML_O_SDONSELECT, // StarBasic
- HTML_O_SDONSUBMIT, // StarBasic
- HTML_O_SDONUNLOAD, // StarBasic
-HTML_OPTION_SCRIPT_END,
+SCRIPT_START = ENUM_END,
+ ONABORT = SCRIPT_START, // JavaScript
+ ONBLUR, // JavaScript
+ ONCHANGE, // JavaScript
+ ONCLICK, // JavaScript
+ ONERROR, // JavaScript
+ ONFOCUS, // JavaScript
+ ONLOAD, // JavaScript
+ ONMOUSEOUT, // JavaScript
+ ONMOUSEOVER, // JavaScript
+ ONRESET, // JavaScript
+ ONSELECT, // JavaScript
+ ONSUBMIT, // JavaScript
+ ONUNLOAD, // JavaScript
+
+ SDONABORT, // StarBasic
+ SDONBLUR, // StarBasic
+ SDONCHANGE, // StarBasic
+ SDONCLICK, // StarBasic
+ SDONERROR, // StarBasic
+ SDONFOCUS, // StarBasic
+ SDONLOAD, // StarBasic
+ SDONMOUSEOUT, // StarBasic
+ SDONMOUSEOVER, // StarBasic
+ SDONRESET, // StarBasic
+ SDONSELECT, // StarBasic
+ SDONSUBMIT, // StarBasic
+ SDONUNLOAD, // StarBasic
+SCRIPT_END,
// attributes with context dependent values
-HTML_OPTION_CONTEXT_START = HTML_OPTION_SCRIPT_END,
- HTML_O_ALIGN = HTML_OPTION_CONTEXT_START,
- HTML_O_COLS, // Netscape 2.0 vs HTML 2.0
- HTML_O_ROWS, // Netscape 2.0 vs HTML 2.0
- HTML_O_SIZE,
- HTML_O_START,
-HTML_OPTION_CONTEXT_END,
+CONTEXT_START = SCRIPT_END,
+ ALIGN = CONTEXT_START,
+ COLS, // Netscape 2.0 vs HTML 2.0
+ ROWS, // Netscape 2.0 vs HTML 2.0
+ SIZE,
+ START,
+CONTEXT_END,
// an unknown option
-HTML_O_UNKNOWN = HTML_OPTION_CONTEXT_END,
-HTML_OPTION_END
+UNKNOWN = CONTEXT_END,
+END
};
#endif // INCLUDED_SVTOOLS_HTMLTOKN_H
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index ddb65c2abd7c..b6e7260b235c 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -34,6 +34,7 @@ namespace com { namespace sun { namespace star {
class Color;
class SvNumberFormatter;
class SvKeyValueIterator;
+enum class HtmlOptionId;
#define HTMLFONTSZ1_DFLT 7
#define HTMLFONTSZ2_DFLT 10
@@ -86,14 +87,14 @@ class SVT_DLLPUBLIC HTMLOption
{
OUString aValue; // value of the option (always as string)
OUString aToken; // name of the option as string
- sal_uInt16 nToken; // and respective token
+ HtmlOptionId nToken; // and respective token
public:
- HTMLOption( sal_uInt16 nTyp, const OUString& rToken, const OUString& rValue );
+ HTMLOption( HtmlOptionId nTyp, const OUString& rToken, const OUString& rValue );
// name of the option...
- sal_uInt16 GetToken() const { return nToken; } // ... as enum
+ HtmlOptionId GetToken() const { return nToken; } // ... as enum
const OUString& GetTokenString() const { return aToken; } // ... as string
// value of the option ...
@@ -226,7 +227,7 @@ public:
// Determine the options. pNoConvertToken is the optional token
// of an option, for which the CR/LFs are not deleted from the value
// of the option.
- const HTMLOptions& GetOptions( sal_uInt16 *pNoConvertToken=nullptr );
+ const HTMLOptions& GetOptions( HtmlOptionId *pNoConvertToken=nullptr );
// for asynchronous reading from the SvStream
virtual void Continue( int nToken ) override;
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 26a6bec4cae3..6f7dbde9bea3 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -954,17 +954,17 @@ void ScHTMLLayoutParser::TableDataOn( HtmlImportInfo* pInfo )
{
switch( rOption.GetToken() )
{
- case HTML_O_COLSPAN:
+ case HtmlOptionId::COLSPAN:
{
pActEntry->nColOverlap = ( SCCOL ) rOption.GetString().toInt32();
}
break;
- case HTML_O_ROWSPAN:
+ case HtmlOptionId::ROWSPAN:
{
pActEntry->nRowOverlap = ( SCROW ) rOption.GetString().toInt32();
}
break;
- case HTML_O_ALIGN:
+ case HtmlOptionId::ALIGN:
{
bHorJustifyCenterTH = false;
SvxCellHorJustify eVal;
@@ -981,7 +981,7 @@ void ScHTMLLayoutParser::TableDataOn( HtmlImportInfo* pInfo )
pActEntry->aItemSet.Put( SvxHorJustifyItem( eVal, ATTR_HOR_JUSTIFY) );
}
break;
- case HTML_O_VALIGN:
+ case HtmlOptionId::VALIGN:
{
SvxCellVerJustify eVal;
const OUString& rOptVal = rOption.GetString();
@@ -996,12 +996,12 @@ void ScHTMLLayoutParser::TableDataOn( HtmlImportInfo* pInfo )
pActEntry->aItemSet.Put( SvxVerJustifyItem( eVal, ATTR_VER_JUSTIFY) );
}
break;
- case HTML_O_WIDTH:
+ case HtmlOptionId::WIDTH:
{
pActEntry->nWidth = GetWidthPixel( rOption );
}
break;
- case HTML_O_BGCOLOR:
+ case HtmlOptionId::BGCOLOR:
{
Color aColor;
rOption.GetColor( aColor );
@@ -1009,16 +1009,17 @@ void ScHTMLLayoutParser::TableDataOn( HtmlImportInfo* pInfo )
SvxBrushItem( aColor, ATTR_BACKGROUND ) );
}
break;
- case HTML_O_SDVAL:
+ case HtmlOptionId::SDVAL:
{
pActEntry->pValStr = new OUString( rOption.GetString() );
}
break;
- case HTML_O_SDNUM:
+ case HtmlOptionId::SDNUM:
{
pActEntry->pNumStr = new OUString( rOption.GetString() );
}
break;
+ default: break;
}
}
pActEntry->nCol = nColCnt;
@@ -1075,17 +1076,18 @@ void ScHTMLLayoutParser::TableOn( HtmlImportInfo* pInfo )
{
switch( rOption.GetToken() )
{
- case HTML_O_WIDTH:
+ case HtmlOptionId::WIDTH:
{ // Percent: of document width or outer cell
nTableWidth = GetWidthPixel( rOption );
}
break;
- case HTML_O_BORDER:
+ case HtmlOptionId::BORDER:
// Border is: ((pOption->GetString().Len() == 0) || (pOption->GetNumber() != 0));
break;
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aTabName = rOption.GetString();
break;
+ default: break;
}
}
}
@@ -1134,17 +1136,18 @@ void ScHTMLLayoutParser::TableOn( HtmlImportInfo* pInfo )
{
switch( rOption.GetToken() )
{
- case HTML_O_WIDTH:
+ case HtmlOptionId::WIDTH:
{ // Percent: of document width or outer cell
nTableWidth = GetWidthPixel( rOption );
}
break;
- case HTML_O_BORDER:
+ case HtmlOptionId::BORDER:
//BorderOn is: ((pOption->GetString().Len() == 0) || (pOption->GetNumber() != 0));
break;
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aTabName = rOption.GetString();
break;
+ default: break;
}
}
}
@@ -1325,12 +1328,12 @@ void ScHTMLLayoutParser::Image( HtmlImportInfo* pInfo )
{
switch( rOption.GetToken() )
{
- case HTML_O_SRC:
+ case HtmlOptionId::SRC:
{
pImage->aURL = INetURLObject::GetAbsURL( aBaseURL, rOption.GetString() );
}
break;
- case HTML_O_ALT:
+ case HtmlOptionId::ALT:
{
if ( !pActEntry->bHasGraphic )
{ // ALT text only if not any image loaded
@@ -1341,26 +1344,27 @@ void ScHTMLLayoutParser::Image( HtmlImportInfo* pInfo )
}
}
break;
- case HTML_O_WIDTH:
+ case HtmlOptionId::WIDTH:
{
pImage->aSize.Width() = (long)rOption.GetNumber();
}
break;
- case HTML_O_HEIGHT:
+ case HtmlOptionId::HEIGHT:
{
pImage->aSize.Height() = (long)rOption.GetNumber();
}
break;
- case HTML_O_HSPACE:
+ case HtmlOptionId::HSPACE:
{
pImage->aSpace.X() = (long)rOption.GetNumber();
}
break;
- case HTML_O_VSPACE:
+ case HtmlOptionId::VSPACE:
{
pImage->aSpace.Y() = (long)rOption.GetNumber();
}
break;
+ default: break;
}
}
if (pImage->aURL.isEmpty())
@@ -1413,15 +1417,11 @@ void ScHTMLLayoutParser::ColOn( HtmlImportInfo* pInfo )
const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions();
for (const auto & rOption : rOptions)
{
- switch( rOption.GetToken() )
+ if( rOption.GetToken() == HtmlOptionId::WIDTH )
{
- case HTML_O_WIDTH:
- {
- sal_uInt16 nVal = GetWidthPixel( rOption );
- MakeCol( pLocalColOffset, nColOffset, nVal, 0, 0 );
- nColOffset = nColOffset + nVal;
- }
- break;
+ sal_uInt16 nVal = GetWidthPixel( rOption );
+ MakeCol( pLocalColOffset, nColOffset, nVal, 0, 0 );
+ nColOffset = nColOffset + nVal;
}
}
}
@@ -1451,14 +1451,8 @@ void ScHTMLLayoutParser::AnchorOn( HtmlImportInfo* pInfo )
const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions();
for (const auto & rOption : rOptions)
{
- switch( rOption.GetToken() )
- {
- case HTML_O_NAME:
- {
- pActEntry->pName = new OUString(rOption.GetString());
- }
- break;
- }
+ if( rOption.GetToken() == HtmlOptionId::NAME )
+ pActEntry->pName = new OUString(rOption.GetString());
}
}
@@ -1479,7 +1473,7 @@ void ScHTMLLayoutParser::FontOn( HtmlImportInfo* pInfo )
{
switch( rOption.GetToken() )
{
- case HTML_O_FACE :
+ case HtmlOptionId::FACE :
{
const OUString& rFace = rOption.GetString();
OUString aFontName;
@@ -1500,7 +1494,7 @@ void ScHTMLLayoutParser::FontOn( HtmlImportInfo* pInfo )
RTL_TEXTENCODING_DONTKNOW, ATTR_FONT ) );
}
break;
- case HTML_O_SIZE :
+ case HtmlOptionId::SIZE :
{
sal_uInt16 nSize = (sal_uInt16) rOption.GetNumber();
if ( nSize == 0 )
@@ -1511,13 +1505,14 @@ void ScHTMLLayoutParser::FontOn( HtmlImportInfo* pInfo )
maFontHeights[nSize-1], 100, ATTR_FONT_HEIGHT ) );
}
break;
- case HTML_O_COLOR :
+ case HtmlOptionId::COLOR :
{
Color aColor;
rOption.GetColor( aColor );
pActEntry->aItemSet.Put( SvxColorItem( aColor, ATTR_FONT_COLOR ) );
}
break;
+ default: break;
}
}
}
@@ -1899,12 +1894,13 @@ ScHTMLTable::ScHTMLTable( ScHTMLTable& rParentTable, const HtmlImportInfo& rInfo
{
switch( itr->GetToken() )
{
- case HTML_O_BORDER:
+ case HtmlOptionId::BORDER:
mbBorderOn = itr->GetString().isEmpty() || (itr->GetNumber() != 0);
break;
- case HTML_O_ID:
+ case HtmlOptionId::ID:
maTableName = itr->GetString();
break;
+ default: break;
}
}
}
@@ -2123,19 +2119,19 @@ void ScHTMLTable::DataOn( const HtmlImportInfo& rInfo )
{
switch (itr->GetToken())
{
- case HTML_O_COLSPAN:
+ case HtmlOptionId::COLSPAN:
aSpanSize.mnCols = static_cast<SCCOL>( getLimitedValue<sal_Int32>( itr->GetString().toInt32(), 1, 256 ) );
break;
- case HTML_O_ROWSPAN:
+ case HtmlOptionId::ROWSPAN:
aSpanSize.mnRows = static_cast<SCROW>( getLimitedValue<sal_Int32>( itr->GetString().toInt32(), 1, 256 ) );
break;
- case HTML_O_SDVAL:
+ case HtmlOptionId::SDVAL:
pValStr.reset(new OUString(itr->GetString()));
break;
- case HTML_O_SDNUM:
+ case HtmlOptionId::SDNUM:
pNumStr.reset(new OUString(itr->GetString()));
break;
- case HTML_O_CLASS:
+ case HtmlOptionId::CLASS:
{
// Pick up the number format associated with this class (if
// any).
@@ -2160,6 +2156,7 @@ void ScHTMLTable::DataOn( const HtmlImportInfo& rInfo )
}
}
break;
+ default: break;
}
}
@@ -2545,7 +2542,7 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const HtmlImportIn
{
switch( itr->GetToken() )
{
- case HTML_O_ALIGN:
+ case HtmlOptionId::ALIGN:
{
SvxCellHorJustify eVal = SvxCellHorJustify::Standard;
const OUString& rOptVal = itr->GetString();
@@ -2560,7 +2557,7 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const HtmlImportIn
}
break;
- case HTML_O_VALIGN:
+ case HtmlOptionId::VALIGN:
{
SvxCellVerJustify eVal = SVX_VER_JUSTIFY_STANDARD;
const OUString& rOptVal = itr->GetString();
@@ -2575,13 +2572,14 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const HtmlImportIn
}
break;
- case HTML_O_BGCOLOR:
+ case HtmlOptionId::BGCOLOR:
{
Color aColor;
itr->GetColor( aColor );
rItemSet.Put( SvxBrushItem( aColor, ATTR_BACKGROUND ) );
}
break;
+ default: break;
}
}
}
@@ -2969,7 +2967,7 @@ void ScHTMLQueryParser::FontOn( const HtmlImportInfo& rInfo )
{
switch( itr->GetToken() )
{
- case HTML_O_FACE :
+ case HtmlOptionId::FACE :
{
const OUString& rFace = itr->GetString();
OUString aFontName;
@@ -2986,19 +2984,20 @@ void ScHTMLQueryParser::FontOn( const HtmlImportInfo& rInfo )
RTL_TEXTENCODING_DONTKNOW, ATTR_FONT ) );
}
break;
- case HTML_O_SIZE :
+ case HtmlOptionId::SIZE :
{
sal_uInt32 nSize = getLimitedValue< sal_uInt32 >( itr->GetNumber(), 1, SC_HTML_FONTSIZES );
mpCurrTable->PutItem( SvxFontHeightItem( maFontHeights[ nSize - 1 ], 100, ATTR_FONT_HEIGHT ) );
}
break;
- case HTML_O_COLOR :
+ case HtmlOptionId::COLOR :
{
Color aColor;
itr->GetColor( aColor );
mpCurrTable->PutItem( SvxColorItem( aColor, ATTR_FONT_COLOR ) );
}
break;
+ default: break;
}
}
}
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;
}
}
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index 2cc0a9ebe7c9..599a3c205586 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -553,173 +553,182 @@ sal_Unicode GetHTMLCharName( const OUString& rName )
// Flag: Options table has already been sorted
static bool bSortOptionKeyWords = false;
-static HTML_TokenEntry aHTMLOptionTab[] = {
+struct HTML_OptionEntry
+{
+ union
+ {
+ const sal_Char *sToken;
+ const OUString *pUToken;
+ };
+ HtmlOptionId nToken;
+};
+static HTML_OptionEntry aHTMLOptionTab[] = {
// Attributes without value
- {{OOO_STRING_SVTOOLS_HTML_O_checked}, HTML_O_CHECKED},
- {{OOO_STRING_SVTOOLS_HTML_O_compact}, HTML_O_COMPACT},
- {{OOO_STRING_SVTOOLS_HTML_O_declare}, HTML_O_DECLARE},
- {{OOO_STRING_SVTOOLS_HTML_O_disabled}, HTML_O_DISABLED},
- {{OOO_STRING_SVTOOLS_HTML_O_ismap}, HTML_O_ISMAP},
- {{OOO_STRING_SVTOOLS_HTML_O_mayscript}, HTML_O_MAYSCRIPT},
- {{OOO_STRING_SVTOOLS_HTML_O_multiple}, HTML_O_MULTIPLE},
- {{OOO_STRING_SVTOOLS_HTML_O_nohref}, HTML_O_NOHREF}, // Netscape 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_noresize}, HTML_O_NORESIZE}, // Netscape 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_noshade}, HTML_O_NOSHADE}, // Netscape 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_nowrap}, HTML_O_NOWRAP},
- {{OOO_STRING_SVTOOLS_HTML_O_sdfixed}, HTML_O_SDFIXED},
- {{OOO_STRING_SVTOOLS_HTML_O_selected}, HTML_O_SELECTED},
+ {{OOO_STRING_SVTOOLS_HTML_O_checked}, HtmlOptionId::CHECKED},
+ {{OOO_STRING_SVTOOLS_HTML_O_compact}, HtmlOptionId::COMPACT},
+ {{OOO_STRING_SVTOOLS_HTML_O_declare}, HtmlOptionId::DECLARE},
+ {{OOO_STRING_SVTOOLS_HTML_O_disabled}, HtmlOptionId::DISABLED},
+ {{OOO_STRING_SVTOOLS_HTML_O_ismap}, HtmlOptionId::ISMAP},
+ {{OOO_STRING_SVTOOLS_HTML_O_mayscript}, HtmlOptionId::MAYSCRIPT},
+ {{OOO_STRING_SVTOOLS_HTML_O_multiple}, HtmlOptionId::MULTIPLE},
+ {{OOO_STRING_SVTOOLS_HTML_O_nohref}, HtmlOptionId::NOHREF}, // Netscape 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_noresize}, HtmlOptionId::NORESIZE}, // Netscape 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_noshade}, HtmlOptionId::NOSHADE}, // Netscape 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_nowrap}, HtmlOptionId::NOWRAP},
+ {{OOO_STRING_SVTOOLS_HTML_O_sdfixed}, HtmlOptionId::SDFIXED},
+ {{OOO_STRING_SVTOOLS_HTML_O_selected}, HtmlOptionId::SELECTED},
// Attributes with a string value
- {{OOO_STRING_SVTOOLS_HTML_O_accept}, HTML_O_ACCEPT},
- {{OOO_STRING_SVTOOLS_HTML_O_accesskey}, HTML_O_ACCESSKEY},
- {{OOO_STRING_SVTOOLS_HTML_O_alt}, HTML_O_ALT},
- {{OOO_STRING_SVTOOLS_HTML_O_axis}, HTML_O_AXIS},
- {{OOO_STRING_SVTOOLS_HTML_O_char}, HTML_O_CHAR}, // HTML 3 Table Model Draft
- {{OOO_STRING_SVTOOLS_HTML_O_charset}, HTML_O_CHARSET},
- {{OOO_STRING_SVTOOLS_HTML_O_class}, HTML_O_CLASS},
- {{OOO_STRING_SVTOOLS_HTML_O_code}, HTML_O_CODE}, // HotJava
- {{OOO_STRING_SVTOOLS_HTML_O_codetype}, HTML_O_CODETYPE},
- {{OOO_STRING_SVTOOLS_HTML_O_content}, HTML_O_CONTENT},
- {{OOO_STRING_SVTOOLS_HTML_O_coords}, HTML_O_COORDS}, // Netscape 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_enctype}, HTML_O_ENCTYPE},
- {{OOO_STRING_SVTOOLS_HTML_O_face}, HTML_O_FACE}, // IExplorer 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_frameborder}, HTML_O_FRAMEBORDER}, // IExplorer 3.0
- {{OOO_STRING_SVTOOLS_HTML_O_httpequiv}, HTML_O_HTTPEQUIV},
- {{OOO_STRING_SVTOOLS_HTML_O_language}, HTML_O_LANGUAGE}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_name}, HTML_O_NAME},
- {{OOO_STRING_SVTOOLS_HTML_O_prompt}, HTML_O_PROMPT},
- {{OOO_STRING_SVTOOLS_HTML_O_shape}, HTML_O_SHAPE},
- {{OOO_STRING_SVTOOLS_HTML_O_standby}, HTML_O_STANDBY},
- {{OOO_STRING_SVTOOLS_HTML_O_style}, HTML_O_STYLE},
- {{OOO_STRING_SVTOOLS_HTML_O_title}, HTML_O_TITLE},
- {{OOO_STRING_SVTOOLS_HTML_O_value}, HTML_O_VALUE},
- {{OOO_STRING_SVTOOLS_HTML_O_SDval}, HTML_O_SDVAL}, // StarDiv NumberValue
- {{OOO_STRING_SVTOOLS_HTML_O_SDnum}, HTML_O_SDNUM}, // StarDiv NumberFormat
- {{OOO_STRING_SVTOOLS_HTML_O_sdlibrary}, HTML_O_SDLIBRARY},
- {{OOO_STRING_SVTOOLS_HTML_O_sdmodule}, HTML_O_SDMODULE},
+ {{OOO_STRING_SVTOOLS_HTML_O_accept}, HtmlOptionId::ACCEPT},
+ {{OOO_STRING_SVTOOLS_HTML_O_accesskey}, HtmlOptionId::ACCESSKEY},
+ {{OOO_STRING_SVTOOLS_HTML_O_alt}, HtmlOptionId::ALT},
+ {{OOO_STRING_SVTOOLS_HTML_O_axis}, HtmlOptionId::AXIS},
+ {{OOO_STRING_SVTOOLS_HTML_O_char}, HtmlOptionId::CHAR}, // HTML 3 Table Model Draft
+ {{OOO_STRING_SVTOOLS_HTML_O_charset}, HtmlOptionId::CHARSET},
+ {{OOO_STRING_SVTOOLS_HTML_O_class}, HtmlOptionId::CLASS},
+ {{OOO_STRING_SVTOOLS_HTML_O_code}, HtmlOptionId::CODE}, // HotJava
+ {{OOO_STRING_SVTOOLS_HTML_O_codetype}, HtmlOptionId::CODETYPE},
+ {{OOO_STRING_SVTOOLS_HTML_O_content}, HtmlOptionId::CONTENT},
+ {{OOO_STRING_SVTOOLS_HTML_O_coords}, HtmlOptionId::COORDS}, // Netscape 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_enctype}, HtmlOptionId::ENCTYPE},
+ {{OOO_STRING_SVTOOLS_HTML_O_face}, HtmlOptionId::FACE}, // IExplorer 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_frameborder}, HtmlOptionId::FRAMEBORDER}, // IExplorer 3.0
+ {{OOO_STRING_SVTOOLS_HTML_O_httpequiv}, HtmlOptionId::HTTPEQUIV},
+ {{OOO_STRING_SVTOOLS_HTML_O_language}, HtmlOptionId::LANGUAGE}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_name}, HtmlOptionId::NAME},
+ {{OOO_STRING_SVTOOLS_HTML_O_prompt}, HtmlOptionId::PROMPT},
+ {{OOO_STRING_SVTOOLS_HTML_O_shape}, HtmlOptionId::SHAPE},
+ {{OOO_STRING_SVTOOLS_HTML_O_standby}, HtmlOptionId::STANDBY},
+ {{OOO_STRING_SVTOOLS_HTML_O_style}, HtmlOptionId::STYLE},
+ {{OOO_STRING_SVTOOLS_HTML_O_title}, HtmlOptionId::TITLE},
+ {{OOO_STRING_SVTOOLS_HTML_O_value}, HtmlOptionId::VALUE},
+ {{OOO_STRING_SVTOOLS_HTML_O_SDval}, HtmlOptionId::SDVAL}, // StarDiv NumberValue
+ {{OOO_STRING_SVTOOLS_HTML_O_SDnum}, HtmlOptionId::SDNUM}, // StarDiv NumberFormat
+ {{OOO_STRING_SVTOOLS_HTML_O_sdlibrary}, HtmlOptionId::SDLIBRARY},
+ {{OOO_STRING_SVTOOLS_HTML_O_sdmodule}, HtmlOptionId::SDMODULE},
// Attributes with a SGML identifier value
- {{OOO_STRING_SVTOOLS_HTML_O_id}, HTML_O_ID},
- {{OOO_STRING_SVTOOLS_HTML_O_target}, HTML_O_TARGET}, // Netscape 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_to}, HTML_O_TO},
+ {{OOO_STRING_SVTOOLS_HTML_O_id}, HtmlOptionId::ID},
+ {{OOO_STRING_SVTOOLS_HTML_O_target}, HtmlOptionId::TARGET}, // Netscape 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_to}, HtmlOptionId::TO},
// Attributes with an URI value
- {{OOO_STRING_SVTOOLS_HTML_O_action}, HTML_O_ACTION},
- {{OOO_STRING_SVTOOLS_HTML_O_archive}, HTML_O_ARCHIVE},
- {{OOO_STRING_SVTOOLS_HTML_O_background}, HTML_O_BACKGROUND},
- {{OOO_STRING_SVTOOLS_HTML_O_classid}, HTML_O_CLASSID},
- {{OOO_STRING_SVTOOLS_HTML_O_codebase}, HTML_O_CODEBASE}, // HotJava
- {{OOO_STRING_SVTOOLS_HTML_O_data}, HTML_O_DATA},
- {{OOO_STRING_SVTOOLS_HTML_O_href}, HTML_O_HREF},
- {{OOO_STRING_SVTOOLS_HTML_O_script}, HTML_O_SCRIPT},
- {{OOO_STRING_SVTOOLS_HTML_O_src}, HTML_O_SRC},
- {{OOO_STRING_SVTOOLS_HTML_O_usemap}, HTML_O_USEMAP}, // Netscape 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_action}, HtmlOptionId::ACTION},
+ {{OOO_STRING_SVTOOLS_HTML_O_archive}, HtmlOptionId::ARCHIVE},
+ {{OOO_STRING_SVTOOLS_HTML_O_background}, HtmlOptionId::BACKGROUND},
+ {{OOO_STRING_SVTOOLS_HTML_O_classid}, HtmlOptionId::CLASSID},
+ {{OOO_STRING_SVTOOLS_HTML_O_codebase}, HtmlOptionId::CODEBASE}, // HotJava
+ {{OOO_STRING_SVTOOLS_HTML_O_data}, HtmlOptionId::DATA},
+ {{OOO_STRING_SVTOOLS_HTML_O_href}, HtmlOptionId::HREF},
+ {{OOO_STRING_SVTOOLS_HTML_O_script}, HtmlOptionId::SCRIPT},
+ {{OOO_STRING_SVTOOLS_HTML_O_src}, HtmlOptionId::SRC},
+ {{OOO_STRING_SVTOOLS_HTML_O_usemap}, HtmlOptionId::USEMAP}, // Netscape 2.0
// Attributes with a color value (all Netscape versions)
- {{OOO_STRING_SVTOOLS_HTML_O_alink}, HTML_O_ALINK},
- {{OOO_STRING_SVTOOLS_HTML_O_bgcolor}, HTML_O_BGCOLOR},
- {{OOO_STRING_SVTOOLS_HTML_O_bordercolor}, HTML_O_BORDERCOLOR}, // IExplorer 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_bordercolorlight}, HTML_O_BORDERCOLORLIGHT}, // IExplorer 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_bordercolordark}, HTML_O_BORDERCOLORDARK}, // IExplorer 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_color}, HTML_O_COLOR},
- {{OOO_STRING_SVTOOLS_HTML_O_link}, HTML_O_LINK},
- {{OOO_STRING_SVTOOLS_HTML_O_text}, HTML_O_TEXT},
- {{OOO_STRING_SVTOOLS_HTML_O_vlink}, HTML_O_VLINK},
+ {{OOO_STRING_SVTOOLS_HTML_O_alink}, HtmlOptionId::ALINK},
+ {{OOO_STRING_SVTOOLS_HTML_O_bgcolor}, HtmlOptionId::BGCOLOR},
+ {{OOO_STRING_SVTOOLS_HTML_O_bordercolor}, HtmlOptionId::BORDERCOLOR}, // IExplorer 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_bordercolorlight}, HtmlOptionId::BORDERCOLORLIGHT}, // IExplorer 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_bordercolordark}, HtmlOptionId::BORDERCOLORDARK}, // IExplorer 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_color}, HtmlOptionId::COLOR},
+ {{OOO_STRING_SVTOOLS_HTML_O_link}, HtmlOptionId::LINK},
+ {{OOO_STRING_SVTOOLS_HTML_O_text}, HtmlOptionId::TEXT},
+ {{OOO_STRING_SVTOOLS_HTML_O_vlink}, HtmlOptionId::VLINK},
// Attributes with a numerical value
- {{OOO_STRING_SVTOOLS_HTML_O_border}, HTML_O_BORDER},
- {{OOO_STRING_SVTOOLS_HTML_O_cellspacing},HTML_O_CELLSPACING}, // HTML 3 Table Model Draft
- {{OOO_STRING_SVTOOLS_HTML_O_cellpadding},HTML_O_CELLPADDING}, // HTML 3 Table Model Draft
- {{OOO_STRING_SVTOOLS_HTML_O_charoff}, HTML_O_CHAROFF}, // HTML 3 Table Model Draft
- {{OOO_STRING_SVTOOLS_HTML_O_colspan}, HTML_O_COLSPAN},
- {{OOO_STRING_SVTOOLS_HTML_O_framespacing}, HTML_O_FRAMESPACING}, // IExplorer 3.0
- {{OOO_STRING_SVTOOLS_HTML_O_gutter}, HTML_O_GUTTER}, // Netscape 3.0b5
- {{OOO_STRING_SVTOOLS_HTML_O_height}, HTML_O_HEIGHT},
- {{OOO_STRING_SVTOOLS_HTML_O_hspace}, HTML_O_HSPACE}, // Netscape
- {{OOO_STRING_SVTOOLS_HTML_O_left}, HTML_O_LEFT},
- {{OOO_STRING_SVTOOLS_HTML_O_loop}, HTML_O_LOOP}, // IExplorer 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_marginheight},HTML_O_MARGINHEIGHT}, // Netscape 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_marginwidth},HTML_O_MARGINWIDTH}, // Netscape 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_maxlength}, HTML_O_MAXLENGTH},
- {{OOO_STRING_SVTOOLS_HTML_O_rowspan}, HTML_O_ROWSPAN},
- {{OOO_STRING_SVTOOLS_HTML_O_scrollamount}, HTML_O_SCROLLAMOUNT}, // IExplorer 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_scrolldelay}, HTML_O_SCROLLDELAY}, // IExplorer 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_span}, HTML_O_SPAN}, // HTML 3 Table Model Draft
- {{OOO_STRING_SVTOOLS_HTML_O_tabindex}, HTML_O_TABINDEX},
- {{OOO_STRING_SVTOOLS_HTML_O_vspace}, HTML_O_VSPACE}, // Netscape
- {{OOO_STRING_SVTOOLS_HTML_O_width}, HTML_O_WIDTH},
- {{OOO_STRING_SVTOOLS_HTML_O_zindex}, HTML_O_ZINDEX},
+ {{OOO_STRING_SVTOOLS_HTML_O_border}, HtmlOptionId::BORDER},
+ {{OOO_STRING_SVTOOLS_HTML_O_cellspacing},HtmlOptionId::CELLSPACING}, // HTML 3 Table Model Draft
+ {{OOO_STRING_SVTOOLS_HTML_O_cellpadding},HtmlOptionId::CELLPADDING}, // HTML 3 Table Model Draft
+ {{OOO_STRING_SVTOOLS_HTML_O_charoff}, HtmlOptionId::CHAROFF}, // HTML 3 Table Model Draft
+ {{OOO_STRING_SVTOOLS_HTML_O_colspan}, HtmlOptionId::COLSPAN},
+ {{OOO_STRING_SVTOOLS_HTML_O_framespacing}, HtmlOptionId::FRAMESPACING}, // IExplorer 3.0
+ {{OOO_STRING_SVTOOLS_HTML_O_gutter}, HtmlOptionId::GUTTER}, // Netscape 3.0b5
+ {{OOO_STRING_SVTOOLS_HTML_O_height}, HtmlOptionId::HEIGHT},
+ {{OOO_STRING_SVTOOLS_HTML_O_hspace}, HtmlOptionId::HSPACE}, // Netscape
+ {{OOO_STRING_SVTOOLS_HTML_O_left}, HtmlOptionId::LEFT},
+ {{OOO_STRING_SVTOOLS_HTML_O_loop}, HtmlOptionId::LOOP}, // IExplorer 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_marginheight},HtmlOptionId::MARGINHEIGHT}, // Netscape 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_marginwidth},HtmlOptionId::MARGINWIDTH}, // Netscape 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_maxlength}, HtmlOptionId::MAXLENGTH},
+ {{OOO_STRING_SVTOOLS_HTML_O_rowspan}, HtmlOptionId::ROWSPAN},
+ {{OOO_STRING_SVTOOLS_HTML_O_scrollamount}, HtmlOptionId::SCROLLAMOUNT}, // IExplorer 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_scrolldelay}, HtmlOptionId::SCROLLDELAY}, // IExplorer 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_span}, HtmlOptionId::SPAN}, // HTML 3 Table Model Draft
+ {{OOO_STRING_SVTOOLS_HTML_O_tabindex}, HtmlOptionId::TABINDEX},
+ {{OOO_STRING_SVTOOLS_HTML_O_vspace}, HtmlOptionId::VSPACE}, // Netscape
+ {{OOO_STRING_SVTOOLS_HTML_O_width}, HtmlOptionId::WIDTH},
+ {{OOO_STRING_SVTOOLS_HTML_O_zindex}, HtmlOptionId::ZINDEX},
// Attributes with enum values
- {{OOO_STRING_SVTOOLS_HTML_O_behavior}, HTML_O_BEHAVIOR}, // IExplorer 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_clear}, HTML_O_CLEAR},
- {{OOO_STRING_SVTOOLS_HTML_O_dir}, HTML_O_DIR}, // HTML 3 Table Model Draft
- {{OOO_STRING_SVTOOLS_HTML_O_direction}, HTML_O_DIRECTION}, // IExplorer 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_format}, HTML_O_FORMAT},
- {{OOO_STRING_SVTOOLS_HTML_O_frame}, HTML_O_FRAME}, // HTML 3 Table Model Draft
- {{OOO_STRING_SVTOOLS_HTML_O_lang}, HTML_O_LANG},
- {{OOO_STRING_SVTOOLS_HTML_O_method}, HTML_O_METHOD},
- {{OOO_STRING_SVTOOLS_HTML_O_rel}, HTML_O_REL},
- {{OOO_STRING_SVTOOLS_HTML_O_rev}, HTML_O_REV},
- {{OOO_STRING_SVTOOLS_HTML_O_rules}, HTML_O_RULES}, // HTML 3 Table Model Draft
- {{OOO_STRING_SVTOOLS_HTML_O_scrolling}, HTML_O_SCROLLING}, // Netscape 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_sdreadonly}, HTML_O_SDREADONLY},
- {{OOO_STRING_SVTOOLS_HTML_O_subtype}, HTML_O_SUBTYPE},
- {{OOO_STRING_SVTOOLS_HTML_O_type}, HTML_O_TYPE},
- {{OOO_STRING_SVTOOLS_HTML_O_valign}, HTML_O_VALIGN},
- {{OOO_STRING_SVTOOLS_HTML_O_valuetype}, HTML_O_VALUETYPE},
- {{OOO_STRING_SVTOOLS_HTML_O_wrap}, HTML_O_WRAP},
+ {{OOO_STRING_SVTOOLS_HTML_O_behavior}, HtmlOptionId::BEHAVIOR}, // IExplorer 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_clear}, HtmlOptionId::CLEAR},
+ {{OOO_STRING_SVTOOLS_HTML_O_dir}, HtmlOptionId::DIR}, // HTML 3 Table Model Draft
+ {{OOO_STRING_SVTOOLS_HTML_O_direction}, HtmlOptionId::DIRECTION}, // IExplorer 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_format}, HtmlOptionId::FORMAT},
+ {{OOO_STRING_SVTOOLS_HTML_O_frame}, HtmlOptionId::FRAME}, // HTML 3 Table Model Draft
+ {{OOO_STRING_SVTOOLS_HTML_O_lang}, HtmlOptionId::LANG},
+ {{OOO_STRING_SVTOOLS_HTML_O_method}, HtmlOptionId::METHOD},
+ {{OOO_STRING_SVTOOLS_HTML_O_rel}, HtmlOptionId::REL},
+ {{OOO_STRING_SVTOOLS_HTML_O_rev}, HtmlOptionId::REV},
+ {{OOO_STRING_SVTOOLS_HTML_O_rules}, HtmlOptionId::RULES}, // HTML 3 Table Model Draft
+ {{OOO_STRING_SVTOOLS_HTML_O_scrolling}, HtmlOptionId::SCROLLING}, // Netscape 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_sdreadonly}, HtmlOptionId::SDREADONLY},
+ {{OOO_STRING_SVTOOLS_HTML_O_subtype}, HtmlOptionId::SUBTYPE},
+ {{OOO_STRING_SVTOOLS_HTML_O_type}, HtmlOptionId::TYPE},
+ {{OOO_STRING_SVTOOLS_HTML_O_valign}, HtmlOptionId::VALIGN},
+ {{OOO_STRING_SVTOOLS_HTML_O_valuetype}, HtmlOptionId::VALUETYPE},
+ {{OOO_STRING_SVTOOLS_HTML_O_wrap}, HtmlOptionId::WRAP},
// Attributes with script code value
- {{OOO_STRING_SVTOOLS_HTML_O_onblur}, HTML_O_ONBLUR}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onchange}, HTML_O_ONCHANGE}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onclick}, HTML_O_ONCLICK}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onfocus}, HTML_O_ONFOCUS}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onload}, HTML_O_ONLOAD}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onmouseover}, HTML_O_ONMOUSEOVER}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onreset}, HTML_O_ONRESET}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onselect}, HTML_O_ONSELECT}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onsubmit}, HTML_O_ONSUBMIT}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onunload}, HTML_O_ONUNLOAD}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onabort}, HTML_O_ONABORT}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onerror}, HTML_O_ONERROR}, // JavaScript
- {{OOO_STRING_SVTOOLS_HTML_O_onmouseout}, HTML_O_ONMOUSEOUT}, // JavaScript
-
- {{OOO_STRING_SVTOOLS_HTML_O_SDonblur}, HTML_O_SDONBLUR}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonchange}, HTML_O_SDONCHANGE}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonclick}, HTML_O_SDONCLICK}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonfocus}, HTML_O_SDONFOCUS}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonload}, HTML_O_SDONLOAD}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseover}, HTML_O_SDONMOUSEOVER}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonreset}, HTML_O_SDONRESET}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonselect}, HTML_O_SDONSELECT}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonsubmit}, HTML_O_SDONSUBMIT}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonunload}, HTML_O_SDONUNLOAD}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonabort}, HTML_O_SDONABORT}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonerror}, HTML_O_SDONERROR}, // StarBasic
- {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseout}, HTML_O_SDONMOUSEOUT}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_onblur}, HtmlOptionId::ONBLUR}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onchange}, HtmlOptionId::ONCHANGE}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onclick}, HtmlOptionId::ONCLICK}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onfocus}, HtmlOptionId::ONFOCUS}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onload}, HtmlOptionId::ONLOAD}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onmouseover}, HtmlOptionId::ONMOUSEOVER}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onreset}, HtmlOptionId::ONRESET}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onselect}, HtmlOptionId::ONSELECT}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onsubmit}, HtmlOptionId::ONSUBMIT}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onunload}, HtmlOptionId::ONUNLOAD}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onabort}, HtmlOptionId::ONABORT}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onerror}, HtmlOptionId::ONERROR}, // JavaScript
+ {{OOO_STRING_SVTOOLS_HTML_O_onmouseout}, HtmlOptionId::ONMOUSEOUT}, // JavaScript
+
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonblur}, HtmlOptionId::SDONBLUR}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonchange}, HtmlOptionId::SDONCHANGE}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonclick}, HtmlOptionId::SDONCLICK}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonfocus}, HtmlOptionId::SDONFOCUS}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonload}, HtmlOptionId::SDONLOAD}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseover}, HtmlOptionId::SDONMOUSEOVER}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonreset}, HtmlOptionId::SDONRESET}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonselect}, HtmlOptionId::SDONSELECT}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonsubmit}, HtmlOptionId::SDONSUBMIT}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonunload}, HtmlOptionId::SDONUNLOAD}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonabort}, HtmlOptionId::SDONABORT}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonerror}, HtmlOptionId::SDONERROR}, // StarBasic
+ {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseout}, HtmlOptionId::SDONMOUSEOUT}, // StarBasic
// Attributes with context sensitive values
- {{OOO_STRING_SVTOOLS_HTML_O_align}, HTML_O_ALIGN},
- {{OOO_STRING_SVTOOLS_HTML_O_cols}, HTML_O_COLS}, // Netscape 2.0 vs HTML 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_rows}, HTML_O_ROWS}, // Netscape 2.0 vs HTML 2.0
- {{OOO_STRING_SVTOOLS_HTML_O_size}, HTML_O_SIZE},
- {{OOO_STRING_SVTOOLS_HTML_O_start}, HTML_O_START}, // Netscape 2.0 vs IExplorer 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_align}, HtmlOptionId::ALIGN},
+ {{OOO_STRING_SVTOOLS_HTML_O_cols}, HtmlOptionId::COLS}, // Netscape 2.0 vs HTML 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_rows}, HtmlOptionId::ROWS}, // Netscape 2.0 vs HTML 2.0
+ {{OOO_STRING_SVTOOLS_HTML_O_size}, HtmlOptionId::SIZE},
+ {{OOO_STRING_SVTOOLS_HTML_O_start}, HtmlOptionId::START}, // Netscape 2.0 vs IExplorer 2.0
};
-int GetHTMLOption( const OUString& rName )
+HtmlOptionId GetHTMLOption( const OUString& rName )
{
if( !bSortOptionKeyWords )
{
qsort( static_cast<void*>(aHTMLOptionTab),
- sizeof( aHTMLOptionTab ) / sizeof( HTML_TokenEntry ),
- sizeof( HTML_TokenEntry ),
+ sizeof( aHTMLOptionTab ) / sizeof( HTML_OptionEntry ),
+ sizeof( HTML_OptionEntry ),
HTMLKeyCompare );
bSortOptionKeyWords = true;
}
- int nRet = HTML_O_UNKNOWN;
+ HtmlOptionId nRet = HtmlOptionId::UNKNOWN;
void* pFound;
HTML_TokenEntry aSrch;
aSrch.pUToken = &rName;
@@ -727,10 +736,10 @@ int GetHTMLOption( const OUString& rName )
if( nullptr != ( pFound = bsearch( &aSrch,
static_cast<void*>(aHTMLOptionTab),
- sizeof( aHTMLOptionTab ) / sizeof( HTML_TokenEntry ),
- sizeof( HTML_TokenEntry ),
+ sizeof( aHTMLOptionTab ) / sizeof( HTML_OptionEntry ),
+ sizeof( HTML_OptionEntry ),
HTMLKeyCompare )))
- nRet = static_cast<HTML_TokenEntry*>(pFound)->nToken;
+ nRet = static_cast<HTML_OptionEntry*>(pFound)->nToken;
return nRet;
}
diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx
index 027257b5bf07..71709b8cbd04 100644
--- a/svtools/source/svhtml/htmlsupp.cxx
+++ b/svtools/source/svhtml/htmlsupp.cxx
@@ -52,7 +52,7 @@ void HTMLParser::ParseScriptOptions( OUString& rLangString, const OUString& rBas
const HTMLOption& aOption = aScriptOptions[--i];
switch( aOption.GetToken() )
{
- case HTML_O_LANGUAGE:
+ case HtmlOptionId::LANGUAGE:
{
rLangString = aOption.GetString();
HTMLScriptLanguage nLang;
@@ -63,16 +63,17 @@ void HTMLParser::ParseScriptOptions( OUString& rLangString, const OUString& rBas
}
break;
- case HTML_O_SRC:
+ case HtmlOptionId::SRC:
rSrc = INetURLObject::GetAbsURL( rBaseURL, aOption.GetString() );
break;
- case HTML_O_SDLIBRARY:
+ case HtmlOptionId::SDLIBRARY:
rLibrary = aOption.GetString();
break;
- case HTML_O_SDMODULE:
+ case HtmlOptionId::SDMODULE:
rModule = aOption.GetString();
break;
+ default: break;
}
}
}
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 1e4e39f3edaf..f0826f8acdde 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -93,23 +93,23 @@ static HTMLOptionEnum<HTMLTableRules> const aTableRulesOptEnums[] =
};
-HTMLOption::HTMLOption( sal_uInt16 nTok, const OUString& rToken,
+HTMLOption::HTMLOption( HtmlOptionId nTok, const OUString& rToken,
const OUString& rValue )
: aValue(rValue)
, aToken(rToken)
, nToken( nTok )
{
- DBG_ASSERT( nToken>=HTML_OPTION_START && nToken<HTML_OPTION_END,
+ DBG_ASSERT( nToken>=HtmlOptionId::BOOL_START && nToken<HtmlOptionId::END,
"HTMLOption: unknown token" );
}
sal_uInt32 HTMLOption::GetNumber() const
{
- DBG_ASSERT( (nToken>=HTML_OPTION_NUMBER_START &&
- nToken<HTML_OPTION_NUMBER_END) ||
- (nToken>=HTML_OPTION_CONTEXT_START &&
- nToken<HTML_OPTION_CONTEXT_END) ||
- nToken==HTML_O_VALUE,
+ DBG_ASSERT( (nToken>=HtmlOptionId::NUMBER_START &&
+ nToken<HtmlOptionId::NUMBER_END) ||
+ (nToken>=HtmlOptionId::CONTEXT_START &&
+ nToken<HtmlOptionId::CONTEXT_END) ||
+ nToken==HtmlOptionId::VALUE,
"GetNumber: Option not numerical" );
OUString aTmp(comphelper::string::stripStart(aValue, ' '));
sal_Int32 nTmp = aTmp.toInt32();
@@ -118,8 +118,8 @@ sal_uInt32 HTMLOption::GetNumber() const
sal_Int32 HTMLOption::GetSNumber() const
{
- DBG_ASSERT( (nToken>=HTML_OPTION_NUMBER_START && nToken<HTML_OPTION_NUMBER_END) ||
- (nToken>=HTML_OPTION_CONTEXT_START && nToken<HTML_OPTION_CONTEXT_END),
+ DBG_ASSERT( (nToken>=HtmlOptionId::NUMBER_START && nToken<HtmlOptionId::NUMBER_END) ||
+ (nToken>=HtmlOptionId::CONTEXT_START && nToken<HtmlOptionId::CONTEXT_END),
"GetSNumber: Option not numerical" );
OUString aTmp(comphelper::string::stripStart(aValue, ' '));
return aTmp.toInt32();
@@ -157,7 +157,7 @@ void HTMLOption::GetNumbers( std::vector<sal_uInt32> &rNumbers ) const
void HTMLOption::GetColor( Color& rColor ) const
{
- DBG_ASSERT( (nToken>=HTML_OPTION_COLOR_START && nToken<HTML_OPTION_COLOR_END) || nToken==HTML_O_SIZE,
+ DBG_ASSERT( (nToken>=HtmlOptionId::COLOR_START && nToken<HtmlOptionId::COLOR_END) || nToken==HtmlOptionId::SIZE,
"GetColor: Option is not a color." );
OUString aTmp(aValue.toAsciiLowerCase());
@@ -195,19 +195,19 @@ void HTMLOption::GetColor( Color& rColor ) const
HTMLInputType HTMLOption::GetInputType() const
{
- DBG_ASSERT( nToken==HTML_O_TYPE, "GetInputType: Option not TYPE" );
+ DBG_ASSERT( nToken==HtmlOptionId::TYPE, "GetInputType: Option not TYPE" );
return (HTMLInputType)GetEnum( aInputTypeOptEnums, HTMLInputType::Text );
}
HTMLTableFrame HTMLOption::GetTableFrame() const
{
- DBG_ASSERT( nToken==HTML_O_FRAME, "GetTableFrame: Option not FRAME" );
+ DBG_ASSERT( nToken==HtmlOptionId::FRAME, "GetTableFrame: Option not FRAME" );
return (HTMLTableFrame)GetEnum( aTableFrameOptEnums );
}
HTMLTableRules HTMLOption::GetTableRules() const
{
- DBG_ASSERT( nToken==HTML_O_RULES, "GetTableRules: Option not RULES" );
+ DBG_ASSERT( nToken==HtmlOptionId::RULES, "GetTableRules: Option not RULES" );
return (HTMLTableRules)GetEnum( aTableRulesOptEnums );
}
@@ -1360,7 +1360,7 @@ void HTMLParser::UnescapeToken()
}
}
-const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken )
+const HTMLOptions& HTMLParser::GetOptions( HtmlOptionId *pNoConvertToken )
{
// If the options for the current token have already been returned,
// return them once again.
@@ -1373,7 +1373,7 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken )
// A letter? Option beginning here.
if( HTML_ISALPHA( aToken[nPos] ) )
{
- int nToken;
+ HtmlOptionId nToken;
OUString aValue;
sal_Int32 nStt = nPos;
sal_Unicode cChar = 0;
@@ -1389,10 +1389,10 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken )
// PlugIns require original token name. Convert to lower case only for searching.
nToken = GetHTMLOption( sName.toAsciiLowerCase() ); // Name is ready
- SAL_WARN_IF( nToken==HTML_O_UNKNOWN, "svtools",
+ SAL_WARN_IF( nToken==HtmlOptionId::UNKNOWN, "svtools",
"GetOption: unknown HTML option '" << sName << "'" );
- bool bStripCRLF = (nToken < HTML_OPTION_SCRIPT_START ||
- nToken >= HTML_OPTION_SCRIPT_END) &&
+ bool bStripCRLF = (nToken < HtmlOptionId::SCRIPT_START ||
+ nToken >= HtmlOptionId::SCRIPT_END) &&
(!pNoConvertToken || nToken != *pNoConvertToken);
while( nPos < aToken.getLength() &&
@@ -1526,8 +1526,7 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken )
}
// Token is known and can be saved
- maOptions.push_back(
- HTMLOption(sal::static_int_cast<sal_uInt16>(nToken), sName, aValue));
+ maOptions.push_back(HTMLOption(nToken, sName, aValue));
}
else
@@ -1879,25 +1878,28 @@ bool HTMLParser::ParseMetaOptionsImpl(
const HTMLOption& aOption = aOptions[--i];
switch ( aOption.GetToken() )
{
- case HTML_O_NAME:
+ case HtmlOptionId::NAME:
aName = aOption.GetString();
if ( HtmlMeta::NONE==nAction )
{
aOption.GetEnum( nAction, aHTMLMetaNameTable );
}
break;
- case HTML_O_HTTPEQUIV:
+ case HtmlOptionId::HTTPEQUIV:
aName = aOption.GetString();
aOption.GetEnum( nAction, aHTMLMetaNameTable );
bHTTPEquiv = true;
break;
- case HTML_O_CONTENT:
+ case HtmlOptionId::CONTENT:
aContent = aOption.GetString();
break;
- case HTML_O_CHARSET:
+ case HtmlOptionId::CHARSET:
+ {
OString sValue(OUStringToOString(aOption.GetString(), RTL_TEXTENCODING_ASCII_US));
o_rEnc = GetExtendedCompatibilityTextEncoding(rtl_getTextEncodingFromMimeCharset(sValue.getStr()));
break;
+ }
+ default: break;
}
}
@@ -2016,7 +2018,7 @@ bool HTMLParser::ParseMetaOptions(
const uno::Reference<document::XDocumentProperties> & i_xDocProps,
SvKeyValueIterator *i_pHeader )
{
- sal_uInt16 nContentOption = HTML_O_CONTENT;
+ HtmlOptionId nContentOption = HtmlOptionId::CONTENT;
rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW;
bool bRet = ParseMetaOptionsImpl( i_xDocProps, i_pHeader,
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index bc7ae7fc0b27..3daf8eab650d 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1671,7 +1671,7 @@ void SwHTMLParser::NewStyle()
for (size_t i = rOptions2.size(); i; )
{
const HTMLOption& rOption = rOptions2[--i];
- if( HTML_O_TYPE == rOption.GetToken() )
+ if( HtmlOptionId::TYPE == rOption.GetToken() )
sType = rOption.GetString();
}
@@ -1752,15 +1752,16 @@ void SwHTMLParser::InsertLink()
const HTMLOption& rOption = rOptions2[--i];
switch( rOption.GetToken() )
{
- case HTML_O_REL:
+ case HtmlOptionId::REL:
sRel = rOption.GetString();
break;
- case HTML_O_HREF:
+ case HtmlOptionId::HREF:
sHRef = URIHelper::SmartRel2Abs( INetURLObject( m_sBaseURL ), rOption.GetString(), Link<OUString *, bool>(), false );
break;
- case HTML_O_TYPE:
+ case HtmlOptionId::TYPE:
sType = rOption.GetString();
break;
+ default: break;
}
}
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index 3778ba035adb..cc689bcda2c4 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -270,31 +270,31 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
{
switch( rOption.GetToken() )
{
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aId = rOption.GetString();
break;
- case HTML_O_STYLE:
+ case HtmlOptionId::STYLE:
aStyle = rOption.GetString();
break;
- case HTML_O_CLASS:
+ case HtmlOptionId::CLASS:
aClass = rOption.GetString();
break;
- case HTML_O_BEHAVIOR:
+ case HtmlOptionId::BEHAVIOR:
eAniKind = rOption.GetEnum( aHTMLMarqBehaviorTable, eAniKind );
break;
- case HTML_O_BGCOLOR:
+ case HtmlOptionId::BGCOLOR:
rOption.GetColor( aBGColor );
bBGColor = true;
break;
- case HTML_O_DIRECTION:
+ case HtmlOptionId::DIRECTION:
eAniDir = rOption.GetEnum( aHTMLMarqDirectionTable, eAniDir );
bDirection = true;
break;
- case HTML_O_LOOP:
+ case HtmlOptionId::LOOP:
if (rOption.GetString().
equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_LOOP_infinite))
{
@@ -307,15 +307,15 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
}
break;
- case HTML_O_SCROLLAMOUNT:
+ case HtmlOptionId::SCROLLAMOUNT:
nAmount = -((sal_Int16)rOption.GetNumber());
break;
- case HTML_O_SCROLLDELAY:
+ case HtmlOptionId::SCROLLDELAY:
nDelay = (sal_uInt16)rOption.GetNumber();
break;
- case HTML_O_WIDTH:
+ case HtmlOptionId::WIDTH:
// erstmal nur als Pixelwerte merken!
nWidth = rOption.GetNumber();
bPrcWidth = rOption.GetString().indexOf('%') != -1;
@@ -323,30 +323,31 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
nWidth = 100;
break;
- case HTML_O_HEIGHT:
+ case HtmlOptionId::HEIGHT:
// erstmal nur als Pixelwerte merken!
nHeight = rOption.GetNumber();
if( rOption.GetString().indexOf('%') != -1 )
nHeight = 0;
break;
- case HTML_O_HSPACE:
+ case HtmlOptionId::HSPACE:
// erstmal nur als Pixelwerte merken!
aSpace.Height() = rOption.GetNumber();
break;
- case HTML_O_VSPACE:
+ case HtmlOptionId::VSPACE:
// erstmal nur als Pixelwerte merken!
aSpace.Width() = rOption.GetNumber();
break;
- case HTML_O_ALIGN:
+ case HtmlOptionId::ALIGN:
eVertOri =
rOption.GetEnum( aHTMLImgVAlignTable,
text::VertOrientation::TOP );
eHoriOri =
rOption.GetEnum( aHTMLImgHAlignTable );
break;
+ default: break;
}
}
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 5901069b8791..b5ef5f9be9fe 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -218,32 +218,33 @@ void SwHTMLParser::NewField()
const HTMLOption& rOption = rHTMLOptions[--i];
switch( rOption.GetToken() )
{
- case HTML_O_TYPE:
+ case HtmlOptionId::TYPE:
bKnownType = rOption.GetEnum( nType, aHTMLFieldTypeTable );
break;
- case HTML_O_SUBTYPE:
+ case HtmlOptionId::SUBTYPE:
pSubOption = &rOption;
break;
- case HTML_O_FORMAT:
+ case HtmlOptionId::FORMAT:
pFormatOption = &rOption;
break;
- case HTML_O_NAME:
+ case HtmlOptionId::NAME:
aName = rOption.GetString();
break;
- case HTML_O_VALUE:
+ case HtmlOptionId::VALUE:
aValue = rOption.GetString();
break;
- case HTML_O_SDNUM:
+ case HtmlOptionId::SDNUM:
aNumFormat = rOption.GetString();
bHasNumFormat = true;
break;
- case HTML_O_SDVAL:
+ case HtmlOptionId::SDVAL:
aNumValue = rOption.GetString();
bHasNumValue = true;
break;
- case HTML_O_SDFIXED:
+ case HtmlOptionId::SDFIXED:
bFixed = true;
break;
+ default: break;
}
}
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 639635d05cbc..f47d1141752b 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -1249,34 +1249,34 @@ void SwHTMLParser::NewForm( bool bAppend )
switch( rOption.GetToken() )
{
- case HTML_O_ACTION:
+ case HtmlOptionId::ACTION:
aAction = rOption.GetString();
break;
- case HTML_O_METHOD:
+ case HtmlOptionId::METHOD:
nMethod = rOption.GetEnum( aHTMLFormMethodTable, nMethod );
break;
- case HTML_O_ENCTYPE:
+ case HtmlOptionId::ENCTYPE:
nEncType = rOption.GetEnum( aHTMLFormEncTypeTable, nEncType );
break;
- case HTML_O_TARGET:
+ case HtmlOptionId::TARGET:
sTarget = rOption.GetString();
break;
- case HTML_O_NAME:
+ case HtmlOptionId::NAME:
sName = rOption.GetString();
break;
- case HTML_O_SDONSUBMIT:
+ case HtmlOptionId::SDONSUBMIT:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONSUBMIT:
+ case HtmlOptionId::ONSUBMIT:
nEvent = HTML_ET_ONSUBMITFORM;
bSetEvent = true;
break;
- case HTML_O_SDONRESET:
+ case HtmlOptionId::SDONRESET:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONRESET:
+ case HtmlOptionId::ONRESET:
nEvent = HTML_ET_ONRESETFORM;
bSetEvent = true;
break;
@@ -1405,7 +1405,7 @@ void SwHTMLParser::InsertInput()
ScriptType eDfltScriptType = GetScriptType( pHeaderAttrs );
const OUString& rDfltScriptType = GetScriptTypeString( pHeaderAttrs );
- sal_uInt16 nKeepCRLFToken = HTML_O_VALUE;
+ HtmlOptionId nKeepCRLFToken = HtmlOptionId::VALUE;
const HTMLOptions& rHTMLOptions = GetOptions( &nKeepCRLFToken );
for (size_t i = rHTMLOptions.size(); i; )
{
@@ -1416,95 +1416,95 @@ void SwHTMLParser::InsertInput()
switch( rOption.GetToken() )
{
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aId = rOption.GetString();
break;
- case HTML_O_STYLE:
+ case HtmlOptionId::STYLE:
aStyle = rOption.GetString();
break;
- case HTML_O_CLASS:
+ case HtmlOptionId::CLASS:
aClass = rOption.GetString();
break;
- case HTML_O_TYPE:
+ case HtmlOptionId::TYPE:
eType = rOption.GetInputType();
break;
- case HTML_O_NAME:
+ case HtmlOptionId::NAME:
sName = rOption.GetString();
break;
- case HTML_O_VALUE:
+ case HtmlOptionId::VALUE:
sText = rOption.GetString();
bValue = true;
break;
- case HTML_O_CHECKED:
+ case HtmlOptionId::CHECKED:
nChecked = TRISTATE_TRUE;
break;
- case HTML_O_DISABLED:
+ case HtmlOptionId::DISABLED:
bDisabled = true;
break;
- case HTML_O_MAXLENGTH:
+ case HtmlOptionId::MAXLENGTH:
nMaxLen = (sal_Int16)rOption.GetNumber();
break;
- case HTML_O_SIZE:
+ case HtmlOptionId::SIZE:
nSize = (sal_uInt16)rOption.GetNumber();
break;
- case HTML_O_SRC:
+ case HtmlOptionId::SRC:
sImgSrc = rOption.GetString();
break;
- case HTML_O_WIDTH:
+ case HtmlOptionId::WIDTH:
// erstmal nur als Pixelwerte merken!
nWidth = rOption.GetNumber();
break;
- case HTML_O_HEIGHT:
+ case HtmlOptionId::HEIGHT:
// erstmal nur als Pixelwerte merken!
nHeight = rOption.GetNumber();
break;
- case HTML_O_ALIGN:
+ case HtmlOptionId::ALIGN:
eVertOri =
rOption.GetEnum( aHTMLImgVAlignTable, eVertOri );
eHoriOri =
rOption.GetEnum( aHTMLImgHAlignTable, eHoriOri );
break;
- case HTML_O_TABINDEX:
+ case HtmlOptionId::TABINDEX:
// erstmal nur als Pixelwerte merken!
nTabIndex = rOption.GetNumber();
break;
- case HTML_O_SDONFOCUS:
+ case HtmlOptionId::SDONFOCUS:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONFOCUS:
+ case HtmlOptionId::ONFOCUS:
nEvent = HTML_ET_ONGETFOCUS;
bSetEvent = true;
break;
- case HTML_O_SDONBLUR: // eigtl. nur EDIT
+ case HtmlOptionId::SDONBLUR: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONBLUR:
+ case HtmlOptionId::ONBLUR:
nEvent = HTML_ET_ONLOSEFOCUS;
bSetEvent = true;
break;
- case HTML_O_SDONCLICK:
+ case HtmlOptionId::SDONCLICK:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONCLICK:
+ case HtmlOptionId::ONCLICK:
nEvent = HTML_ET_ONCLICK;
bSetEvent = true;
break;
- case HTML_O_SDONCHANGE: // eigtl. nur EDIT
+ case HtmlOptionId::SDONCHANGE: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONCHANGE:
+ case HtmlOptionId::ONCHANGE:
nEvent = HTML_ET_ONCHANGE;
bSetEvent = true;
break;
- case HTML_O_SDONSELECT: // eigtl. nur EDIT
+ case HtmlOptionId::SDONSELECT: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONSELECT:
+ case HtmlOptionId::ONSELECT:
nEvent = HTML_ET_ONSELECT;
bSetEvent = true;
break;
@@ -1894,71 +1894,71 @@ void SwHTMLParser::NewTextArea()
switch( rOption.GetToken() )
{
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aId = rOption.GetString();
break;
- case HTML_O_STYLE:
+ case HtmlOptionId::STYLE:
aStyle = rOption.GetString();
break;
- case HTML_O_CLASS:
+ case HtmlOptionId::CLASS:
aClass = rOption.GetString();
break;
- case HTML_O_NAME:
+ case HtmlOptionId::NAME:
sName = rOption.GetString();
break;
- case HTML_O_DISABLED:
+ case HtmlOptionId::DISABLED:
bDisabled = true;
break;
- case HTML_O_ROWS:
+ case HtmlOptionId::ROWS:
nRows = (sal_uInt16)rOption.GetNumber();
break;
- case HTML_O_COLS:
+ case HtmlOptionId::COLS:
nCols = (sal_uInt16)rOption.GetNumber();
break;
- case HTML_O_WRAP:
+ case HtmlOptionId::WRAP:
nWrap = rOption.GetEnum( aHTMLTextAreaWrapTable, nWrap );
break;
- case HTML_O_TABINDEX:
+ case HtmlOptionId::TABINDEX:
nTabIndex = rOption.GetSNumber();
break;
- case HTML_O_SDONFOCUS:
+ case HtmlOptionId::SDONFOCUS:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONFOCUS:
+ case HtmlOptionId::ONFOCUS:
nEvent = HTML_ET_ONGETFOCUS;
bSetEvent = true;
break;
- case HTML_O_SDONBLUR:
+ case HtmlOptionId::SDONBLUR:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONBLUR:
+ case HtmlOptionId::ONBLUR:
nEvent = HTML_ET_ONLOSEFOCUS;
bSetEvent = true;
break;
- case HTML_O_SDONCLICK:
+ case HtmlOptionId::SDONCLICK:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONCLICK:
+ case HtmlOptionId::ONCLICK:
nEvent = HTML_ET_ONCLICK;
bSetEvent = true;
break;
- case HTML_O_SDONCHANGE:
+ case HtmlOptionId::SDONCHANGE:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONCHANGE:
+ case HtmlOptionId::ONCHANGE:
nEvent = HTML_ET_ONCHANGE;
bSetEvent = true;
break;
- case HTML_O_SDONSELECT:
+ case HtmlOptionId::SDONSELECT:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONSELECT:
+ case HtmlOptionId::ONSELECT:
nEvent = HTML_ET_ONSELECT;
bSetEvent = true;
break;
@@ -2173,60 +2173,60 @@ void SwHTMLParser::NewSelect()
switch( rOption.GetToken() )
{
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aId = rOption.GetString();
break;
- case HTML_O_STYLE:
+ case HtmlOptionId::STYLE:
aStyle = rOption.GetString();
break;
- case HTML_O_CLASS:
+ case HtmlOptionId::CLASS:
aClass = rOption.GetString();
break;
- case HTML_O_NAME:
+ case HtmlOptionId::NAME:
sName = rOption.GetString();
break;
- case HTML_O_MULTIPLE:
+ case HtmlOptionId::MULTIPLE:
bMultiple = true;
break;
- case HTML_O_DISABLED:
+ case HtmlOptionId::DISABLED:
bDisabled = true;
break;
- case HTML_O_SIZE:
+ case HtmlOptionId::SIZE:
m_nSelectEntryCnt = (sal_uInt16)rOption.GetNumber();
break;
- case HTML_O_TABINDEX:
+ case HtmlOptionId::TABINDEX:
nTabIndex = rOption.GetSNumber();
break;
- case HTML_O_SDONFOCUS:
+ case HtmlOptionId::SDONFOCUS:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONFOCUS:
+ case HtmlOptionId::ONFOCUS:
nEvent = HTML_ET_ONGETFOCUS;
bSetEvent = true;
break;
- case HTML_O_SDONBLUR:
+ case HtmlOptionId::SDONBLUR:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONBLUR:
+ case HtmlOptionId::ONBLUR:
nEvent = HTML_ET_ONLOSEFOCUS;
bSetEvent = true;
break;
- case HTML_O_SDONCLICK:
+ case HtmlOptionId::SDONCLICK:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONCLICK:
+ case HtmlOptionId::ONCLICK:
nEvent = HTML_ET_ONCLICK;
bSetEvent = true;
break;
- case HTML_O_SDONCHANGE:
+ case HtmlOptionId::SDONCHANGE:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONCHANGE:
+ case HtmlOptionId::ONCHANGE:
nEvent = HTML_ET_ONCHANGE;
bSetEvent = true;
break;
@@ -2446,17 +2446,18 @@ void SwHTMLParser::InsertSelectOption()
const HTMLOption& rOption = rHTMLOptions[--i];
switch( rOption.GetToken() )
{
- case HTML_O_ID:
+ case HtmlOptionId::ID:
// erstmal weglassen!!!
break;
- case HTML_O_SELECTED:
+ case HtmlOptionId::SELECTED:
m_bLBEntrySelected = true;
break;
- case HTML_O_VALUE:
+ case HtmlOptionId::VALUE:
aValue = rOption.GetString();
if( aValue.isEmpty() )
aValue = "$$$empty$$$";
break;
+ default: break;
}
}
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 9b3c38212196..abff69ca2fef 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -324,28 +324,28 @@ void SwHTMLParser::InsertImage()
const HTMLOption& rOption = rHTMLOptions[--i];
switch( rOption.GetToken() )
{
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aId = rOption.GetString();
break;
- case HTML_O_STYLE:
+ case HtmlOptionId::STYLE:
aStyle = rOption.GetString();
break;
- case HTML_O_CLASS:
+ case HtmlOptionId::CLASS:
aClass = rOption.GetString();
break;
- case HTML_O_SRC:
+ case HtmlOptionId::SRC:
sGrfNm = rOption.GetString();
if( !InternalImgToPrivateURL(sGrfNm) )
sGrfNm = INetURLObject::GetAbsURL( m_sBaseURL, sGrfNm );
break;
- case HTML_O_ALIGN:
+ case HtmlOptionId::ALIGN:
eVertOri =
rOption.GetEnum( aHTMLImgVAlignTable,
text::VertOrientation::TOP );
eHoriOri =
rOption.GetEnum( aHTMLImgHAlignTable );
break;
- case HTML_O_WIDTH:
+ case HtmlOptionId::WIDTH:
// for now only store as pixel value!
nWidth = rOption.GetNumber();
bPrcWidth = (rOption.GetString().indexOf('%') != -1);
@@ -353,7 +353,7 @@ void SwHTMLParser::InsertImage()
nWidth = 100;
bWidthProvided = true;
break;
- case HTML_O_HEIGHT:
+ case HtmlOptionId::HEIGHT:
// for now only store as pixel value!
nHeight = rOption.GetNumber();
bPrcHeight = (rOption.GetString().indexOf('%') != -1);
@@ -361,46 +361,46 @@ void SwHTMLParser::InsertImage()
nHeight = 100;
bHeightProvided = true;
break;
- case HTML_O_VSPACE:
+ case HtmlOptionId::VSPACE:
nVSpace = rOption.GetNumber();
break;
- case HTML_O_HSPACE:
+ case HtmlOptionId::HSPACE:
nHSpace = rOption.GetNumber();
break;
- case HTML_O_ALT:
+ case HtmlOptionId::ALT:
sAltNm = rOption.GetString();
break;
- case HTML_O_BORDER:
+ case HtmlOptionId::BORDER:
nBorder = (sal_uInt16)rOption.GetNumber();
break;
- case HTML_O_ISMAP:
+ case HtmlOptionId::ISMAP:
bIsMap = true;
break;
- case HTML_O_USEMAP:
+ case HtmlOptionId::USEMAP:
aMap = rOption.GetString();
break;
- case HTML_O_NAME:
+ case HtmlOptionId::NAME:
sHTMLGrfName = rOption.GetString();
break;
- case HTML_O_SDONLOAD:
+ case HtmlOptionId::SDONLOAD:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONLOAD:
+ case HtmlOptionId::ONLOAD:
nEvent = SVX_EVENT_IMAGE_LOAD;
goto IMAGE_SETEVENT;
- case HTML_O_SDONABORT:
+ case HtmlOptionId::SDONABORT:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONABORT:
+ case HtmlOptionId::ONABORT:
nEvent = SVX_EVENT_IMAGE_ABORT;
goto IMAGE_SETEVENT;
- case HTML_O_SDONERROR:
+ case HtmlOptionId::SDONERROR:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONERROR:
+ case HtmlOptionId::ONERROR:
nEvent = SVX_EVENT_IMAGE_ERROR;
goto IMAGE_SETEVENT;
IMAGE_SETEVENT:
@@ -417,6 +417,7 @@ IMAGE_SETEVENT:
}
}
break;
+ default: break;
}
}
@@ -836,74 +837,75 @@ void SwHTMLParser::InsertBodyOptions()
switch( rOption.GetToken() )
{
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aId = rOption.GetString();
break;
- case HTML_O_BACKGROUND:
+ case HtmlOptionId::BACKGROUND:
aBackGround = rOption.GetString();
break;
- case HTML_O_BGCOLOR:
+ case HtmlOptionId::BGCOLOR:
rOption.GetColor( aBGColor );
bBGColor = true;
break;
- case HTML_O_TEXT:
+ case HtmlOptionId::TEXT:
rOption.GetColor( aTextColor );
bTextColor = true;
break;
- case HTML_O_LINK:
+ case HtmlOptionId::LINK:
rOption.GetColor( aLinkColor );
bLinkColor = true;
break;
- case HTML_O_VLINK:
+ case HtmlOptionId::VLINK:
rOption.GetColor( aVLinkColor );
bVLinkColor = true;
break;
- case HTML_O_SDONLOAD:
+ case HtmlOptionId::SDONLOAD:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONLOAD:
+ case HtmlOptionId::ONLOAD:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::OPENDOC );
bSetEvent = true;
break;
- case HTML_O_SDONUNLOAD:
+ case HtmlOptionId::SDONUNLOAD:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONUNLOAD:
+ case HtmlOptionId::ONUNLOAD:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::PREPARECLOSEDOC );
bSetEvent = true;
break;
- case HTML_O_SDONFOCUS:
+ case HtmlOptionId::SDONFOCUS:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONFOCUS:
+ case HtmlOptionId::ONFOCUS:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::ACTIVATEDOC );
bSetEvent = true;
break;
- case HTML_O_SDONBLUR:
+ case HtmlOptionId::SDONBLUR:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONBLUR:
+ case HtmlOptionId::ONBLUR:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::DEACTIVATEDOC );
bSetEvent = true;
break;
- case HTML_O_ONERROR:
+ case HtmlOptionId::ONERROR:
break;
- case HTML_O_STYLE:
+ case HtmlOptionId::STYLE:
aStyle = rOption.GetString();
bTextColor = true;
break;
- case HTML_O_LANG:
+ case HtmlOptionId::LANG:
aLang = rOption.GetString();
break;
- case HTML_O_DIR:
+ case HtmlOptionId::DIR:
aDir = rOption.GetString();
break;
+ default: break;
}
if( bSetEvent )
@@ -1071,55 +1073,55 @@ void SwHTMLParser::NewAnchor()
const HTMLOption& rOption = rHTMLOptions[--i];
switch( rOption.GetToken() )
{
- case HTML_O_NAME:
+ case HtmlOptionId::NAME:
aName = rOption.GetString();
break;
- case HTML_O_HREF:
+ case HtmlOptionId::HREF:
sHRef = rOption.GetString();
bHasHRef = true;
break;
- case HTML_O_TARGET:
+ case HtmlOptionId::TARGET:
sTarget = rOption.GetString();
break;
- case HTML_O_STYLE:
+ case HtmlOptionId::STYLE:
aStyle = rOption.GetString();
break;
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aId = rOption.GetString();
break;
- case HTML_O_CLASS:
+ case HtmlOptionId::CLASS:
aClass = rOption.GetString();
break;
- case HTML_O_SDFIXED:
+ case HtmlOptionId::SDFIXED:
bFixed = true;
break;
- case HTML_O_LANG:
+ case HtmlOptionId::LANG:
aLang = rOption.GetString();
break;
- case HTML_O_DIR:
+ case HtmlOptionId::DIR:
aDir = rOption.GetString();
break;
- case HTML_O_SDONCLICK:
+ case HtmlOptionId::SDONCLICK:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONCLICK:
+ case HtmlOptionId::ONCLICK:
nEvent = SFX_EVENT_MOUSECLICK_OBJECT;
goto ANCHOR_SETEVENT;
- case HTML_O_SDONMOUSEOVER:
+ case HtmlOptionId::SDONMOUSEOVER:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONMOUSEOVER:
+ case HtmlOptionId::ONMOUSEOVER:
nEvent = SFX_EVENT_MOUSEOVER_OBJECT;
goto ANCHOR_SETEVENT;
- case HTML_O_SDONMOUSEOUT:
+ case HtmlOptionId::SDONMOUSEOUT:
eScriptType2 = STARBASIC;
SAL_FALLTHROUGH;
- case HTML_O_ONMOUSEOUT:
+ case HtmlOptionId::ONMOUSEOUT:
nEvent = SFX_EVENT_MOUSEOUT_OBJECT;
goto ANCHOR_SETEVENT;
ANCHOR_SETEVENT:
@@ -1135,7 +1137,7 @@ ANCHOR_SETEVENT:
}
}
break;
-
+ default: break;
}
}
diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx
index ab291b56925d..186f8f599bf0 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -136,10 +136,10 @@ void SwHTMLParser::NewNumBulList( int nToken )
const HTMLOption& rOption = rHTMLOptions[--i];
switch( rOption.GetToken() )
{
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aId = rOption.GetString();
break;
- case HTML_O_TYPE:
+ case HtmlOptionId::TYPE:
if( bNewNumFormat && !rOption.GetString().isEmpty() )
{
switch( nToken )
@@ -164,7 +164,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
}
}
break;
- case HTML_O_START:
+ case HtmlOptionId::START:
{
sal_uInt16 nStart = (sal_uInt16)rOption.GetNumber();
if( bNewNumFormat )
@@ -178,19 +178,19 @@ void SwHTMLParser::NewNumBulList( int nToken )
}
}
break;
- case HTML_O_STYLE:
+ case HtmlOptionId::STYLE:
aStyle = rOption.GetString();
break;
- case HTML_O_CLASS:
+ case HtmlOptionId::CLASS:
aClass = rOption.GetString();
break;
- case HTML_O_LANG:
+ case HtmlOptionId::LANG:
aLang = rOption.GetString();
break;
- case HTML_O_DIR:
+ case HtmlOptionId::DIR:
aDir = rOption.GetString();
break;
- case HTML_O_SRC:
+ case HtmlOptionId::SRC:
if( bNewNumFormat )
{
aBulletSrc = rOption.GetString();
@@ -198,15 +198,16 @@ void SwHTMLParser::NewNumBulList( int nToken )
aBulletSrc = URIHelper::SmartRel2Abs( INetURLObject( m_sBaseURL ), aBulletSrc, Link<OUString *, bool>(), false );
}
break;
- case HTML_O_WIDTH:
+ case HtmlOptionId::WIDTH:
nWidth = (sal_uInt16)rOption.GetNumber();
break;
- case HTML_O_HEIGHT:
+ case HtmlOptionId::HEIGHT:
nHeight = (sal_uInt16)rOption.GetNumber();
break;
- case HTML_O_ALIGN:
+ case HtmlOptionId::ALIGN:
eVertOri = rOption.GetEnum( aHTMLImgVAlignTable, eVertOri );
break;
+ default: break;
}
}
@@ -441,24 +442,25 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
const HTMLOption& rOption = rHTMLOptions[--i];
switch( rOption.GetToken() )
{
- case HTML_O_VALUE:
+ case HtmlOptionId::VALUE:
nStart = (sal_uInt16)rOption.GetNumber();
break;
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aId = rOption.GetString();
break;
- case HTML_O_STYLE:
+ case HtmlOptionId::STYLE:
aStyle = rOption.GetString();
break;
- case HTML_O_CLASS:
+ case HtmlOptionId::CLASS:
aClass = rOption.GetString();
break;
- case HTML_O_LANG:
+ case HtmlOptionId::LANG:
aLang = rOption.GetString();
break;
- case HTML_O_DIR:
+ case HtmlOptionId::DIR:
aDir = rOption.GetString();
break;
+ default: break;
}
}
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 94d38e6aeb25..3e5b9de50293 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -307,59 +307,59 @@ void SwHTMLParser::InsertEmbed()
{
switch( rOption.GetToken() )
{
- case HTML_O_ID:
+ case HtmlOptionId::ID:
aId = rOption.GetString();
break;
- case HTML_O_STYLE:
+ case HtmlOptionId::STYLE:
aStyle = rOption.GetString();
break;
- case HTML_O_CLASS:
+ case HtmlOptionId::CLASS:
aClass = rOption.GetString();
break;
- case HTML_O_NAME:
+ case HtmlOptionId::NAME:
aName = rOption.GetString();
break;
- case HTML_O_SRC:
+ case HtmlOptionId::SRC:
if( aURL.isEmpty() )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list