CWS-TOOLING: integrate CWS evoab2def

2009-05-28 16:00:19 +0200 fs  r272412 : don't use createFalse - Evo 2.22 simply hangs when ask for all contacts without a first name. Instead, in the WHERE 0=1 case, simply create an empty result set
2009-05-22 14:25:51 +0200 fs  r272193 : #i10000#
2009-05-22 14:25:37 +0200 fs  r272192 : oops, ENABLE_EVOAB2 for some platforms only, not generically
2009-05-22 14:19:00 +0200 fs  r272191 : #i10000#
2009-05-22 12:42:38 +0200 fs  r272183 : when sorting, properly use a syslocale collator, instead of comparing the numerical values of the string's UTF-16 code points
2009-05-20 15:09:00 +0200 fs  r272131 : clear/getWarnings: also allowed without cache
2009-05-20 14:11:19 +0200 fs  r272128 : removed debug traces
2009-05-20 14:03:31 +0200 fs  r272126 : #i55701# +STR_SORT_BY_COL_ONLY
2009-05-20 14:02:29 +0200 fs  r272125 : implement sorting
2009-05-20 10:10:19 +0200 fs  r272107 : #i10000#
2009-05-19 16:02:17 +0200 fs  r272089 : #i10000#
2009-05-19 16:02:02 +0200 fs  r272088 : #i55701# strings for new error condition DATA_CANNOT_SELECT_UNFILTERED
2009-05-19 16:01:31 +0200 fs  r272087 : #i55701# use DATA_CANNOT_SELECT_UNFILTERED as standardized error code
2009-05-19 15:59:59 +0200 fs  r272086 : #i55701# +DATA_CANNOT_SELECT_UNFILTERED
2009-05-19 15:46:12 +0200 fs  r272084 : #i55701# recognize the DATA_CANNOT_SELECT_UNFILTERED error condition, and allow filtering in this case, even when the result set is empty
2009-05-19 09:06:50 +0200 fs  r272059 : merging changes from CWS dba32b, to prevent future conflicts with upcoming local changes
2009-05-18 21:48:58 +0200 fs  r272054 : accessing a non-local unfiltered address book now returns an empty result set, and reports a warning, instead of ungracefully failing
2009-05-18 21:48:42 +0200 fs  r272053 : accessing a non-local unfiltered address book now returns an empty result set, and reports a warning, instead of ungracefully failing
2009-05-18 21:47:41 +0200 fs  r272052 : +setExternalWarnings
2009-05-18 21:47:12 +0200 fs  r272051 : #i55701# when re/loading the form, display any possible warnings
2009-05-18 21:43:26 +0200 fs  r272050 : #i55701# implement XWarningsSupplier, exposing the warnings of our result set
2009-05-18 21:42:51 +0200 fs  r272049 : #i55701# implement XWarningsSupplier, exposing the warnings of our aggregate RowSet
2009-05-18 17:53:59 +0200 fs  r272041 : #i55701# moved the (I)WarningsContainer from dbaccess to connectivity, to be able to use it in the latter module, too
2009-05-18 17:24:10 +0200 fs  r272040 : #i55701# properly enable the various Evolution types
2009-05-18 14:52:19 +0200 fs  r272024 : #i55701# properly enable the Evolution types
2009-05-18 13:57:10 +0200 fs  r272018 : fixed/extended whereAnalysis (column searching still not enabled, as neither LIKE nor = seem to work with my (somewhat older) Evolution version)
2009-05-18 13:56:08 +0200 fs  r272017 : extended showParseTree
2009-05-18 13:55:25 +0200 fs  r272016 : extended showParseTree
2009-05-18 11:40:16 +0200 fs  r272008 : #i55701#
2009-05-18 11:39:02 +0200 fs  r272006 : let the PreparedStatement return proper meta data, too
2009-05-18 10:05:37 +0200 fs  r271999 : moved the XStatement interface to from OCommonStatement to OStatement - the former class is also the base for other classes which should not have this interface
2009-05-15 21:53:22 +0200 fs  r271973 : collectColumnInformation: report invalid meta data as assertion
2009-05-15 21:51:40 +0200 fs  r271972 : showParseTree should be const
2009-05-15 21:51:26 +0200 fs  r271971 : showParseTree should be const
2009-05-15 21:51:03 +0200 fs  r271970 : properly recognize the 'WHERE 0 = 1' clause, this way having proper statement meta data, this way saving much much calls from the DBA framework
2009-05-15 20:29:03 +0200 fs  r271969 : cleaned up the mess with the statement classes
2009-05-15 15:51:11 +0200 fs  r271944 : let the result set properly init its meta data
2009-05-15 15:29:54 +0200 fs  r271939 : proper property implementations for the resultset class
2009-05-15 15:01:31 +0200 fs  r271936 : proper property implementations for the statement class
2009-05-08 14:46:33 +0200 fs  r271717 : component_foo must be PUBLIC
2009-05-06 09:20:05 +0200 fs  r271565 : #i10000# (warnings on unxlngi6)
2009-05-06 09:01:30 +0200 fs  r271564 : #i101493#
2009-05-05 23:08:12 +0200 fs  r271560 : #i55701# merging the changes from the ancient (CVS-based) CWS evoab2default into this CWS here

2 files changed, 31 insertions, 4 deletions

diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 142f0f249b36..96412feed10a 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -447,6 +447,11 @@ void ODatabaseForm::impl_construct()
         m_pAggregatePropertyMultiplexer->addProperty(PROPERTY_ACTIVE_CONNECTION);
     }
 
+    {
+        Reference< XWarningsSupplier > xRowSetWarnings( m_xAggregate, UNO_QUERY );
+        m_aWarnings.setExternalWarnings( xRowSetWarnings );
+    }
+
     if ( m_xAggregate.is() )
     {
         m_xAggregate->setDelegator( static_cast< XWeak* >( this ) );
@@ -475,6 +480,8 @@ ODatabaseForm::~ODatabaseForm()
     if (m_xAggregate.is())
         m_xAggregate->setDelegator( NULL );
 
+    m_aWarnings.setExternalWarnings( NULL );
+
     if (m_pAggregatePropertyMultiplexer)
     {
         m_pAggregatePropertyMultiplexer->dispose();
@@ -1474,6 +1481,18 @@ void SAL_CALL ODatabaseForm::setPropertyValues( const Sequence< PropertyValue >&
 }
 
 //------------------------------------------------------------------------------
+Any SAL_CALL ODatabaseForm::getWarnings(  ) throw (SQLException, RuntimeException)
+{
+    return m_aWarnings.getWarnings();
+}
+
+//------------------------------------------------------------------------------
+void SAL_CALL ODatabaseForm::clearWarnings(  ) throw (SQLException, RuntimeException)
+{
+    m_aWarnings.clearWarnings();
+}
+
+//------------------------------------------------------------------------------
 Reference< XCloneable > SAL_CALL ODatabaseForm::createClone(  ) throw (RuntimeException)
 {
     ODatabaseForm* pClone = new ODatabaseForm( *this );
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index d4b0f3811a24..a19d20930538 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -63,13 +63,15 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/beans/XPropertyContainer.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
+#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 
 
 #include <tools/link.hxx>
 #include "InterfaceContainer.hxx"
 
-#include "connectivity/parameters.hxx"
-#include "connectivity/filtermanager.hxx"
+#include <connectivity/parameters.hxx>
+#include <connectivity/filtermanager.hxx>
+#include <connectivity/warningscontainer.hxx>
 
 #ifndef FORMS_SOURCE_MISC_LISTENERCONTAINERS_HXX
 #include "listenercontainers.hxx"
@@ -79,7 +81,7 @@
 #include <comphelper/uno3.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <cppuhelper/implbase12.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase7.hxx>
 
 namespace com { namespace sun { namespace star { namespace sdbc {
@@ -143,9 +145,10 @@ typedef ::cppu::ImplHelper12    <   ::com::sun::star::form::XForm
                                 >   ODatabaseForm_BASE1;
 
 
-typedef ::cppu::ImplHelper3 <   ::com::sun::star::lang::XServiceInfo
+typedef ::cppu::ImplHelper4 <   ::com::sun::star::lang::XServiceInfo
                             ,   ::com::sun::star::beans::XPropertyContainer
                             ,   ::com::sun::star::beans::XPropertyAccess
+                            ,   ::com::sun::star::sdbc::XWarningsSupplier
                             >   ODatabaseForm_BASE2;
 
 typedef ::cppu::ImplHelper7<    ::com::sun::star::sdbc::XCloseable,
@@ -188,6 +191,7 @@ class ODatabaseForm :public OFormComponents
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>          m_xAggregateAsRowSet;
 
     PropertyBagHelper           m_aPropertyBagHelper;
+    ::dbtools::WarningsContainer    m_aWarnings;
     OPropertyChangeMultiplexer* m_pAggregatePropertyMultiplexer;
     // Verwaltung der ControlGruppen
     OGroupManager*              m_pGroupManager;
@@ -441,6 +445,10 @@ public:
     virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     using OPropertySetAggregationHelper::setPropertyValues;
 
+    // XWarningsSupplier
+    virtual ::com::sun::star::uno::Any SAL_CALL getWarnings(  ) 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);
+
     // XCloneable
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);