diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 19:05:06 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 19:05:06 -0500 |
| commit | a7d4a73b5e8aa8cdaf8f9bb7ab834adaca1e6d66 (patch) | |
| tree | d37ca7345fc837bfa911f334718eac19d524adb4 /connectivity/source/parse | |
| parent | bfa906144f16324d5bcce9eb742950eff7621702 (diff) | |
targeted string re-work
Change-Id: I2124610768910ff147ca6496b178c91ea90b48ac
Diffstat (limited to 'connectivity/source/parse')
| -rwxr-xr-x | connectivity/source/parse/sqlbison.y | 10 | ||||
| -rwxr-xr-x | connectivity/source/parse/sqlflex.l | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index b1709562823c..bf576519e85e 100755 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -4485,8 +4485,8 @@ IParseContext::InternationalKeyCode OParseContext::getIntlKeyCode(const ::rtl::O static Locale& impl_getLocaleInstance( ) { static Locale s_aLocale( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "en" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "US" ) ), + ::rtl::OUString( "en" ), + ::rtl::OUString( "US" ), ::rtl::OUString( ) ); return s_aLocale; @@ -4832,7 +4832,7 @@ sal_Int16 OSQLParser::buildStringNodes(OSQLParseNode*& pLiteral) //----------------------------------------------------------------------------- sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral) { - OSQLParseNode* pComp = new OSQLInternalNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")), SQL_NODE_EQUAL); + OSQLParseNode* pComp = new OSQLInternalNode(::rtl::OUString("="), SQL_NODE_EQUAL); return buildPredicateRule(pAppend,pLiteral,pComp); } @@ -4861,7 +4861,7 @@ void OSQLParser::error(const sal_Char *fmt) if(!m_sErrorMessage.getLength()) { ::rtl::OUString sStr(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8); - ::rtl::OUString sSQL_TOKEN(RTL_CONSTASCII_USTRINGPARAM("SQL_TOKEN_")); + ::rtl::OUString sSQL_TOKEN("SQL_TOKEN_"); sal_Int32 nPos1 = sStr.indexOf(sSQL_TOKEN); if(nPos1 != -1) @@ -4885,7 +4885,7 @@ void OSQLParser::error(const sal_Char *fmt) ::rtl::OUString aError = s_pScanner->getErrorMessage(); if(aError.getLength()) { - m_sErrorMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", ")); + m_sErrorMessage += ::rtl::OUString(", "); m_sErrorMessage += aError; } } diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index 0bb1bb1b3493..b3562a8403a8 100755 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -732,8 +732,8 @@ void OSQLScanner::SQLyyerror(sal_Char *fmt) m_sErrorMessage = ::rtl::OUString(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8); if (m_nCurrentPos < m_sStatement.getLength()) { - m_sErrorMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")); - + m_sErrorMessage += ::rtl::OUString(": "); + ::rtl::OUString aError; static sal_Int32 BUFFERSIZE = 256; static sal_Char* Buffer = 0; |