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, 117 insertions, 1 deletions

diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index b2e4c086da..6c51041bc8 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -63,6 +63,11 @@ namespace com
     }
 }
 
+namespace rtl
+{
+    class OUStringBuffer;
+}
+
 namespace connectivity
 {
     class OSQLParser;
@@ -337,7 +342,8 @@ namespace connectivity
 
 #if OSL_DEBUG_LEVEL > 0
             // zeigt den ParseTree mit tabs und linefeeds
-        void showParseTree(::rtl::OUString& rString, sal_uInt32 nLevel=0);
+        void showParseTree( ::rtl::OUString& rString ) const;
+        void showParseTree( ::rtl::OUStringBuffer& _inout_rBuf, sal_uInt32 nLevel ) const;
 #endif
 
             // GetNodeType gibt den Knotentyp zurueck
diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/connectivity/inc/connectivity/warningscontainer.hxx
new file mode 100644
index 0000000000..a2cfdb3fe9
--- /dev/null
+++ b/connectivity/inc/connectivity/warningscontainer.hxx
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: warnings.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef DBTOOLS_WARNINGSCONTAINER_HXX
+#define DBTOOLS_WARNINGSCONTAINER_HXX
+
+/** ==== begin UNO includes === **/
+#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
+#include <com/sun/star/sdb/SQLContext.hpp>
+/** ==== end UNO includes === **/
+
+#include "connectivity/dbtoolsdllapi.hxx"
+
+//.........................................................................
+namespace dbtools
+{
+//.........................................................................
+
+    //=====================================================================
+    //= IWarningsContainer
+    //=====================================================================
+    class SAL_NO_VTABLE IWarningsContainer
+    {
+    public:
+        virtual void appendWarning(const ::com::sun::star::sdbc::SQLException& _rWarning) = 0;
+        virtual void appendWarning(const ::com::sun::star::sdbc::SQLWarning& _rWarning) = 0;
+        virtual void appendWarning(const ::com::sun::star::sdb::SQLContext& _rContext) = 0;
+    };
+
+    //====================================================================
+    //= WarningsContainer
+    //====================================================================
+    /** helper class for implementing XWarningsSupplier, which mixes own warnings with
+        warnings obtained from an external instance
+    */
+    class OOO_DLLPUBLIC_DBTOOLS WarningsContainer : public IWarningsContainer
+    {
+    private:
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XWarningsSupplier >   m_xExternalWarnings;
+        ::com::sun::star::uno::Any	                                                    m_aOwnWarnings;
+
+    public:
+        WarningsContainer() { }
+        WarningsContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XWarningsSupplier >& _rxExternalWarnings )
+            :m_xExternalWarnings( _rxExternalWarnings )
+        {
+        }
+        virtual ~WarningsContainer();
+
+        void setExternalWarnings( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XWarningsSupplier >& _rxExternalWarnings )
+        {
+            m_xExternalWarnings = _rxExternalWarnings;
+        }
+
+        // convenience
+        /** appends an SQLWarning instance to the chain
+            @param  _rWarning
+                the warning message
+            @param  _pAsciiSQLState
+                the SQLState of the warning
+            @param  _rxContext
+                the context of the warning
+        */
+        void appendWarning(
+            const ::rtl::OUString& _rWarning,
+            const sal_Char* _pAsciiSQLState,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext );
+
+        // IWarningsContainer
+        virtual void appendWarning(const ::com::sun::star::sdbc::SQLException& _rWarning);
+        virtual void appendWarning(const ::com::sun::star::sdbc::SQLWarning& _rWarning);
+        virtual void appendWarning(const ::com::sun::star::sdb::SQLContext& _rContext);
+
+        // XWarningsSupplier equivalents
+        ::com::sun::star::uno::Any SAL_CALL getWarnings(  ) const;
+        void SAL_CALL clearWarnings(  );
+    };
+
+//.........................................................................
+}	// namespace dbtools
+//.........................................................................
+
+#endif // DBTOOLS_WARNINGSCONTAINER_HXX