Skip to content

C
core
Kaydet (Commit) 4dd65f86 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert InternationalKeyCode to scoped enum 

Change-Id: I2eba99ebb86003f1f5ddefafb4cd191b29853819
üst 6a9046d0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 121 deletions
connectivity/source/parse/sqlbison.y
Dosyayı görüntüle @ 4dd65f86
......@@ -4333,31 +4333,31 @@ OString OParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const
OString aKeyword;
switch (_eKey)
{
case KEY_LIKE: aKeyword = "LIKE"; break;
case KEY_NOT: aKeyword = "NOT"; break;
case KEY_NULL: aKeyword = "NULL"; break;
case KEY_TRUE: aKeyword = "True"; break;
case KEY_FALSE: aKeyword = "False"; break;
case KEY_IS: aKeyword = "IS"; break;
case KEY_BETWEEN: aKeyword = "BETWEEN"; break;
case KEY_OR: aKeyword = "OR"; break;
case KEY_AND: aKeyword = "AND"; break;
case KEY_AVG: aKeyword = "AVG"; break;
case KEY_COUNT: aKeyword = "COUNT"; break;
case KEY_MAX: aKeyword = "MAX"; break;
case KEY_MIN: aKeyword = "MIN"; break;
case KEY_SUM: aKeyword = "SUM"; break;
case KEY_EVERY: aKeyword = "EVERY"; break;
case KEY_ANY: aKeyword = "ANY"; break;
case KEY_SOME: aKeyword = "SOME"; break;
case KEY_STDDEV_POP: aKeyword = "STDDEV_POP"; break;
case KEY_STDDEV_SAMP: aKeyword = "STDDEV_SAMP"; break;
case KEY_VAR_SAMP: aKeyword = "VAR_SAMP"; break;
case KEY_VAR_POP: aKeyword = "VAR_POP"; break;
case KEY_COLLECT: aKeyword = "COLLECT"; break;
case KEY_FUSION: aKeyword = "FUSION"; break;
case KEY_INTERSECTION:aKeyword = "INTERSECTION"; break;
case KEY_NONE: break;
case InternationalKeyCode::Like: aKeyword = "LIKE"; break;
case InternationalKeyCode::Not: aKeyword = "NOT"; break;
case InternationalKeyCode::Null: aKeyword = "NULL"; break;
case InternationalKeyCode::True: aKeyword = "True"; break;
case InternationalKeyCode::False: aKeyword = "False"; break;
case InternationalKeyCode::Is: aKeyword = "IS"; break;
case InternationalKeyCode::Between: aKeyword = "BETWEEN"; break;
case InternationalKeyCode::Or: aKeyword = "OR"; break;
case InternationalKeyCode::And: aKeyword = "AND"; break;
case InternationalKeyCode::Avg: aKeyword = "AVG"; break;
case InternationalKeyCode::Count: aKeyword = "COUNT"; break;
case InternationalKeyCode::Max: aKeyword = "MAX"; break;
case InternationalKeyCode::Min: aKeyword = "MIN"; break;
case InternationalKeyCode::Sum: aKeyword = "SUM"; break;
case InternationalKeyCode::Every: aKeyword = "EVERY"; break;
case InternationalKeyCode::Any: aKeyword = "ANY"; break;
case InternationalKeyCode::Some: aKeyword = "SOME"; break;
case InternationalKeyCode::StdDevPop: aKeyword = "STDDEV_POP"; break;
case InternationalKeyCode::StdDevSamp: aKeyword = "STDDEV_SAMP"; break;
case InternationalKeyCode::VarSamp: aKeyword = "VAR_SAMP"; break;
case InternationalKeyCode::VarPop: aKeyword = "VAR_POP"; break;
case InternationalKeyCode::Collect: aKeyword = "COLLECT"; break;
case InternationalKeyCode::Fusion: aKeyword = "FUSION"; break;
case InternationalKeyCode::Intersection:aKeyword = "INTERSECTION"; break;
case InternationalKeyCode::None: break;
default:
OSL_FAIL( "OParseContext::getIntlKeywordAscii: unknown key!" );
break;
......@@ -4370,12 +4370,12 @@ IParseContext::InternationalKeyCode OParseContext::getIntlKeyCode(const OString&
{
static IParseContext::InternationalKeyCode Intl_TokenID[] =
{
KEY_LIKE, KEY_NOT, KEY_NULL, KEY_TRUE,
KEY_FALSE, KEY_IS, KEY_BETWEEN, KEY_OR,
KEY_AND, KEY_AVG, KEY_COUNT, KEY_MAX,
KEY_MIN, KEY_SUM, KEY_EVERY,KEY_ANY,KEY_SOME,
KEY_STDDEV_POP,KEY_STDDEV_SAMP,KEY_VAR_SAMP,
KEY_VAR_POP,KEY_COLLECT,KEY_FUSION,KEY_INTERSECTION
InternationalKeyCode::Like, InternationalKeyCode::Not, InternationalKeyCode::Null, InternationalKeyCode::True,
InternationalKeyCode::False, InternationalKeyCode::Is, InternationalKeyCode::Between, InternationalKeyCode::Or,
InternationalKeyCode::And, InternationalKeyCode::Avg, InternationalKeyCode::Count, InternationalKeyCode::Max,
InternationalKeyCode::Min, InternationalKeyCode::Sum, InternationalKeyCode::Every,InternationalKeyCode::Any,InternationalKeyCode::Some,
InternationalKeyCode::StdDevPop,InternationalKeyCode::StdDevSamp,InternationalKeyCode::VarSamp,
InternationalKeyCode::VarPop,InternationalKeyCode::Collect,InternationalKeyCode::Fusion,InternationalKeyCode::Intersection
};
sal_uInt32 nCount = SAL_N_ELEMENTS( Intl_TokenID );
......@@ -4386,7 +4386,7 @@ IParseContext::InternationalKeyCode OParseContext::getIntlKeyCode(const OString&
return Intl_TokenID[i];
}
return KEY_NONE;
return InternationalKeyCode::None;
}
......@@ -4612,25 +4612,25 @@ OString OSQLParser::TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pCont
OString aStr;
if (pContext)
{
IParseContext::InternationalKeyCode eKeyCode = IParseContext::KEY_NONE;
IParseContext::InternationalKeyCode eKeyCode = IParseContext::InternationalKeyCode::None;
switch( nTokenID )
{
case SQL_TOKEN_LIKE: eKeyCode = IParseContext::KEY_LIKE; break;
case SQL_TOKEN_NOT: eKeyCode = IParseContext::KEY_NOT; break;
case SQL_TOKEN_NULL: eKeyCode = IParseContext::KEY_NULL; break;
case SQL_TOKEN_TRUE: eKeyCode = IParseContext::KEY_TRUE; break;
case SQL_TOKEN_FALSE: eKeyCode = IParseContext::KEY_FALSE; break;
case SQL_TOKEN_IS: eKeyCode = IParseContext::KEY_IS; break;
case SQL_TOKEN_BETWEEN: eKeyCode = IParseContext::KEY_BETWEEN; break;
case SQL_TOKEN_OR: eKeyCode = IParseContext::KEY_OR; break;
case SQL_TOKEN_AND: eKeyCode = IParseContext::KEY_AND; break;
case SQL_TOKEN_AVG: eKeyCode = IParseContext::KEY_AVG; break;
case SQL_TOKEN_COUNT: eKeyCode = IParseContext::KEY_COUNT; break;
case SQL_TOKEN_MAX: eKeyCode = IParseContext::KEY_MAX; break;
case SQL_TOKEN_MIN: eKeyCode = IParseContext::KEY_MIN; break;
case SQL_TOKEN_SUM: eKeyCode = IParseContext::KEY_SUM; break;
}
if ( eKeyCode != IParseContext::KEY_NONE )
case SQL_TOKEN_LIKE: eKeyCode = IParseContext::InternationalKeyCode::Like; break;
case SQL_TOKEN_NOT: eKeyCode = IParseContext::InternationalKeyCode::Not; break;
case SQL_TOKEN_NULL: eKeyCode = IParseContext::InternationalKeyCode::Null; break;
case SQL_TOKEN_TRUE: eKeyCode = IParseContext::InternationalKeyCode::True; break;
case SQL_TOKEN_FALSE: eKeyCode = IParseContext::InternationalKeyCode::False; break;
case SQL_TOKEN_IS: eKeyCode = IParseContext::InternationalKeyCode::Is; break;
case SQL_TOKEN_BETWEEN: eKeyCode = IParseContext::InternationalKeyCode::Between; break;
case SQL_TOKEN_OR: eKeyCode = IParseContext::InternationalKeyCode::Or; break;
case SQL_TOKEN_AND: eKeyCode = IParseContext::InternationalKeyCode::And; break;
case SQL_TOKEN_AVG: eKeyCode = IParseContext::InternationalKeyCode::Avg; break;
case SQL_TOKEN_COUNT: eKeyCode = IParseContext::InternationalKeyCode::Count; break;
case SQL_TOKEN_MAX: eKeyCode = IParseContext::InternationalKeyCode::Max; break;
case SQL_TOKEN_MIN: eKeyCode = IParseContext::InternationalKeyCode::Min; break;
case SQL_TOKEN_SUM: eKeyCode = IParseContext::InternationalKeyCode::Sum; break;
}
if ( eKeyCode != IParseContext::InternationalKeyCode::None )
aStr = pContext->getIntlKeywordAscii(eKeyCode);
}
......
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
Dosyayı görüntüle @ 4dd65f86
......@@ -173,18 +173,18 @@ void OSelectionBrowseBox::initialize()
if(xConnection.is())
{
const IParseContext& rContext = static_cast<OQueryController&>(getDesignView()->getController()).getParser().getContext();
IParseContext::InternationalKeyCode eFunctions[] = { IParseContext::KEY_AVG,IParseContext::KEY_COUNT,IParseContext::KEY_MAX
,IParseContext::KEY_MIN,IParseContext::KEY_SUM
,IParseContext::KEY_EVERY
,IParseContext::KEY_ANY
,IParseContext::KEY_SOME
,IParseContext::KEY_STDDEV_POP
,IParseContext::KEY_STDDEV_SAMP
,IParseContext::KEY_VAR_SAMP
,IParseContext::KEY_VAR_POP
,IParseContext::KEY_COLLECT
,IParseContext::KEY_FUSION
,IParseContext::KEY_INTERSECTION
IParseContext::InternationalKeyCode eFunctions[] = { IParseContext::InternationalKeyCode::Avg,IParseContext::InternationalKeyCode::Count,IParseContext::InternationalKeyCode::Max
,IParseContext::InternationalKeyCode::Min,IParseContext::InternationalKeyCode::Sum
,IParseContext::InternationalKeyCode::Every
,IParseContext::InternationalKeyCode::Any
,IParseContext::InternationalKeyCode::Some
,IParseContext::InternationalKeyCode::StdDevPop
,IParseContext::InternationalKeyCode::StdDevSamp
,IParseContext::InternationalKeyCode::VarSamp
,IParseContext::InternationalKeyCode::VarPop
,IParseContext::InternationalKeyCode::Collect
,IParseContext::InternationalKeyCode::Fusion
,IParseContext::InternationalKeyCode::Intersection
};
OUString sGroup = m_aFunctionStrings.getToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';') - 1, ';');
......
include/connectivity/IParseContext.hxx
Dosyayı görüntüle @ 4dd65f86
......@@ -51,33 +51,33 @@ namespace connectivity
InvalidQueryExist // "The database already contains a query with name \"#\".";
};
enum InternationalKeyCode
enum class InternationalKeyCode
{
KEY_NONE = 0,
KEY_LIKE,
KEY_NOT,
KEY_NULL,
KEY_TRUE,
KEY_FALSE,
KEY_IS,
KEY_BETWEEN,
KEY_OR,
KEY_AND,
KEY_AVG,
KEY_COUNT,
KEY_MAX,
KEY_MIN,
KEY_SUM,
KEY_EVERY,
KEY_ANY,
KEY_SOME,
KEY_STDDEV_POP,
KEY_STDDEV_SAMP,
KEY_VAR_SAMP,
KEY_VAR_POP,
KEY_COLLECT,
KEY_FUSION,
KEY_INTERSECTION
None = 0,
Like,
Not,
Null,
True,
False,
Is,
Between,
Or,
And,
Avg,
Count,
Max,
Min,
Sum,
Every,
Any,
Some,
StdDevPop,
StdDevSamp,
VarSamp,
VarPop,
Collect,
Fusion,
Intersection
};
public:
......
svx/source/form/ParseContext.cxx
Dosyayı görüntüle @ 4dd65f86
......@@ -81,31 +81,31 @@ OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) con
size_t nIndex = 0;
switch ( _eKey )
{
case KEY_LIKE: nIndex = 0; break;
case KEY_NOT: nIndex = 1; break;
case KEY_NULL: nIndex = 2; break;
case KEY_TRUE: nIndex = 3; break;
case KEY_FALSE: nIndex = 4; break;
case KEY_IS: nIndex = 5; break;
case KEY_BETWEEN: nIndex = 6; break;
case KEY_OR: nIndex = 7; break;
case KEY_AND: nIndex = 8; break;
case KEY_AVG: nIndex = 9; break;
case KEY_COUNT: nIndex = 10; break;
case KEY_MAX: nIndex = 11; break;
case KEY_MIN: nIndex = 12; break;
case KEY_SUM: nIndex = 13; break;
case KEY_EVERY: nIndex = 14; break;
case KEY_ANY: nIndex = 15; break;
case KEY_SOME: nIndex = 16; break;
case KEY_STDDEV_POP: nIndex = 17; break;
case KEY_STDDEV_SAMP: nIndex = 18; break;
case KEY_VAR_SAMP: nIndex = 19; break;
case KEY_VAR_POP: nIndex = 20; break;
case KEY_COLLECT: nIndex = 21; break;
case KEY_FUSION: nIndex = 22; break;
case KEY_INTERSECTION: nIndex = 23; break;
case KEY_NONE:
case InternationalKeyCode::Like: nIndex = 0; break;
case InternationalKeyCode::Not: nIndex = 1; break;
case InternationalKeyCode::Null: nIndex = 2; break;
case InternationalKeyCode::True: nIndex = 3; break;
case InternationalKeyCode::False: nIndex = 4; break;
case InternationalKeyCode::Is: nIndex = 5; break;
case InternationalKeyCode::Between: nIndex = 6; break;
case InternationalKeyCode::Or: nIndex = 7; break;
case InternationalKeyCode::And: nIndex = 8; break;
case InternationalKeyCode::Avg: nIndex = 9; break;
case InternationalKeyCode::Count: nIndex = 10; break;
case InternationalKeyCode::Max: nIndex = 11; break;
case InternationalKeyCode::Min: nIndex = 12; break;
case InternationalKeyCode::Sum: nIndex = 13; break;
case InternationalKeyCode::Every: nIndex = 14; break;
case InternationalKeyCode::Any: nIndex = 15; break;
case InternationalKeyCode::Some: nIndex = 16; break;
case InternationalKeyCode::StdDevPop: nIndex = 17; break;
case InternationalKeyCode::StdDevSamp: nIndex = 18; break;
case InternationalKeyCode::VarSamp: nIndex = 19; break;
case InternationalKeyCode::VarPop: nIndex = 20; break;
case InternationalKeyCode::Collect: nIndex = 21; break;
case InternationalKeyCode::Fusion: nIndex = 22; break;
case InternationalKeyCode::Intersection: nIndex = 23; break;
case InternationalKeyCode::None:
OSL_FAIL( "OSystemParseContext::getIntlKeywordAscii: illegal argument!" );
break;
}
......@@ -123,13 +123,13 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OS
{
static const IParseContext::InternationalKeyCode Intl_TokenID[] =
{
KEY_LIKE, KEY_NOT, KEY_NULL, KEY_TRUE,
KEY_FALSE, KEY_IS, KEY_BETWEEN, KEY_OR,
KEY_AND, KEY_AVG, KEY_COUNT, KEY_MAX,
KEY_MIN, KEY_SUM, KEY_EVERY,
KEY_ANY, KEY_SOME, KEY_STDDEV_POP,
KEY_STDDEV_SAMP, KEY_VAR_SAMP, KEY_VAR_POP,
KEY_COLLECT, KEY_FUSION, KEY_INTERSECTION
InternationalKeyCode::Like, InternationalKeyCode::Not, InternationalKeyCode::Null, InternationalKeyCode::True,
InternationalKeyCode::False, InternationalKeyCode::Is, InternationalKeyCode::Between, InternationalKeyCode::Or,
InternationalKeyCode::And, InternationalKeyCode::Avg, InternationalKeyCode::Count, InternationalKeyCode::Max,
InternationalKeyCode::Min, InternationalKeyCode::Sum, InternationalKeyCode::Every,
InternationalKeyCode::Any, InternationalKeyCode::Some, InternationalKeyCode::StdDevPop,
InternationalKeyCode::StdDevSamp, InternationalKeyCode::VarSamp, InternationalKeyCode::VarPop,
InternationalKeyCode::Collect, InternationalKeyCode::Fusion, InternationalKeyCode::Intersection
};
sal_uInt32 nCount = sizeof Intl_TokenID / sizeof Intl_TokenID[0];
......@@ -140,7 +140,7 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OS
return Intl_TokenID[i];
}
return KEY_NONE;
return InternationalKeyCode::None;
}
......
svx/source/form/formcontroller.cxx
Dosyayı görüntüle @ 4dd65f86
......@@ -3167,7 +3167,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
{
OUString aCompText = aRow[(*iter).xText];
aCompText += " ";
OString aVal = m_pParser->getContext().getIntlKeywordAscii(IParseContext::KEY_AND);
OString aVal = m_pParser->getContext().getIntlKeywordAscii(IParseContext::InternationalKeyCode::And);
aCompText += OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US);
aCompText += " ";
aCompText += ::comphelper::getString(pRefValues[j].Value);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment