diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-06-08 13:11:19 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-06-08 13:11:19 +0200 |
| commit | 15feadfb84a9dc9942a53c91b0fadfbe756153cd (patch) | |
| tree | 0bc3be4567000037622e2cbdc1eccb2b0076ae94 /connectivity | |
| parent | 601ba26cb5737970e7e9a173515bb21ebde55db9 (diff) | |
Revert "loplugin:staticmethods"
This reverts commit 81d82b78a107f2e6c14d6fbdf0d97c8e6cc8b0bd.
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/parse/sqlflex.l | 10 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index be7401059177..1e50927282bd 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -788,11 +788,11 @@ IParseContext::InternationalKeyCode OSQLScanner::getInternationalTokenID(const s return (m_bInternational) ? m_pContext->getIntlKeyCode(::rtl::OString(sToken) ) : IParseContext::KEY_NONE; } // ------------------------------------------------------------------------- -sal_Int32 OSQLScanner::GetGERRule() { return PREDICATE_GER; } -sal_Int32 OSQLScanner::GetENGRule() { return PREDICATE_ENG; } -sal_Int32 OSQLScanner::GetSQLRule() { return SQL; } -sal_Int32 OSQLScanner::GetDATERule() { return DATE; } -sal_Int32 OSQLScanner::GetSTRINGRule() { return STRING; } +sal_Int32 OSQLScanner::GetGERRule() const { return PREDICATE_GER; } +sal_Int32 OSQLScanner::GetENGRule() const { return PREDICATE_ENG; } +sal_Int32 OSQLScanner::GetSQLRule() const { return SQL; } +sal_Int32 OSQLScanner::GetDATERule() const { return DATE; } +sal_Int32 OSQLScanner::GetSTRINGRule() const { return STRING; } // ------------------------------------------------------------------------- void OSQLScanner::setScanner(bool _bNull) { diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index d33502718361..5144ea8dfa70 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -1238,24 +1238,24 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString case DataType::DATE: case DataType::TIME: case DataType::TIMESTAMP: - s_pScanner->SetRule(OSQLScanner::GetDATERule()); + s_pScanner->SetRule(s_pScanner->GetDATERule()); break; case DataType::CHAR: case DataType::VARCHAR: case DataType::LONGVARCHAR: case DataType::CLOB: - s_pScanner->SetRule(OSQLScanner::GetSTRINGRule()); + s_pScanner->SetRule(s_pScanner->GetSTRINGRule()); break; default: if ( s_xLocaleData->getLocaleItem( m_pData->aLocale ).decimalSeparator.toChar() == ',' ) - s_pScanner->SetRule(OSQLScanner::GetGERRule()); + s_pScanner->SetRule(s_pScanner->GetGERRule()); else - s_pScanner->SetRule(OSQLScanner::GetENGRule()); + s_pScanner->SetRule(s_pScanner->GetENGRule()); } } else - s_pScanner->SetRule(OSQLScanner::GetSQLRule()); + s_pScanner->SetRule(s_pScanner->GetSQLRule()); s_pScanner->prepareScan(rStatement, m_pContext, true); |