Repository.mk | 2 +- forms/Library_frm.mk | 11 +++-------- forms/source/component/Grid.cxx | 3 --- forms/source/component/errorbroadcaster.cxx | 5 ++--- 4 files changed, 6 insertions(+), 15 deletions(-)
New commits: commit 4ec87ca784056a48b0c668d4bcde3167ecdc902b Author: Caolán McNamara <[email protected]> Date: Sat Dec 17 15:47:10 2016 +0000 add dbtools for !HAVE_FEATURE_DBCONNECTIVITY anyway Change-Id: I7a769ab3c7881eae80849efc5e75eca5846d254f diff --git a/Repository.mk b/Repository.mk index 5f2654b..ee6bac4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -310,8 +310,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ dba \ dbase \ dbmm \ - dbtools \ dbaxml) \ + dbtools \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ $(if $(USING_X11),desktop_detector) \ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 494ca4b..43339b4 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -61,10 +61,12 @@ $(eval $(call gb_Library_add_exception_objects,frm,\ forms/source/component/CheckBox \ forms/source/component/clickableimage \ forms/source/component/cloneable \ + forms/source/component/errorbroadcaster \ forms/source/component/Columns \ forms/source/component/ComboBox \ forms/source/component/Currency \ forms/source/component/Date \ + forms/source/component/DatabaseForm \ forms/source/component/EditBase \ forms/source/component/Edit \ forms/source/component/entrylisthelper \ @@ -120,6 +122,7 @@ $(eval $(call gb_Library_add_exception_objects,frm,\ forms/source/richtext/richtextviewport \ forms/source/richtext/rtattributehandler \ forms/source/richtext/specialdispatchers \ + forms/source/runtime/formoperations \ forms/source/solar/component/navbarcontrol \ forms/source/solar/control/navtoolbar \ forms/source/xforms/binding \ @@ -150,12 +153,4 @@ $(eval $(call gb_Library_add_exception_objects,frm,\ forms/source/xforms/xpathlib/xpathlib \ )) -$(eval $(call gb_Library_add_exception_objects,frm,\ - $(call gb_Helper_optional,DBCONNECTIVITY, \ - forms/source/component/DatabaseForm \ - forms/source/component/errorbroadcaster \ - forms/source/runtime/formoperations \ - ) \ -)) - # vim: set noet sw=4 ts=4: diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 8d11fb5..2b16c87 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 ad6313d..e619d095 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 );
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
