connectivity/source/commontools/dbexception.cxx | 42 ++++++++++++------------ 1 file changed, 21 insertions(+), 21 deletions(-)
New commits: commit 9f46834fbfa73a53536a336fa8f1fb6fff3bfbf9 Author: Andrzej J.R. Hunt <andr...@ahunt.org> Date: Thu Sep 12 19:55:37 2013 +0100 Explicitly wrap char as OUString. Currently this causes some (all?) gcc to break. Change-Id: If6d802f5a763904d06107fa99731dd4512f18052 diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index 87e8d50..6b774ad 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -468,27 +468,27 @@ OUString getStandardSQLState( StandardSQLState _eState ) { switch ( _eState ) { - case SQL_WRONG_PARAMETER_NUMBER: return "07001"; - case SQL_INVALID_DESCRIPTOR_INDEX: return "07009"; - case SQL_UNABLE_TO_CONNECT: return "08001"; - case SQL_NUMERIC_OUT_OF_RANGE: return "22003"; - case SQL_INVALID_DATE_TIME: return "22007"; - case SQL_INVALID_CURSOR_STATE: return "24000"; - case SQL_TABLE_OR_VIEW_EXISTS: return "42S01"; - case SQL_TABLE_OR_VIEW_NOT_FOUND: return "42S02"; - case SQL_INDEX_ESISTS: return "42S11"; - case SQL_INDEX_NOT_FOUND: return "42S12"; - case SQL_COLUMN_EXISTS: return "42S21"; - case SQL_COLUMN_NOT_FOUND: return "42S22"; - case SQL_GENERAL_ERROR: return "HY000"; - case SQL_INVALID_SQL_DATA_TYPE: return "HY004"; - case SQL_OPERATION_CANCELED: return "HY008"; - case SQL_FUNCTION_SEQUENCE_ERROR: return "HY010"; - case SQL_INVALID_CURSOR_POSITION: return "HY109"; - case SQL_INVALID_BOOKMARK_VALUE: return "HY111"; - case SQL_FEATURE_NOT_IMPLEMENTED: return "HYC00"; - case SQL_FUNCTION_NOT_SUPPORTED: return "IM001"; - case SQL_CONNECTION_DOES_NOT_EXIST: return "08003"; + case SQL_WRONG_PARAMETER_NUMBER: return OUString("07001"); + case SQL_INVALID_DESCRIPTOR_INDEX: return OUString("07009"); + case SQL_UNABLE_TO_CONNECT: return OUString("08001"); + case SQL_NUMERIC_OUT_OF_RANGE: return OUString("22003"); + case SQL_INVALID_DATE_TIME: return OUString("22007"); + case SQL_INVALID_CURSOR_STATE: return OUString("24000"); + case SQL_TABLE_OR_VIEW_EXISTS: return OUString("42S01"); + case SQL_TABLE_OR_VIEW_NOT_FOUND: return OUString("42S02"); + case SQL_INDEX_ESISTS: return OUString("42S11"); + case SQL_INDEX_NOT_FOUND: return OUString("42S12"); + case SQL_COLUMN_EXISTS: return OUString("42S21"); + case SQL_COLUMN_NOT_FOUND: return OUString("42S22"); + case SQL_GENERAL_ERROR: return OUString("HY000"); + case SQL_INVALID_SQL_DATA_TYPE: return OUString("HY004"); + case SQL_OPERATION_CANCELED: return OUString("HY008"); + case SQL_FUNCTION_SEQUENCE_ERROR: return OUString("HY010"); + case SQL_INVALID_CURSOR_POSITION: return OUString("HY109"); + case SQL_INVALID_BOOKMARK_VALUE: return OUString("HY111"); + case SQL_FEATURE_NOT_IMPLEMENTED: return OUString("HYC00"); + case SQL_FUNCTION_NOT_SUPPORTED: return OUString("IM001"); + case SQL_CONNECTION_DOES_NOT_EXIST: return OUString("08003"); default: break; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits