summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-24 16:25:57 +0200
committerNoel Grandin <noel@peralex.com>2016-02-25 13:50:25 +0200
commit4dd65f861d3179538b58512a10c6c9482d85d0ee (patch)
treee7513f5661b041c5b3b4b773de6fd5eca4781756 /svx
parent6a9046d02e17a7dd0997aa3a041d468be9d8f80b (diff)
convert InternationalKeyCode to scoped enum
Change-Id: I2eba99ebb86003f1f5ddefafb4cd191b29853819
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/ParseContext.cxx66
-rw-r--r--svx/source/form/formcontroller.cxx2
2 files changed, 34 insertions, 34 deletions
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index b052a8a30deb..37502f11eee9 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -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;
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index efa5b3892bb5..238c26503391 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -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);