diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-17 15:47:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-17 15:47:15 +0000 |
| commit | 4ec87ca784056a48b0c668d4bcde3167ecdc902b (patch) | |
| tree | bd773e6e8d1796df89aa7bd28b4cb03b7c118dae /forms/source | |
| parent | 818d93f1db1222fe40420139c9e263ca7b3a147e (diff) | |
add dbtools for !HAVE_FEATURE_DBCONNECTIVITY anyway
Change-Id: I7a769ab3c7881eae80849efc5e75eca5846d254f
Diffstat (limited to 'forms/source')
| -rw-r--r-- | forms/source/component/Grid.cxx | 3 | ||||
| -rw-r--r-- | forms/source/component/errorbroadcaster.cxx | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 8d11fb5d5167..2b16c87705ae 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -192,15 +192,12 @@ Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (Ru return aReturn; } -#if HAVE_FEATURE_DBCONNECTIVITY - // XSQLErrorListener void SAL_CALL OGridControlModel::errorOccured( const SQLErrorEvent& _rEvent ) throw (RuntimeException, std::exception) { // forward the errors which happened to my columns to my own listeners onError( _rEvent ); } -#endif // XRowSetSupplier Reference< XRowSet > SAL_CALL OGridControlModel::getRowSet( ) throw (RuntimeException, std::exception) diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx index ad6313d156e4..e619d0952401 100644 --- a/forms/source/component/errorbroadcaster.cxx +++ b/forms/source/component/errorbroadcaster.cxx @@ -20,7 +20,7 @@ #include "errorbroadcaster.hxx" #include <connectivity/dbtools.hxx> #include <com/sun/star/sdb/SQLContext.hpp> -#include <config_features.h> + namespace frm { @@ -61,11 +61,9 @@ namespace frm void SAL_CALL OErrorBroadcaster::onError( const SQLException& _rException, const OUString& _rContextDescription ) { Any aError; -#if HAVE_FEATURE_DBCONNECTIVITY if ( !_rContextDescription.isEmpty() ) aError = makeAny( prependErrorInfo( _rException, static_cast< XSQLErrorBroadcaster* >( this ), _rContextDescription ) ); else -#endif aError = makeAny( _rException ); onError( SQLErrorEvent( static_cast< XSQLErrorBroadcaster* >( this ), aError ) ); @@ -76,6 +74,7 @@ namespace frm { if ( m_aErrorListeners.getLength() ) { + ::comphelper::OInterfaceIteratorHelper2 aIter( m_aErrorListeners ); while ( aIter.hasMoreElements() ) static_cast< XSQLErrorListener* >( aIter.next() )->errorOccured( _rError ); |