mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings in sqlflex.l, sqlbison.y

Browse Source 
Change-Id: I6c6b9452014940e09f8f4b7466c5a5f562c9fff5
This commit is contained in:
Stephan Bergmann
2013-10-02 16:27:26 +02:00
parent 205641f375
commit abb6ab4145
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
connectivity/source/parse/sqlbison.y
View File

@@ -4348,10 +4348,6 @@ IMPLEMENT_CONSTASCII_STRING(KEY_STR_COLLECT, "COLLECT");
IMPLEMENT_CONSTASCII_STRING(KEY_STR_FUSION, "FUSION"); IMPLEMENT_CONSTASCII_STRING(KEY_STR_FUSION, "FUSION");
IMPLEMENT_CONSTASCII_STRING(KEY_STR_INTERSECTION, "INTERSECTION"); IMPLEMENT_CONSTASCII_STRING(KEY_STR_INTERSECTION, "INTERSECTION");
IMPLEMENT_CONSTASCII_STRING(FIELD_STR_NULLDATE, "NullDate");
IMPLEMENT_CONSTASCII_STRING(STR_SQL_TOKEN, "SQL_TOKEN_");
//========================================================================== //==========================================================================
//= OParseContext //= OParseContext
//========================================================================== //==========================================================================
@@ -4675,7 +4671,7 @@ OSQLParseNode* OSQLParser::parseTree(::rtl::OUString& rErrorMessage,
// to work around a bug in MKS YACC return the member m_pParseTree // to work around a bug in MKS YACC return the member m_pParseTree
// instead of Sdbyyval.pParseNode // instead of Sdbyyval.pParseNode
SAL_WARN_IF(!m_pParseTree, "connectivity", SAL_WARN_IF(!m_pParseTree, "connectivity.parse",
"OSQLParser: Parser did not create ParseTree"); "OSQLParser: Parser did not create ParseTree");
return m_pParseTree; return m_pParseTree;
} }

2
connectivity/source/parse/sqlflex.l
View File

@@ -708,7 +708,7 @@ OSQLScanner::~OSQLScanner()
{ {
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void OSQLScanner::SQLyyerror(sal_Char *fmt) void OSQLScanner::SQLyyerror(char const *fmt)
{ {
if(IN_SQLyyerror) if(IN_SQLyyerror)

2
include/connectivity/sqlscan.hxx
View File

@@ -54,7 +54,7 @@ namespace connectivity
{ } { }
virtual sal_Int32 SQLyygetc(void); virtual sal_Int32 SQLyygetc(void);
virtual void SQLyyerror(char *fmt); virtual void SQLyyerror(char const *fmt);
virtual void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); } virtual void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); }
virtual void ECHO(void) { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); } virtual void ECHO(void) { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); }
virtual IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const; virtual IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const;