Kaydet (Commit) 990f52cb authored tarafından Stephan Bergmann's avatar Stephan Bergmann

SAL_OVERRIDE, Mac OS X connectivity redux

Change-Id: I9d4ef90501c9c36c77991d9521d08b327c3d0d5c
üst e497edc2
...@@ -41,14 +41,14 @@ namespace connectivity ...@@ -41,14 +41,14 @@ namespace connectivity
static const OUString& getDot(); static const OUString& getDot();
// implementation of the pure virtual methods // implementation of the pure virtual methods
virtual void refreshTables(); virtual void refreshTables() SAL_OVERRIDE;
virtual void refreshViews(); virtual void refreshViews() SAL_OVERRIDE;
virtual void refreshGroups(); virtual void refreshGroups() SAL_OVERRIDE;
virtual void refreshUsers(); virtual void refreshUsers() SAL_OVERRIDE;
// XTablesSupplier // XTablesSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables(
) throw(::com::sun::star::uno::RuntimeException); ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
}; };
} }
} }
......
...@@ -32,8 +32,8 @@ namespace connectivity ...@@ -32,8 +32,8 @@ namespace connectivity
protected: protected:
MacabTable* m_pTable; MacabTable* m_pTable;
virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE;
virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
public: public:
MacabColumns( MacabTable* _pTable, MacabColumns( MacabTable* _pTable,
......
...@@ -73,40 +73,40 @@ namespace connectivity ...@@ -73,40 +73,40 @@ namespace connectivity
void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException);
// OComponentHelper // OComponentHelper
virtual void SAL_CALL disposing(void); virtual void SAL_CALL disposing(void) SAL_OVERRIDE;
// XInterface // XInterface
virtual void SAL_CALL release() throw(); virtual void SAL_CALL release() throw() SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
DECLARE_SERVICE_INFO(); DECLARE_SERVICE_INFO();
// XConnection // XConnection
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XCloseable // XCloseable
virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XWarningsSupplier // XWarningsSupplier
virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// needed for the SQL interpreter // needed for the SQL interpreter
::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog();
......
...@@ -147,26 +147,26 @@ namespace connectivity ...@@ -147,26 +147,26 @@ namespace connectivity
MacabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); MacabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext);
// OComponentHelper // OComponentHelper
virtual void SAL_CALL disposing(void); virtual void SAL_CALL disposing(void) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XDriver // XDriver
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getMajorVersion() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getMinorVersion() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XTerminateListener // XTerminateListener
virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XEventListener // XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private: private:
/** shuts down the library which contains the real implementations /** shuts down the library which contains the real implementations
......
...@@ -58,27 +58,27 @@ namespace connectivity ...@@ -58,27 +58,27 @@ namespace connectivity
inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
{ return m_aMacabFields[columnIndex - 1]; } { return m_aMacabFields[columnIndex - 1]; }
virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
}; };
} }
} }
......
...@@ -73,21 +73,21 @@ namespace connectivity ...@@ -73,21 +73,21 @@ namespace connectivity
void sortRecords(MacabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); void sortRecords(MacabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException);
// OPropertyArrayUsageHelper // OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE;
// OPropertySetHelper // OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
virtual sal_Bool SAL_CALL convertFastPropertyValue( virtual sal_Bool SAL_CALL convertFastPropertyValue(
::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rConvertedValue,
::com::sun::star::uno::Any & rOldValue, ::com::sun::star::uno::Any & rOldValue,
sal_Int32 nHandle, sal_Int32 nHandle,
const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::lang::IllegalArgumentException); const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle, sal_Int32 nHandle,
const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception) SAL_OVERRIDE;
virtual void SAL_CALL getFastPropertyValue( virtual void SAL_CALL getFastPropertyValue(
::com::sun::star::uno::Any& rValue, ::com::sun::star::uno::Any& rValue,
sal_Int32 nHandle) const; sal_Int32 nHandle) const SAL_OVERRIDE;
virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException); virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException);
virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException);
...@@ -100,46 +100,46 @@ namespace connectivity ...@@ -100,46 +100,46 @@ namespace connectivity
using MacabCommonStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; using MacabCommonStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >;
// OComponentHelper // OComponentHelper
virtual void SAL_CALL disposing(); virtual void SAL_CALL disposing() SAL_OVERRIDE;
// XInterface // XInterface
virtual void SAL_CALL release() throw(); virtual void SAL_CALL release() throw() SAL_OVERRIDE;
virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
const ::com::sun::star::uno::Type & rType const ::com::sun::star::uno::Type & rType
) throw(::com::sun::star::uno::RuntimeException, std::exception); ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTypeProvider // XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(
) throw(::com::sun::star::uno::RuntimeException, std::exception); ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet // XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(
) throw(::com::sun::star::uno::RuntimeException); ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XStatement // XStatement
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(
const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL executeUpdate( virtual sal_Int32 SAL_CALL executeUpdate(
const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL execute( virtual sal_Bool SAL_CALL execute(
const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection(
) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XWarningsSupplier // XWarningsSupplier
virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( virtual ::com::sun::star::uno::Any SAL_CALL getWarnings(
) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL clearWarnings( virtual void SAL_CALL clearWarnings(
) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XCancellable // XCancellable
virtual void SAL_CALL cancel( virtual void SAL_CALL cancel(
) throw(::com::sun::star::uno::RuntimeException); ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XCloseable // XCloseable
virtual void SAL_CALL close( virtual void SAL_CALL close(
) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// other methods // other methods
inline MacabConnection* getOwnConnection() const { return m_pConnection; } inline MacabConnection* getOwnConnection() const { return m_pConnection; }
......
...@@ -49,7 +49,7 @@ namespace connectivity ...@@ -49,7 +49,7 @@ namespace connectivity
MacabConnection* getConnection() { return m_pConnection;} MacabConnection* getConnection() { return m_pConnection;}
virtual void refreshColumns(); virtual void refreshColumns() SAL_OVERRIDE;
OUString getTableName() const { return m_Name; } OUString getTableName() const { return m_Name; }
OUString getSchema() const { return m_SchemaName; } OUString getSchema() const { return m_SchemaName; }
......
...@@ -32,8 +32,8 @@ namespace connectivity ...@@ -32,8 +32,8 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
protected: protected:
virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE;
virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
public: public:
MacabTables( MacabTables(
...@@ -45,7 +45,7 @@ namespace connectivity ...@@ -45,7 +45,7 @@ namespace connectivity
m_xMetaData(_rMetaData) m_xMetaData(_rMetaData)
{ } { }
virtual void SAL_CALL disposing(void); virtual void SAL_CALL disposing(void) SAL_OVERRIDE;
}; };
} }
} }
......
...@@ -47,9 +47,9 @@ class MacabConditionConstant : public MacabCondition ...@@ -47,9 +47,9 @@ class MacabConditionConstant : public MacabCondition
public: public:
MacabConditionConstant(const sal_Bool bValue); MacabConditionConstant(const sal_Bool bValue);
virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE;
virtual sal_Bool isAlwaysFalse() const; virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE;
virtual sal_Bool eval(const MacabRecord *aRecord) const; virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE;
}; };
class MacabConditionColumn : public MacabCondition class MacabConditionColumn : public MacabCondition
...@@ -61,8 +61,8 @@ class MacabConditionColumn : public MacabCondition ...@@ -61,8 +61,8 @@ class MacabConditionColumn : public MacabCondition
MacabConditionColumn( MacabConditionColumn(
const MacabHeader *header, const MacabHeader *header,
const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE;
virtual sal_Bool isAlwaysFalse() const; virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE;
}; };
class MacabConditionNull : public MacabConditionColumn class MacabConditionNull : public MacabConditionColumn
...@@ -71,7 +71,7 @@ class MacabConditionNull : public MacabConditionColumn ...@@ -71,7 +71,7 @@ class MacabConditionNull : public MacabConditionColumn
MacabConditionNull( MacabConditionNull(
const MacabHeader *header, const MacabHeader *header,
const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const MacabRecord *aRecord) const; virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE;
}; };
class MacabConditionNotNull : public MacabConditionColumn class MacabConditionNotNull : public MacabConditionColumn
...@@ -80,7 +80,7 @@ class MacabConditionNotNull : public MacabConditionColumn ...@@ -80,7 +80,7 @@ class MacabConditionNotNull : public MacabConditionColumn
MacabConditionNotNull( MacabConditionNotNull(
const MacabHeader *header, const MacabHeader *header,
const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const MacabRecord *aRecord) const; virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE;
}; };
class MacabConditionCompare : public MacabConditionColumn class MacabConditionCompare : public MacabConditionColumn
...@@ -102,7 +102,7 @@ class MacabConditionEqual : public MacabConditionCompare ...@@ -102,7 +102,7 @@ class MacabConditionEqual : public MacabConditionCompare
const MacabHeader *header, const MacabHeader *header,
const OUString &sColumnName, const OUString &sColumnName,
const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const MacabRecord *aRecord) const; virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE;
}; };
class MacabConditionDifferent : public MacabConditionCompare class MacabConditionDifferent : public MacabConditionCompare
...@@ -112,7 +112,7 @@ class MacabConditionDifferent : public MacabConditionCompare ...@@ -112,7 +112,7 @@ class MacabConditionDifferent : public MacabConditionCompare
const MacabHeader *header, const MacabHeader *header,
const OUString &sColumnName, const OUString &sColumnName,
const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const MacabRecord *aRecord) const; virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE;
}; };
class MacabConditionSimilar : public MacabConditionCompare class MacabConditionSimilar : public MacabConditionCompare
...@@ -122,7 +122,7 @@ class MacabConditionSimilar : public MacabConditionCompare ...@@ -122,7 +122,7 @@ class MacabConditionSimilar : public MacabConditionCompare
const MacabHeader *header, const MacabHeader *header,
const OUString &sColumnName, const OUString &sColumnName,
const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException);
virtual sal_Bool eval(const MacabRecord *aRecord) const; virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE;
}; };
class MacabConditionBoolean : public MacabCondition class MacabConditionBoolean : public MacabCondition
...@@ -139,18 +139,18 @@ class MacabConditionOr : public MacabConditionBoolean ...@@ -139,18 +139,18 @@ class MacabConditionOr : public MacabConditionBoolean
{ {
public: public:
MacabConditionOr(MacabCondition *pLeft, MacabCondition *pRight); MacabConditionOr(MacabCondition *pLeft, MacabCondition *pRight);
virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE;
virtual sal_Bool isAlwaysFalse() const; virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE;
virtual sal_Bool eval(const MacabRecord *aRecord) const; virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE;
}; };
class MacabConditionAnd : public MacabConditionBoolean class MacabConditionAnd : public MacabConditionBoolean
{ {
public: public:
MacabConditionAnd(MacabCondition *pLeft, MacabCondition *pRight); MacabConditionAnd(MacabCondition *pLeft, MacabCondition *pRight);
virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE;
virtual sal_Bool isAlwaysFalse() const; virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE;
virtual sal_Bool eval(const MacabRecord *aRecord) const; virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE;
}; };
} }
......
...@@ -46,7 +46,7 @@ namespace connectivity ...@@ -46,7 +46,7 @@ namespace connectivity
public: public:
MacabSimpleOrder(MacabHeader *header, OUString &sColumnName, sal_Bool bAscending); MacabSimpleOrder(MacabHeader *header, OUString &sColumnName, sal_Bool bAscending);
virtual sal_Int32 compare(const MacabRecord *record1, const MacabRecord *record2) const; virtual sal_Int32 compare(const MacabRecord *record1, const MacabRecord *record2) const SAL_OVERRIDE;
}; };
class MacabComplexOrder : public MacabOrder class MacabComplexOrder : public MacabOrder
...@@ -58,7 +58,7 @@ namespace connectivity ...@@ -58,7 +58,7 @@ namespace connectivity
virtual ~MacabComplexOrder(); virtual ~MacabComplexOrder();
void addOrder(MacabOrder *pOrder); void addOrder(MacabOrder *pOrder);
virtual sal_Int32 compare(const MacabRecord *record1, const MacabRecord *record2) const; virtual sal_Int32 compare(const MacabRecord *record1, const MacabRecord *record2) const SAL_OVERRIDE;
}; };
} }
} }
......
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