[Libreoffice-commits] core.git: connectivity/source include/connectivity svx/source

[Lionel Elie Mamane]

 connectivity/source/parse/sqlbison.y      |    2 +-
 connectivity/source/parse/sqliterator.cxx |    4 ++--
 include/connectivity/IParseContext.hxx    |    4 ++--
 svx/source/form/ParseContext.cxx          |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 325ce86b56131f1e874e8cb2c5948fed719afe07
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Sep 26 16:26:22 2014 +0200

    fix build & better name for ERROR_INVALID_TABLE
    
    Change-Id: Ic7253575859766f18869159e4a8dd6b3d715850d

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 4d8039d..89b524c 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4329,7 +4329,7 @@ OUString OParseContext::getErrorMessage(ErrorCode _eCode) const
 		case ERROR_INVALID_INT_COMPARE:		aMsg = "The field can not be compared with a number."; break;
 		case ERROR_INVALID_DATE_COMPARE:	aMsg = "The field can not be compared with a date."; break;
 		case ERROR_INVALID_REAL_COMPARE:	aMsg = "The field can not be compared with a floating point number."; break;
-		case ERROR_INVALID_TABLE1:			aMsg = "The database does not contain a table named \"#\"."; break;
+		case ERROR_INVALID_TABLE_NOSUCH:			aMsg = "The database does not contain a table named \"#\"."; break;
 		case ERROR_INVALID_TABLE_OR_QUERY:  aMsg = "The database does contain neither a table nor a query named \"#\"."; break;
 		case ERROR_INVALID_COLUMN:			aMsg = "The column \"#1\" is unknown in the table \"#2\"."; break;
 		case ERROR_INVALID_TABLE_EXIST:		aMsg = "The database already contains a table or view with name \"#\"."; break;
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 99cb341..d8fd801 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -416,13 +416,13 @@ OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const OUString& _rComp
                     // m_xQueryContainer would not have been set), so emit a better error message
                     impl_appendError( IParseContext::ERROR_INVALID_TABLE_OR_QUERY, &sName );
                 else
-                    impl_appendError( IParseContext::ERROR_INVALID_TABLE1, &sName );
+                    impl_appendError( IParseContext::ERROR_INVALID_NOSUCH, &sName );
             }
         }
     }
     catch(Exception&)
     {
-        impl_appendError( IParseContext::ERROR_INVALID_TABLE1, &sComposedName );
+        impl_appendError( IParseContext::ERROR_INVALID_TABLE_NOSUCH, &sComposedName );
     }
 
     return aReturn;
diff --git a/include/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx
index a012932..078ae89 100644
--- a/include/connectivity/IParseContext.hxx
+++ b/include/connectivity/IParseContext.hxx
@@ -43,12 +43,12 @@ namespace connectivity
             ERROR_INVALID_INT_COMPARE,      // "The field can not be compared with a number."
             ERROR_INVALID_DATE_COMPARE,     // "The field can not be compared with a date."
             ERROR_INVALID_REAL_COMPARE,     // "The field can not be compared with a floating point number."
-            ERROR_INVALID_TABLE1,           // "The database does not contain a table named \"#\"."
+            ERROR_INVALID_TABLE_NOSUCH,     // "The database does not contain a table named \"#\"."
                                             // Named like this to avoid conflict with a #define in the Windows system ODBC headers.
             ERROR_INVALID_TABLE_OR_QUERY,   // "The database does contain neither a table nor a query named \"#\"."
             ERROR_INVALID_COLUMN,           // "The column \"#1\" is unknown in the table \"#2\"."
             ERROR_INVALID_TABLE_EXIST,      // "The database already contains a table or view with name \"#\"."
-            ERROR_INVALID_QUERY_EXIST,       // "The database already contains a query with name \"#\".";
+            ERROR_INVALID_QUERY_EXIST       // "The database already contains a query with name \"#\".";
         };
 
         enum    InternationalKeyCode
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 9c3c760..0ea76ae 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -65,7 +65,7 @@ OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const
         case ERROR_INVALID_INT_COMPARE:     aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break;
         case ERROR_INVALID_DATE_COMPARE:    aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break;
         case ERROR_INVALID_REAL_COMPARE:    aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break;
-        case ERROR_INVALID_TABLE1:           aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE); break;
+        case ERROR_INVALID_TABLE_NOSUCH:    aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE); break;
         case ERROR_INVALID_TABLE_OR_QUERY:  aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY); break;
         case ERROR_INVALID_COLUMN:          aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_COLUMN); break;
         case ERROR_INVALID_TABLE_EXIST:     aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS); break;