Kaydet (Commit) 56ad57de authored tarafından Thomas Arnhold's avatar Thomas Arnhold

starsdbc -> css::sdbc

Change-Id: Id0411425b0a3400dffe47143f908ab283fd2247e
üst cb347ddc
...@@ -48,9 +48,9 @@ jclass java_sql_DriverPropertyInfo::getMyClass() const ...@@ -48,9 +48,9 @@ jclass java_sql_DriverPropertyInfo::getMyClass() const
} }
java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo() java_sql_DriverPropertyInfo::operator css::sdbc::DriverPropertyInfo()
{ {
starsdbc::DriverPropertyInfo aInfo; css::sdbc::DriverPropertyInfo aInfo;
aInfo.Name = name(); aInfo.Name = name();
aInfo.Description = description(); aInfo.Description = description();
aInfo.IsRequired = required(); aInfo.IsRequired = required();
......
...@@ -572,7 +572,7 @@ Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeExc ...@@ -572,7 +572,7 @@ Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeExc
if( out ) if( out )
{ {
java_sql_SQLWarning_BASE warn_base(t.pEnv, out); java_sql_SQLWarning_BASE warn_base(t.pEnv, out);
SQLException aAsException( static_cast< starsdbc::SQLException >( java_sql_SQLWarning( warn_base, *this ) ) ); SQLException aAsException( static_cast< css::sdbc::SQLException >( java_sql_SQLWarning( warn_base, *this ) ) );
// translate to warning // translate to warning
SQLWarning aWarning; SQLWarning aWarning;
......
...@@ -393,7 +393,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sd ...@@ -393,7 +393,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sd
{ {
java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); java_sql_SQLWarning_BASE warn_base( t.pEnv, out );
return makeAny( return makeAny(
static_cast< starsdbc::SQLException >( static_cast< css::sdbc::SQLException >(
java_sql_SQLWarning(warn_base,*(::cppu::OWeakObject*)this))); java_sql_SQLWarning(warn_base,*(::cppu::OWeakObject*)this)));
} }
......
...@@ -523,7 +523,7 @@ void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc ...@@ -523,7 +523,7 @@ void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc
{ {
java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); java_sql_SQLWarning_BASE warn_base( t.pEnv, out );
return makeAny( return makeAny(
static_cast< starsdbc::SQLException >( static_cast< css::sdbc::SQLException >(
java_sql_SQLWarning(warn_base,*this))); java_sql_SQLWarning(warn_base,*this)));
} }
......
...@@ -30,7 +30,7 @@ using namespace ::com::sun::star::lang; ...@@ -30,7 +30,7 @@ using namespace ::com::sun::star::lang;
//************ Class: java.sql.SQLException //************ Class: java.sql.SQLException
java_sql_SQLException::java_sql_SQLException( const java_sql_SQLException_BASE& _rException,const Reference< XInterface> & _rContext) java_sql_SQLException::java_sql_SQLException( const java_sql_SQLException_BASE& _rException,const Reference< XInterface> & _rContext)
: starsdbc::SQLException( _rException.getMessage(), : css::sdbc::SQLException( _rException.getMessage(),
_rContext, _rContext,
_rException.getSQLState(), _rException.getSQLState(),
_rException.getErrorCode(), _rException.getErrorCode(),
...@@ -61,7 +61,7 @@ jclass java_sql_SQLException_BASE::st_getMyClass() ...@@ -61,7 +61,7 @@ jclass java_sql_SQLException_BASE::st_getMyClass()
return theClass; return theClass;
} }
starsdbc::SQLException java_sql_SQLException_BASE::getNextException() const css::sdbc::SQLException java_sql_SQLException_BASE::getNextException() const
{ {
SDBThreadAttach t; SDBThreadAttach t;
static jmethodID mID(NULL); static jmethodID mID(NULL);
...@@ -70,10 +70,10 @@ starsdbc::SQLException java_sql_SQLException_BASE::getNextException() const ...@@ -70,10 +70,10 @@ starsdbc::SQLException java_sql_SQLException_BASE::getNextException() const
if( out ) if( out )
{ {
java_sql_SQLException_BASE warn_base(t.pEnv,out); java_sql_SQLException_BASE warn_base(t.pEnv,out);
return (starsdbc::SQLException)java_sql_SQLException(warn_base,0); return (css::sdbc::SQLException)java_sql_SQLException(warn_base,0);
} }
return starsdbc::SQLException(); return css::sdbc::SQLException();
} }
OUString java_sql_SQLException_BASE::getSQLState() const OUString java_sql_SQLException_BASE::getSQLState() const
......
...@@ -24,12 +24,10 @@ ...@@ -24,12 +24,10 @@
namespace connectivity namespace connectivity
{ {
namespace starsdbc = ::com::sun::star::sdbc;
//************ Class: java.sql.SQLException //************ Class: java.sql.SQLException
class java_sql_SQLException_BASE; class java_sql_SQLException_BASE;
class java_sql_SQLException : public starsdbc::SQLException class java_sql_SQLException : public css::sdbc::SQLException
{ {
public: public:
// A ctor that is needed for returning the object // A ctor that is needed for returning the object
...@@ -50,7 +48,7 @@ namespace connectivity ...@@ -50,7 +48,7 @@ namespace connectivity
OUString getSQLState() const; OUString getSQLState() const;
sal_Int32 getErrorCode() const; sal_Int32 getErrorCode() const;
starsdbc::SQLException getNextException() const; css::sdbc::SQLException getNextException() const;
static jclass st_getMyClass(); static jclass st_getMyClass();
}; };
......
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
namespace connectivity namespace connectivity
{ {
// namespace starsdbc = ::com::sun::star::sdbc;
// namespace ::com::sun::star::uno = ::com::sun::star::uno;
//************ Class: java.sql.SQLWarning //************ Class: java.sql.SQLWarning
class java_sql_SQLWarning_BASE : public java_sql_SQLException_BASE class java_sql_SQLWarning_BASE : public java_sql_SQLException_BASE
......
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