Skip to content

C
core
Kaydet (Commit) 7a6fd503 authored tarafından Andrzej J.R. Hunt's avatar Andrzej J.R. Hunt Kaydeden (comit) Fridrich Strba
Dosyalara gözat
Seçenekler

Remove sal_char* from dbexception and some cleanup. 

Change-Id: I81909e4542bd5e8d1f8ae182c3c17f9bbea9745d
Reviewed-on: https://gerrit.libreoffice.org/5881Reviewed-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
Tested-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
üst b291852c
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 117 deletions
connectivity/source/commontools/dbexception.cxx
Dosyayı görüntüle @ 7a6fd503
...@@ -198,12 +198,12 @@ SQLExceptionInfo::operator const ::com::sun::star::sdb::SQLContext*() const ...@@ -198,12 +198,12 @@ SQLExceptionInfo::operator const ::com::sun::star::sdb::SQLContext*() const
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void SQLExceptionInfo::prepend( const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode ) void SQLExceptionInfo::prepend( const OUString& _rErrorMessage, const OUString& _rSQLState, const sal_Int32 _nErrorCode )
{ {
SQLException aException; SQLException aException;
aException.Message = _rErrorMessage; aException.Message = _rErrorMessage;
aException.ErrorCode = _nErrorCode; aException.ErrorCode = _nErrorCode;
aException.SQLState = _pAsciiSQLState ? OUString::createFromAscii( _pAsciiSQLState ) : OUString("S1000" ); aException.SQLState = !_rSQLState.isEmpty() ? _rSQLState : "S1000";
aException.NextException = m_aContent; aException.NextException = m_aContent;
m_aContent <<= aException; m_aContent <<= aException;
...@@ -211,7 +211,7 @@ void SQLExceptionInfo::prepend( const OUString& _rErrorMessage, const sal_Char* ...@@ -211,7 +211,7 @@ void SQLExceptionInfo::prepend( const OUString& _rErrorMessage, const sal_Char*
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode ) void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, const OUString& _rSQLState, const sal_Int32 _nErrorCode )
{ {
// create the to-be-appended exception // create the to-be-appended exception
Any aAppend; Any aAppend;
...@@ -227,7 +227,7 @@ void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, cons ...@@ -227,7 +227,7 @@ void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, cons
SQLException* pAppendException( static_cast< SQLException* >( const_cast< void* >( aAppend.getValue() ) ) ); SQLException* pAppendException( static_cast< SQLException* >( const_cast< void* >( aAppend.getValue() ) ) );
pAppendException->Message = _rErrorMessage; pAppendException->Message = _rErrorMessage;
pAppendException->SQLState = OUString::createFromAscii( _pAsciiSQLState ); pAppendException->SQLState = _rSQLState;
pAppendException->ErrorCode = _nErrorCode; pAppendException->ErrorCode = _nErrorCode;
// find the end of the current chain // find the end of the current chain
...@@ -386,31 +386,18 @@ void throwInvalidIndexException(const ::com::sun::star::uno::Reference< ::com::s ...@@ -386,31 +386,18 @@ void throwInvalidIndexException(const ::com::sun::star::uno::Reference< ::com::s
); );
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void throwFunctionNotSupportedException(const OUString& _rMsg, void throwFunctionNotSupportedException( const OUString& _rFunctionName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context, const ::com::sun::star::uno::Any& _rNextException ) throw ( ::com::sun::star::sdbc::SQLException )
const ::com::sun::star::uno::Any& _Next) throw ( ::com::sun::star::sdbc::SQLException )
{
throw SQLException(
_rMsg,
_Context,
getStandardSQLState( SQL_FUNCTION_NOT_SUPPORTED ),
0,
_Next
);
}
// -----------------------------------------------------------------------------
void throwFunctionNotSupportedException( const sal_Char* _pAsciiFunctionName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
const ::com::sun::star::uno::Any* _pNextException ) throw ( ::com::sun::star::sdbc::SQLException )
{ {
::connectivity::SharedResources aResources; ::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution( const OUString sError( aResources.getResourceStringWithSubstitution(
STR_UNSUPPORTED_FUNCTION, STR_UNSUPPORTED_FUNCTION,
"$functionname$", OUString::createFromAscii( _pAsciiFunctionName ) "$functionname$", _rFunctionName
) ); ) );
throwFunctionNotSupportedException( throwFunctionNotSupportedException(
sError, sError,
_rxContext, _rxContext,
_pNextException ? *_pNextException : Any() _rNextException
); );
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
...@@ -428,13 +415,13 @@ void throwGenericSQLException(const OUString& _rMsg, const Reference< XInterface ...@@ -428,13 +415,13 @@ void throwGenericSQLException(const OUString& _rMsg, const Reference< XInterface
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException ) void throwFeatureNotImplementedException( const OUString& _rFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
throw (SQLException) throw (SQLException)
{ {
::connectivity::SharedResources aResources; ::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution( const OUString sError( aResources.getResourceStringWithSubstitution(
STR_UNSUPPORTED_FEATURE, STR_UNSUPPORTED_FEATURE,
"$featurename$", OUString::createFromAscii( _pAsciiFeatureName ) "$featurename$", _rFeatureName
) ); ) );
throw SQLException( throw SQLException(
...@@ -456,80 +443,56 @@ void throwInvalidColumnException( const OUString& _rColumnName, const Reference< ...@@ -456,80 +443,56 @@ void throwInvalidColumnException( const OUString& _rColumnName, const Reference<
throwSQLException( sErrorMessage, SQL_COLUMN_NOT_FOUND, _rxContext ); throwSQLException( sErrorMessage, SQL_COLUMN_NOT_FOUND, _rxContext );
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void throwSQLException( const sal_Char* _pAsciiMessage, const sal_Char* _pAsciiState, void throwSQLException( const OUString& _rMessage, const OUString& _rSQLState,
const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException ) throw (SQLException) const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException ) throw (SQLException)
{ {
throw SQLException( throw SQLException(
OUString::createFromAscii( _pAsciiMessage ), _rMessage,
_rxContext, _rxContext,
OUString::createFromAscii( _pAsciiState ), _rSQLState,
_nErrorCode, _nErrorCode,
_pNextException ? *_pNextException : Any() _pNextException ? *_pNextException : Any()
); );
} }
// -----------------------------------------------------------------------------
void throwSQLException( const sal_Char* _pAsciiMessage, StandardSQLState _eSQLState,
const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode,
const Any* _pNextException ) throw (SQLException)
{
throwSQLException( _pAsciiMessage, getStandardSQLStateAscii( _eSQLState ), _rxContext, _nErrorCode, _pNextException );
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void throwSQLException( const OUString& _rMessage, StandardSQLState _eSQLState, void throwSQLException( const OUString& _rMessage, StandardSQLState _eSQLState,
const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode,
const Any* _pNextException ) throw (SQLException) const Any* _pNextException ) throw (SQLException)
{ {
throw SQLException( throwSQLException( _rMessage, getStandardSQLState( _eSQLState ), _rxContext, _nErrorCode, _pNextException );
_rMessage,
_rxContext,
getStandardSQLState( _eSQLState ),
_nErrorCode,
_pNextException ? *_pNextException : Any()
);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
const sal_Char* getStandardSQLStateAscii( StandardSQLState _eState ) OUString getStandardSQLState( StandardSQLState _eState )
{ {
const sal_Char* pAsciiState = NULL;
switch ( _eState ) switch ( _eState )
{ {
case SQL_WRONG_PARAMETER_NUMBER: pAsciiState = "07001"; break; case SQL_WRONG_PARAMETER_NUMBER: return "07001";
case SQL_INVALID_DESCRIPTOR_INDEX: pAsciiState = "07009"; break; case SQL_INVALID_DESCRIPTOR_INDEX: return "07009";
case SQL_UNABLE_TO_CONNECT: pAsciiState = "08001"; break; case SQL_UNABLE_TO_CONNECT: return "08001";
case SQL_NUMERIC_OUT_OF_RANGE: pAsciiState = "22003"; break; case SQL_NUMERIC_OUT_OF_RANGE: return "22003";
case SQL_INVALID_DATE_TIME: pAsciiState = "22007"; break; case SQL_INVALID_DATE_TIME: return "22007";
case SQL_INVALID_CURSOR_STATE: pAsciiState = "24000"; break; case SQL_INVALID_CURSOR_STATE: return "24000";
case SQL_TABLE_OR_VIEW_EXISTS: pAsciiState = "42S01"; break; case SQL_TABLE_OR_VIEW_EXISTS: return "42S01";
case SQL_TABLE_OR_VIEW_NOT_FOUND: pAsciiState = "42S02"; break; case SQL_TABLE_OR_VIEW_NOT_FOUND: return "42S02";
case SQL_INDEX_ESISTS: pAsciiState = "42S11"; break; case SQL_INDEX_ESISTS: return "42S11";
case SQL_INDEX_NOT_FOUND: pAsciiState = "42S12"; break; case SQL_INDEX_NOT_FOUND: return "42S12";
case SQL_COLUMN_EXISTS: pAsciiState = "42S21"; break; case SQL_COLUMN_EXISTS: return "42S21";
case SQL_COLUMN_NOT_FOUND: pAsciiState = "42S22"; break; case SQL_COLUMN_NOT_FOUND: return "42S22";
case SQL_GENERAL_ERROR: pAsciiState = "HY000"; break; case SQL_GENERAL_ERROR: return "HY000";
case SQL_INVALID_SQL_DATA_TYPE: pAsciiState = "HY004"; break; case SQL_INVALID_SQL_DATA_TYPE: return "HY004";
case SQL_OPERATION_CANCELED: pAsciiState = "HY008"; break; case SQL_OPERATION_CANCELED: return "HY008";
case SQL_FUNCTION_SEQUENCE_ERROR: pAsciiState = "HY010"; break; case SQL_FUNCTION_SEQUENCE_ERROR: return "HY010";
case SQL_INVALID_CURSOR_POSITION: pAsciiState = "HY109"; break; case SQL_INVALID_CURSOR_POSITION: return "HY109";
case SQL_INVALID_BOOKMARK_VALUE: pAsciiState = "HY111"; break; case SQL_INVALID_BOOKMARK_VALUE: return "HY111";
case SQL_FEATURE_NOT_IMPLEMENTED: pAsciiState = "HYC00"; break; case SQL_FEATURE_NOT_IMPLEMENTED: return "HYC00";
case SQL_FUNCTION_NOT_SUPPORTED: pAsciiState = "IM001"; break; case SQL_FUNCTION_NOT_SUPPORTED: return "IM001";
case SQL_CONNECTION_DOES_NOT_EXIST: pAsciiState = "08003"; break; case SQL_CONNECTION_DOES_NOT_EXIST: return "08003";
default: default:
break; break;
} }
if ( !pAsciiState )
throw RuntimeException(); throw RuntimeException();
return pAsciiState;
}
// -----------------------------------------------------------------------------
OUString getStandardSQLState( StandardSQLState _eState )
{
return OUString::createFromAscii( getStandardSQLStateAscii( _eState ) );
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
......
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
Dosyayı görüntüle @ 7a6fd503
...@@ -376,7 +376,7 @@ namespace dbaui ...@@ -376,7 +376,7 @@ namespace dbaui
void DBSubComponentController::appendError( const OUString& _rErrorMessage, const ::dbtools::StandardSQLState _eSQLState, void DBSubComponentController::appendError( const OUString& _rErrorMessage, const ::dbtools::StandardSQLState _eSQLState,
const sal_Int32 _nErrorCode ) const sal_Int32 _nErrorCode )
{ {
m_pImpl->m_aCurrentError.append( ::dbtools::SQLExceptionInfo::SQL_EXCEPTION, _rErrorMessage, getStandardSQLStateAscii( _eSQLState ), m_pImpl->m_aCurrentError.append( ::dbtools::SQLExceptionInfo::SQL_EXCEPTION, _rErrorMessage, getStandardSQLState( _eSQLState ),
_nErrorCode ); _nErrorCode );
} }
void DBSubComponentController::clearError() void DBSubComponentController::clearError()
......
include/connectivity/dbexception.hxx
Dosyayı görüntüle @ 7a6fd503
...@@ -92,12 +92,12 @@ public: ...@@ -92,12 +92,12 @@ public:
/** prepends a plain error message to the chain of exceptions /** prepends a plain error message to the chain of exceptions
@param _rSimpleErrorMessage @param _rSimpleErrorMessage
the error message to prepend the error message to prepend
@param _pAsciiSQLState @param _rSQLState
the SQLState of the to-be-constructed SQLException, or NULL if this should be defaulted to HY000 the SQLState of the to-be-constructed SQLException, or NULL if this should be defaulted to HY000
@param _nErrorCode @param _nErrorCode
the ErrorCode of the to-be-constructed SQLException the ErrorCode of the to-be-constructed SQLException
*/ */
void prepend( const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 ); void prepend( const OUString& _rErrorMessage, const OUString& _rSQLState = OUString(), const sal_Int32 _nErrorCode = 0 );
/** appends a plain message to the chain of exceptions /** appends a plain message to the chain of exceptions
@param _eType @param _eType
...@@ -105,12 +105,12 @@ public: ...@@ -105,12 +105,12 @@ public:
values, the behavior is undefined. values, the behavior is undefined.
@param _rErrorMessage @param _rErrorMessage
the message to append the message to append
@param _pAsciiSQLState @param _rSQLState
the SQLState of the exception to append the SQLState of the exception to append
@param _nErrorCode @param _nErrorCode
the error code of the exception to append the error code of the exception to append
*/ */
void append( TYPE _eType, const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 ); void append( TYPE _eType, const OUString& _rErrorMessage, const OUString& _rSQLState = OUString(), const sal_Int32 _nErrorCode = 0 );
/** throws (properly typed) the exception contained in the object /** throws (properly typed) the exception contained in the object
@precond @precond
...@@ -223,33 +223,13 @@ public: ...@@ -223,33 +223,13 @@ public:
*/ */
OOO_DLLPUBLIC_DBTOOLS OUString getStandardSQLState( StandardSQLState _eState ); OOO_DLLPUBLIC_DBTOOLS OUString getStandardSQLState( StandardSQLState _eState );
//----------------------------------------------------------------------------------
/** returns a standard ASCII string for a given SQLState
@param _eState
describes the state whose description is to retrieve. Must not be SQL_ERROR_UNSPECIFIED.
@return
a non-<NULL/> pointer to an ASCII character string denoting the requested SQLState
@raises RuntimeException
in case of an internal error
*/
OOO_DLLPUBLIC_DBTOOLS const sal_Char* getStandardSQLStateAscii( StandardSQLState _eState );
//----------------------------------------------------------------------------------
OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedException(
const OUString& _rMsg,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context,
const ::com::sun::star::uno::Any& _Next = ::com::sun::star::uno::Any()
)
throw ( ::com::sun::star::sdbc::SQLException );
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
/** throws an exception with SQL state IM001, saying that a certain function is not supported /** throws an exception with SQL state IM001, saying that a certain function is not supported
*/ */
OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedException( OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedException(
const sal_Char* _pAsciiFunctionName, const OUString& _rFunctionName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
const ::com::sun::star::uno::Any* _pNextException = NULL const ::com::sun::star::uno::Any& _rNextException = ::com::sun::star::uno::Any()
) )
throw ( ::com::sun::star::sdbc::SQLException ); throw ( ::com::sun::star::sdbc::SQLException );
...@@ -292,8 +272,8 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( ...@@ -292,8 +272,8 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
/** throw a SQLException with SQLState HYC00 (Optional feature not implemented) /** throw a SQLException with SQLState HYC00 (Optional feature not implemented)
@param _pAsciiFeatureName @param _rFeatureName
an ASCII description of the feature which is not implemented. It's recommended that the feature a description of the feature which is not implemented. It's recommended that the feature
name is built from the name of the interface plus its method, for instance "XParameters::updateBinaryStream" name is built from the name of the interface plus its method, for instance "XParameters::updateBinaryStream"
@param _rxContext @param _rxContext
the context of the exception the context of the exception
...@@ -301,7 +281,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( ...@@ -301,7 +281,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
the next exception to chain into the thrown exception, if any the next exception to chain into the thrown exception, if any
*/ */
OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedException( OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedException(
const sal_Char* _pAsciiFeatureName, const OUString& _rFeatureName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
const ::com::sun::star::uno::Any* _pNextException = NULL const ::com::sun::star::uno::Any* _pNextException = NULL
) )
...@@ -324,20 +304,8 @@ OOO_DLLPUBLIC_DBTOOLS void throwInvalidColumnException( ...@@ -324,20 +304,8 @@ OOO_DLLPUBLIC_DBTOOLS void throwInvalidColumnException(
/** throws an SQLException /** throws an SQLException
*/ */
OOO_DLLPUBLIC_DBTOOLS void throwSQLException( OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
const sal_Char* _pAsciiMessage, const OUString& _rMessage,
const sal_Char* _pAsciiState, const OUString& _rSQLState,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
const sal_Int32 _nErrorCode = 0,
const ::com::sun::star::uno::Any* _pNextException = NULL
)
throw (::com::sun::star::sdbc::SQLException);
//----------------------------------------------------------------------------------
/** throws an SQLException
*/
OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
const sal_Char* _pAsciiMessage,
StandardSQLState _eSQLState,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
const sal_Int32 _nErrorCode = 0, const sal_Int32 _nErrorCode = 0,
const ::com::sun::star::uno::Any* _pNextException = NULL const ::com::sun::star::uno::Any* _pNextException = NULL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment