Automated merge with file:///net/so-cwsserv01/export/cws/dba33d/DEV300/ooo

34 files changed, 751 insertions, 519 deletions

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 8d15ba24604e..937bcbe82f37 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1578,7 +1578,11 @@ void ORowSet::setStatementResultSetType( const Reference< XPropertySet >& _rxSta
             { ResultSetType::SCROLL_INSENSITIVE, ResultSetConcurrency::READ_ONLY },
             { ResultSetType::FORWARD_ONLY, ResultSetConcurrency::READ_ONLY }
         };
-        for ( sal_Int32 i=0; i<5; ++i )
+        sal_Int32 i=0;
+        if ( m_xActiveConnection->getMetaData()->isReadOnly() )
+            i = 2; // if the database is read-only we only should use read-only concurrency
+
+        for ( ; i<5; ++i )
         {
             nResultSetType = nCharacteristics[i][0];
             nResultSetConcurrency = nCharacteristics[i][1];
@@ -1900,6 +1904,8 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                     if(!xColumn.is())
                     {
                         // no column found so we could look at the position i
+                        //bReFetchName = sal_True;
+                        //sColumnLabel = ::rtl::OUString();
                         Reference<XIndexAccess> xIndexAccess(m_xColumns,UNO_QUERY);
                         if(xIndexAccess.is() && i <= xIndexAccess->getCount())
                         {
@@ -1909,7 +1915,9 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                         {
                             Sequence< ::rtl::OUString> aSeq = m_xColumns->getElementNames();
                             if( i <= aSeq.getLength())
+                            {
                                 m_xColumns->getByName(aSeq.getConstArray()[i-1]) >>= xColumn;
+                            }
                         }
                     }
                     if(bReFetchName && xColumn.is())
@@ -2317,6 +2325,12 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
                     {
                         xQuery->getPropertyValue(PROPERTY_COMMAND) >>= sCommand;
                         xQuery->getPropertyValue(PROPERTY_ESCAPE_PROCESSING) >>= bDoEscapeProcessing;
+                        if ( bDoEscapeProcessing != m_bUseEscapeProcessing )
+                        {
+                            sal_Bool bOldValue = m_bUseEscapeProcessing;
+                            m_bUseEscapeProcessing = bDoEscapeProcessing;
+                            fireProperty(PROPERTY_ID_ESCAPE_PROCESSING,bOldValue,bDoEscapeProcessing);
+                        }
 
                         ::rtl::OUString aCatalog,aSchema,aTable;
                         xQuery->getPropertyValue(PROPERTY_UPDATE_CATALOGNAME)   >>= aCatalog;
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 04c5e9d37faa..c5d34665f6c3 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -37,6 +37,7 @@
 #include "dbastrings.hrc"
 #include "HelperCollections.hxx"
 #include "SingleSelectQueryComposer.hxx"
+#include "sdbcoretools.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -228,24 +229,11 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc
     OSL_ENSURE(m_sDecimalSep.getLength() == 1,"OSingleSelectQueryComposer::OSingleSelectQueryComposer decimal separator is not 1 length");
     try
     {
-        Reference< XChild> xChild(_xConnection, UNO_QUERY);
-        if(xChild.is())
+        Any aValue;
+        Reference<XInterface> xDs = dbaccess::getDataSource(_xConnection);
+        if ( dbtools::getDataSourceSetting(xDs,static_cast <rtl::OUString> (PROPERTY_BOOLEANCOMPARISONMODE),aValue) )
         {
-            Reference< XPropertySet> xProp(xChild->getParent(),UNO_QUERY);
-            if ( xProp.is() )
-            {
-                Sequence< PropertyValue > aInfo;
-                xProp->getPropertyValue(PROPERTY_INFO) >>= aInfo;
-                const PropertyValue* pBegin = aInfo.getConstArray();
-                const PropertyValue* pEnd = pBegin + aInfo.getLength();
-                for (; pBegin != pEnd; ++pBegin)
-                {
-                    if ( pBegin->Name == static_cast <rtl::OUString> (PROPERTY_BOOLEANCOMPARISONMODE) )
-                    {
-                        OSL_VERIFY( pBegin->Value >>= m_nBoolCompareMode );
-                    }
-                }
-            }
+            OSL_VERIFY( aValue >>= m_nBoolCompareMode );
         }
     }
     catch(Exception&)
diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx
new file mode 100644
index 000000000000..d7e5221446b0
--- /dev/null
+++ b/dbaccess/source/core/api/View.cxx
@@ -0,0 +1,151 @@
+/*************************************************************************
+ *
+ * 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: View.cxx,v $
+ * $Revision: 1.3 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_dbaccess.hxx"
+
+#include "View.hxx"
+#include "dbastrings.hrc"
+
+#include "connectivity/dbexception.hxx"
+#include "connectivity/dbtools.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/WrappedTargetException.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/sdbc/XRow.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/exc_hlp.hxx>
+#include <tools/diagnose_ex.h>
+#include <unotools/sharedunocomponent.hxx>
+
+//........................................................................
+namespace dbaccess
+{
+//........................................................................
+
+    /** === begin UNO using === **/
+    using namespace ::com::sun::star::uno;
+    using ::com::sun::star::sdbc::XDatabaseMetaData;
+    using ::com::sun::star::sdbc::SQLException;
+    using ::com::sun::star::sdbc::XConnection;
+    using ::com::sun::star::lang::WrappedTargetException;
+    using ::com::sun::star::lang::XMultiServiceFactory;
+    using ::com::sun::star::sdbc::XResultSet;
+    using ::com::sun::star::sdbc::XStatement;
+    using ::com::sun::star::lang::DisposedException;
+    using ::com::sun::star::sdbc::XRow;
+    /** === end UNO using === **/
+
+    //====================================================================
+    //= View
+    //====================================================================
+    //--------------------------------------------------------------------
+    View::View( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive,
+        const ::rtl::OUString& _rCatalogName,const ::rtl::OUString& _rSchemaName, const ::rtl::OUString& _rName )
+        :View_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, ::rtl::OUString(), _rSchemaName, _rCatalogName )
+    {
+        m_nCommandHandle = getProperty(PROPERTY_COMMAND).Handle;
+        try
+        {
+            Reference<XMultiServiceFactory> xFac(_rxConnection,UNO_QUERY_THROW);
+            static const ::rtl::OUString s_sViewSupport(RTL_CONSTASCII_USTRINGPARAM("ViewSupportServiceName"));
+            m_xViewSupport.set(xFac->createInstance(s_sViewSupport),UNO_QUERY);
+        }
+        catch(const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+    //--------------------------------------------------------------------
+    View::~View()
+    {
+    }
+
+    //--------------------------------------------------------------------
+    IMPLEMENT_FORWARD_REFCOUNT( View, View_Base )
+    IMPLEMENT_GET_IMPLEMENTATION_ID( View )
+    // -------------------------------------------------------------------------
+    Any SAL_CALL View::queryInterface( const Type & _rType ) throw(RuntimeException)
+    {
+        if(_rType == getCppuType( (Reference<XAlterView>*)0) && !m_xViewSupport.is() )
+            return Any();
+        Any aReturn = View_Base::queryInterface( _rType );
+        if ( !aReturn.hasValue() )
+            aReturn = View_IBASE::queryInterface( _rType );
+        return aReturn;
+    }
+    // -------------------------------------------------------------------------
+    Sequence< Type > SAL_CALL View::getTypes(  ) throw(RuntimeException)
+    {
+        Type aAlterType = getCppuType( (Reference<XAlterView>*)0);
+
+        Sequence< Type > aTypes( ::comphelper::concatSequences(View_Base::getTypes(),View_IBASE::getTypes()) );
+        ::std::vector<Type> aOwnTypes;
+        aOwnTypes.reserve(aTypes.getLength());
+
+        const Type* pIter = aTypes.getConstArray();
+        const Type* pEnd = pIter + aTypes.getLength();
+        for(;pIter != pEnd ;++pIter)
+        {
+            if( (*pIter != aAlterType || m_xViewSupport.is()) )
+                aOwnTypes.push_back(*pIter);
+        }
+
+        Type* pTypes = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
+        return Sequence< Type >(pTypes, aOwnTypes.size());
+    }
+
+    //--------------------------------------------------------------------
+    void SAL_CALL View::alterCommand( const ::rtl::OUString& _rNewCommand ) throw (SQLException, RuntimeException)
+    {
+        OSL_ENSURE(m_xViewSupport.is(),"Illegal call to AlterView!");
+        m_xViewSupport->alterCommand(this,_rNewCommand);
+    }
+
+    //--------------------------------------------------------------------
+    void SAL_CALL View::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
+    {
+        if ( _nHandle == m_nCommandHandle && m_xViewSupport.is() )
+        {
+            // retrieve the very current command, don't rely on the base classes cached value
+            // (which we initialized empty, anyway)
+            _rValue <<= m_xViewSupport->getCommand(const_cast<View*>(this));
+            return;
+        }
+
+        View_Base::getFastPropertyValue( _rValue, _nHandle );
+    }
+    // -----------------------------------------------------------------------------
+//........................................................................
+} // namespace dbaccess
+//........................................................................
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index f789394d23f9..89e17d0e3ce4 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -417,7 +417,16 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, cons
     else if ( m_pTable && !m_pTable->isNew() )
     {
         if ( m_bAddColumn )
-            xReturn = OColumns_BASE::appendObject( _rForName, descriptor );
+        {
+            Reference< ::com::sun::star::sdb::tools::XTableAlteration> xAlterService = m_pTable->getAlterService();
+            if ( xAlterService.is() )
+            {
+                xAlterService->addColumn(m_pTable,descriptor);
+                xReturn = createObject( _rForName );
+            }
+            else
+                xReturn = OColumns_BASE::appendObject( _rForName, descriptor );
+        }
         else
             ::dbtools::throwGenericSQLException( DBA_RES( RID_STR_NO_COLUMN_ADD ), static_cast<XChild*>(static_cast<TXChild*>(this)) );
     }
@@ -443,7 +452,13 @@ void OColumns::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
     else if ( m_pTable && !m_pTable->isNew() )
     {
         if ( m_bDropColumn )
-            OColumns_BASE::dropObject(_nPos,_sElementName);
+        {
+            Reference< ::com::sun::star::sdb::tools::XTableAlteration> xAlterService = m_pTable->getAlterService();
+            if ( xAlterService.is() )
+                xAlterService->dropColumn(m_pTable,_sElementName);
+            else
+                OColumns_BASE::dropObject(_nPos,_sElementName);
+        }
         else
             ::dbtools::throwGenericSQLException( DBA_RES( RID_STR_NO_COLUMN_DROP ), static_cast<XChild*>(static_cast<TXChild*>(this)) );
     }
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index 9f9e511fc9b4..77a29812b105 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -192,7 +192,7 @@ rtl::OUString OTableColumn::getImplementationName(  ) throw (RuntimeException)
 DBG_NAME( OQueryColumn );
 
 // -------------------------------------------------------------------------
-OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection )
+OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection,const ::rtl::OUString& _sNewName )
     :OTableColumnDescriptor( false /* do not act as descriptor */ )
 {
     const sal_Int32 nPropAttr = PropertyAttribute::READONLY;
@@ -210,7 +210,14 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co
     OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_TYPE ) >>= m_nType );
     OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_ISAUTOINCREMENT ) >>= m_bAutoIncrement );
     OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_ISCURRENCY ) >>= m_bCurrency );
-    OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_NAME ) >>= m_sName );
+    if ( _sNewName.getLength() )
+    {
+        m_sName = _sNewName;
+    }
+    else
+    {
+        OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_NAME ) >>= m_sName );
+    }
     m_bRowVersion = sal_False;
 
     Reference< XPropertySetInfo > xPSI( _rxParserColumn->getPropertySetInfo(), UNO_SET_THROW );
diff --git a/dbaccess/source/core/api/makefile.mk b/dbaccess/source/core/api/makefile.mk
index f983db38b640..df80f0423e14 100644
--- a/dbaccess/source/core/api/makefile.mk
+++ b/dbaccess/source/core/api/makefile.mk
@@ -74,6 +74,7 @@ SLOFILES=	\
         $(SLO)$/SingleSelectQueryComposer.obj	\
         $(SLO)$/HelperCollections.obj			\
         $(SLO)$/datasettings.obj                \
+        $(SLO)$/View.obj						\
         $(SLO)$/columnsettings.obj
 
 # --- Targets ----------------------------------
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 7468e88f4fff..3f3ccc57db2e 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -191,9 +191,10 @@ void OQuery::rebuildColumns()
         m_pColumnMediator = NULL;
 
         Reference<XColumnsSupplier> xColSup(m_xCommandDefinition,UNO_QUERY);
+        Reference< XNameAccess > xColumnDefinitions;
         if ( xColSup.is() )
         {
-            Reference< XNameAccess > xColumnDefinitions = xColSup->getColumns();
+            xColumnDefinitions = xColSup->getColumns();
             if ( xColumnDefinitions.is() )
                 m_pColumnMediator = new OContainerMediator( m_pColumns, xColumnDefinitions, m_xConnection, OContainerMediator::eColumns );
         }
@@ -236,19 +237,29 @@ void OQuery::rebuildColumns()
         }
 
         Sequence< ::rtl::OUString> aNames = xColumns->getElementNames();
-        const ::rtl::OUString* pBegin = aNames.getConstArray();
-        const ::rtl::OUString* pEnd   = pBegin + aNames.getLength();
-        for ( ;pBegin != pEnd; ++pBegin)
+        Sequence< ::rtl::OUString> aDefintionNames;
+        bool bApplyDefinitionNames = false;
+        //if ( xColumnDefinitions.is() )
+        //{
+        //    aDefintionNames = xColumnDefinitions->getElementNames();
+        //    bApplyDefinitionNames = aDefintionNames.getLength() == aNames.getLength();
+        //}
+
+        ::rtl::OUString sEmpty;
+        const ::rtl::OUString* pIter = aNames.getConstArray();
+        const ::rtl::OUString* pEnd   = pIter + aNames.getLength();
+        for ( sal_Int32 i = 0;pIter != pEnd; ++pIter,++i)
         {
-            Reference<XPropertySet> xSource(xColumns->getByName( *pBegin ),UNO_QUERY);
-            OQueryColumn* pColumn = new OQueryColumn( xSource, m_xConnection );
+            Reference<XPropertySet> xSource(xColumns->getByName( *pIter ),UNO_QUERY);
+            OQueryColumn* pColumn = new OQueryColumn( xSource, m_xConnection, bApplyDefinitionNames ? aDefintionNames[i] : sEmpty);
             Reference< XChild > xChild( *pColumn, UNO_QUERY_THROW );
             xChild->setParent( *this );
 
-            implAppendColumn( *pBegin, pColumn );
+            ::rtl::OUString sNewName = bApplyDefinitionNames ? aDefintionNames[i] : *pIter;
+            implAppendColumn( sNewName, pColumn );
             Reference< XPropertySet > xDest( *pColumn, UNO_QUERY_THROW );
             if ( m_pColumnMediator.is() )
-                m_pColumnMediator->notifyElementCreated( *pBegin, xDest );
+                m_pColumnMediator->notifyElementCreated( sNewName, xDest );
         }
     }
     catch( const SQLContext& e )
diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx
index 33cc93b02994..1f9d1938caf8 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -110,20 +110,26 @@ void OResultColumn::impl_determineIsRowVersion_nothrow()
         getPropertyValue( PROPERTY_TABLENAME ) >>= sTable;
         getPropertyValue( PROPERTY_NAME ) >>= sColumnName;
 
-        Reference< XResultSet > xVersionColumns = m_xDBMetaData->getVersionColumns(
-            makeAny( sCatalog ), sSchema, sTable );
-        if ( xVersionColumns.is() ) // allowed to be NULL
+        try
         {
-            Reference< XRow > xResultRow( xVersionColumns, UNO_QUERY_THROW );
-            while ( xVersionColumns->next() )
+            Reference< XResultSet > xVersionColumns = m_xDBMetaData->getVersionColumns(
+                makeAny( sCatalog ), sSchema, sTable );
+            if ( xVersionColumns.is() ) // allowed to be NULL
             {
-                if ( xResultRow->getString( 2 ) == sColumnName )
+                Reference< XRow > xResultRow( xVersionColumns, UNO_QUERY_THROW );
+                while ( xVersionColumns->next() )
                 {
-                    m_aIsRowVersion <<= (sal_Bool)(sal_True);
-                    break;
+                    if ( xResultRow->getString( 2 ) == sColumnName )
+                    {
+                        m_aIsRowVersion <<= (sal_Bool)(sal_True);
+                        break;
+                    }
                 }
             }
         }
+        catch(const SQLException&)
+        {
+        }
     }
     catch( const Exception& )
     {
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index 301038903b97..d88537fb72f8 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -31,77 +31,33 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
 
-#ifndef _DBA_CORE_TABLE_HXX_
 #include "table.hxx"
-#endif
-#ifndef _DBACORE_DEFINITIONCOLUMN_HXX_
 #include <definitioncolumn.hxx>
-#endif
-#ifndef DBACCESS_SHARED_DBASTRINGS_HRC
 #include "dbastrings.hrc"
-#endif
-#ifndef _DBA_CORE_RESOURCE_HXX_
 #include "core_resource.hxx"
-#endif
-#ifndef _DBA_CORE_RESOURCE_HRC_
 #include "core_resource.hrc"
-#endif
-#ifndef _TOOLS_DEBUG_HXX
-#include <tools/debug.hxx>
-#endif
+#include "CIndexes.hxx"
 
-#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
+#include <tools/debug.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#endif
-#ifndef _COMPHELPER_ENUMHELPER_HXX_
 #include <comphelper/enumhelper.hxx>
-#endif
-#ifndef _COMPHELPER_CONTAINER_HXX_
 #include <comphelper/container.hxx>
-#endif
-#ifndef _COMPHELPER_SEQUENCE_HXX_
 #include <comphelper/sequence.hxx>
-#endif
-#ifndef _COMPHELPER_TYPES_HXX_
 #include <comphelper/types.hxx>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_XREFRESHLISTENER_HPP_
+//#include <comphelper/extract.hxx>
 #include <com/sun/star/util/XRefreshListener.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_
 #include <com/sun/star/sdbc/XConnection.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_PRIVILEGE_HPP_
 #include <com/sun/star/sdbcx/Privilege.hpp>
-#endif
+#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
+#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
+
 #include <connectivity/TKeys.hxx>
-#ifndef DBACCESS_INDEXES_HXX_
-#include "CIndexes.hxx"
-#endif
-#ifndef _CONNECTIVITY_DBTOOLS_HXX_
 #include <connectivity/dbtools.hxx>
-#endif
-#ifndef _DBHELPER_DBEXCEPTION_HXX_
 #include <connectivity/dbexception.hxx>
-#endif
-#ifndef _COMPHELPER_EXTRACT_HXX_
-#include <comphelper/extract.hxx>
-#endif
-#ifndef DBACORE_SDBCORETOOLS_HXX
+
 #include "sdbcoretools.hxx"
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HPP_
-#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#endif
-#ifndef DBA_CONTAINERMEDIATOR_HXX
 #include "ContainerMediator.hxx"
-#endif
 #include <rtl/logfile.hxx>
 
 using namespace dbaccess;
@@ -152,6 +108,7 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
     :OTable_Base(_pTables,_rxConn, _rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers())
     ,m_nPrivileges(-1)
 {
+    DBG_CTOR(ODBTable, NULL);
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::ODBTable" );
 }
 // -------------------------------------------------------------------------
@@ -311,18 +268,18 @@ void ODBTable::construct()
     describeProperties(aProps);
     if(!_nId)
     {
-        Property* pBegin    = aProps.getArray();
-        Property* pEnd      = pBegin + aProps.getLength();
-        for(;pBegin != pEnd;++pBegin)
+        Property* pIter = aProps.getArray();
+        Property* pEnd  = pIter + aProps.getLength();
+        for(;pIter != pEnd;++pIter)
         {
-            if (0 == pBegin->Name.compareToAscii(PROPERTY_CATALOGNAME))
-                pBegin->Attributes = PropertyAttribute::READONLY;
-            else if (0 == pBegin->Name.compareToAscii(PROPERTY_SCHEMANAME))
-                pBegin->Attributes = PropertyAttribute::READONLY;
-            else if (0 == pBegin->Name.compareToAscii(PROPERTY_DESCRIPTION))
-                pBegin->Attributes = PropertyAttribute::READONLY;
-            else if (0 == pBegin->Name.compareToAscii(PROPERTY_NAME))
-                pBegin->Attributes = PropertyAttribute::READONLY;
+            if (0 == pIter->Name.compareToAscii(PROPERTY_CATALOGNAME))
+                pIter->Attributes = PropertyAttribute::READONLY;
+            else if (0 == pIter->Name.compareToAscii(PROPERTY_SCHEMANAME))
+                pIter->Attributes = PropertyAttribute::READONLY;
+            else if (0 == pIter->Name.compareToAscii(PROPERTY_DESCRIPTION))
+                pIter->Attributes = PropertyAttribute::READONLY;
+            else if (0 == pIter->Name.compareToAscii(PROPERTY_NAME))
+                pIter->Attributes = PropertyAttribute::READONLY;
         }
     }
 
@@ -340,14 +297,11 @@ IMPLEMENT_SERVICE_INFO1(ODBTable, "com.sun.star.sdb.dbaccess.ODBTable", SERVICE_
 Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getInfoHelper" );
-    Any aRet;
-    if(rType == getCppuType( (Reference<XRename>*)0))
+    if(rType == getCppuType( (Reference<XRename>*)0) && !getRenameService().is() )
         return Any();
-    if(rType == getCppuType( (Reference<XAlterTable>*)0))
+    if(rType == getCppuType( (Reference<XAlterTable>*)0) && !getAlterService().is() )
         return Any();
-    aRet = OTable_Base::queryInterface( rType);
-
-    return aRet;
+    return OTable_Base::queryInterface( rType);
 }
 // -------------------------------------------------------------------------
 Sequence< Type > SAL_CALL ODBTable::getTypes(  ) throw(RuntimeException)
@@ -360,12 +314,12 @@ Sequence< Type > SAL_CALL ODBTable::getTypes(  ) throw(RuntimeException)
     ::std::vector<Type> aOwnTypes;
     aOwnTypes.reserve(aTypes.getLength());
 
-    const Type* pBegin = aTypes.getConstArray();
-    const Type* pEnd = pBegin + aTypes.getLength();
-    for(;pBegin != pEnd ;++pBegin)
+    const Type* pIter = aTypes.getConstArray();
+    const Type* pEnd = pIter + aTypes.getLength();
+    for(;pIter != pEnd ;++pIter)
     {
-        if(*pBegin != aRenameType && *pBegin != aAlterType)
-            aOwnTypes.push_back(*pBegin);
+        if( (*pIter != aRenameType || getRenameService().is()) && (*pIter != aAlterType || getAlterService().is()))
+            aOwnTypes.push_back(*pIter);
     }
 
     Type* pTypes = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
@@ -373,10 +327,17 @@ Sequence< Type > SAL_CALL ODBTable::getTypes(  ) throw(RuntimeException)
 }
 // XRename,
 //------------------------------------------------------------------------------
-void SAL_CALL ODBTable::rename( const ::rtl::OUString& /*_rNewName*/ ) throw(SQLException, ElementExistException, RuntimeException)
+void SAL_CALL ODBTable::rename( const ::rtl::OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::rename" );
-    throw SQLException(DBACORE_RESSTRING(RID_STR_NO_TABLE_RENAME),*this,SQLSTATE_GENERAL,1000,Any() );
+    ::osl::MutexGuard aGuard(m_aMutex);
+    checkDisposed(connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed);
+    if ( !getRenameService().is() )
+        throw SQLException(DBACORE_RESSTRING(RID_STR_NO_TABLE_RENAME),*this,SQLSTATE_GENERAL,1000,Any() );
+
+    Reference<XPropertySet> xTable(this);
+    getRenameService()->rename(xTable,_rNewName);
+    ::connectivity::OTable_TYPEDEF::rename(_rNewName);
 }
 
 // XAlterTable,
@@ -385,55 +346,15 @@ void SAL_CALL ODBTable::alterColumnByName( const ::rtl::OUString& _rName, const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::alterColumnByName" );
     ::osl::MutexGuard aGuard(m_aMutex);
-    checkDisposed(
-        connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed);
-    if(m_pColumns->hasByName(_rName))
-    {
-        ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("ALTER TABLE ");
-        ::rtl::OUString aQuote;
-        Reference<XDatabaseMetaData> xMeta = getMetaData();
-        if ( xMeta.is() )
-            aQuote = xMeta->getIdentifierQuoteString(  );
-        ::rtl::OUString sComposedName;
-
-        sComposedName = ::dbtools::composeTableName( xMeta, m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions );
-        if(!sComposedName.getLength())
-            ::dbtools::throwFunctionSequenceException(*this);
-
-        sSql += sComposedName;
-        sSql += ::rtl::OUString::createFromAscii(" ALTER ");
-        sSql += ::dbtools::quoteName(aQuote,_rName);
-
-        ::rtl::OUString sNewDefaultValue,sDefaultValue;
-
-        Reference<XPropertySet> xColumn;
-        m_pColumns->getByName(_rName) >>= xColumn;
-        if(_rxDescriptor->getPropertySetInfo()->hasPropertyByName(PROPERTY_DEFAULTVALUE))
-            _rxDescriptor->getPropertyValue(PROPERTY_DEFAULTVALUE) >>= sNewDefaultValue;
-        if(xColumn.is() && xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_DEFAULTVALUE))
-            xColumn->getPropertyValue(PROPERTY_DEFAULTVALUE) >>= sDefaultValue;
-
-        if(sNewDefaultValue != sDefaultValue && getMetaData().is() )
-        {
-            if(sNewDefaultValue.getLength())
-            {
-                sSql += ::rtl::OUString::createFromAscii(" SET DEFAULT ");
-                sSql += sNewDefaultValue;
-            }
-            else
-                sSql += ::rtl::OUString::createFromAscii(" DROP DEFAULT");
-            OSL_ENSURE(getMetaData()->getConnection().is(),"Connection is null!");
-            Reference< XStatement > xStmt = getMetaData()->getConnection()->createStatement(  );
-            if(xStmt.is())
-                xStmt->execute(sSql);
-        }
-        else
-            // not supported
-            throw SQLException(DBACORE_RESSTRING(RID_STR_NO_ALTER_COLUMN_DEF),*this,SQLSTATE_GENERAL,1000,Any() );
-    }
-    else
-        // not supported
-        throw SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_ALTER_BY_NAME),*this,SQLSTATE_GENERAL,1000,Any() );
+    checkDisposed(connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed);
+    if ( !getAlterService().is() )
+        throw SQLException(DBACORE_RESSTRING(RID_STR_NO_TABLE_RENAME),*this,SQLSTATE_GENERAL,1000,Any() );
+
+    if ( !m_pColumns->hasByName(_rName) )
+        throw SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_NOT_VALID),*this,SQLSTATE_GENERAL,1000,Any() );
+
+    Reference<XPropertySet> xTable(this);
+    getAlterService()->alterColumnByName(xTable,_rName,_rxDescriptor);
     m_pColumns->refresh();
 }
 // -----------------------------------------------------------------------------
@@ -476,8 +397,8 @@ sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames)
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createColumns" );
     Reference<XDatabaseMetaData> xMeta = getMetaData();
     OColumns* pCol = new OColumns(*this, m_aMutex, NULL, isCaseSensitive(), _rNames, this,this,
-                                    xMeta.is() && xMeta->supportsAlterTableWithAddColumn(),
-                                    xMeta.is() && xMeta->supportsAlterTableWithDropColumn());
+                                    getAlterService().is() || (xMeta.is() && xMeta->supportsAlterTableWithAddColumn()),
+                                    getAlterService().is() || (xMeta.is() && xMeta->supportsAlterTableWithDropColumn()));
     static_cast<OColumnsHelper*>(pCol)->setParent(this);
     pCol->setParent(*this);
     m_pColumnMediator = new OContainerMediator( pCol, m_xColumnDefinitions, getConnection(), OContainerMediator::eColumns );
@@ -497,7 +418,3 @@ sdbcx::OCollection* ODBTable::createIndexes(const TStringVector& _rNames)
     return new OIndexes(this,m_aMutex,_rNames,NULL);
 }
 // -----------------------------------------------------------------------------
-
-
-
-
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 342d68eea0ba..4f57aa29b4ec 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -31,74 +31,30 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
 
-#ifndef _DBA_CORE_VIEWCONTAINER_HXX_
 #include "viewcontainer.hxx"
-#endif
-#ifndef DBACCESS_SHARED_DBASTRINGS_HRC
 #include "dbastrings.hrc"
-#endif
-#ifndef _TOOLS_DEBUG_HXX
+#include "core_resource.hxx"
+#include "core_resource.hrc"
+#include "View.hxx"
+
 #include <tools/debug.hxx>
-#endif
-#ifndef _WLDCRD_HXX
 #include <tools/wldcrd.hxx>
-#endif
-#ifndef _COMPHELPER_ENUMHELPER_HXX_
 #include <comphelper/enumhelper.hxx>
-#endif
-#ifndef _DBA_CORE_RESOURCE_HXX_
-#include "core_resource.hxx"
-#endif
-#ifndef _DBA_CORE_RESOURCE_HRC_
-#include "core_resource.hrc"
-#endif
+#include <comphelper/types.hxx>
+#include <connectivity/dbtools.hxx>
+#include <comphelper/extract.hxx>
+#include <connectivity/dbexception.hxx>
+#include <rtl/ustrbuf.hxx>
 
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_
 #include <com/sun/star/sdbc/XConnection.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_KEYRULE_HPP_
 #include <com/sun/star/sdbc/KeyRule.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_KEYTYPE_HPP_
-#include <com/sun/star/sdbcx/KeyType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_COLUMNVALUE_HPP_
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
-#endif
-#ifndef _COMPHELPER_TYPES_HXX_
-#include <comphelper/types.hxx>
-#endif
-#ifndef _CONNECTIVITY_DBTOOLS_HXX_
-#include <connectivity/dbtools.hxx>
-#endif
-#ifndef _COMPHELPER_EXTRACT_HXX_
-#include <comphelper/extract.hxx>
-#endif
-#ifndef _DBHELPER_DBEXCEPTION_HXX_
-#include <connectivity/dbexception.hxx>
-#endif
-#ifndef _CONNECTIVITY_SDBCX_VIEW_HXX_
-#include <connectivity/sdbcx/VView.hxx>
-#endif
-#ifndef _RTL_USTRBUF_HXX_
-#include <rtl/ustrbuf.hxx>
-#endif
+#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
+#include <com/sun/star/sdbcx/KeyType.hpp>
 
 using namespace dbaccess;
 using namespace dbtools;
@@ -159,14 +115,12 @@ ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName)
                                             sSchema,
                                             sTable,
                                             ::dbtools::eInDataManipulation);
-        return new ::connectivity::sdbcx::OView(isCaseSensitive(),
-                                sTable,
-                                m_xMetaData,
-                                0,
-                                ::rtl::OUString(),
-                                sSchema,
-                                sCatalog
-                                );
+        return new View(m_xConnection,
+                        isCaseSensitive(),
+                        sCatalog,
+                        sSchema,
+                        sTable
+                        );
     }
 
     return xProp;
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index fef47f68145a..5abf774e1d92 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1183,6 +1183,17 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings()
         AsciiPropertyValue( "FormsCheckRequiredFields",   makeAny( (sal_Bool)sal_True ) ),
         AsciiPropertyValue( "EscapeDateTime",             makeAny( (sal_Bool)sal_True ) ),
 
+        // known services to handle database tasks
+        AsciiPropertyValue( "TableAlterationServiceName", makeAny( ::rtl::OUString() ) ),
+        AsciiPropertyValue( "TableRenameServiceName",     makeAny( ::rtl::OUString() ) ),
+        AsciiPropertyValue( "ViewAlterationServiceName",  makeAny( ::rtl::OUString() ) ),
+        AsciiPropertyValue( "ViewSupportServiceName",     makeAny( ::rtl::OUString() ) ),
+        AsciiPropertyValue( "CommandDefinitionSupplier",  makeAny( ::rtl::OUString() ) ),
+        AsciiPropertyValue( "FormSupplier",               makeAny( ::rtl::OUString() ) ),
+        AsciiPropertyValue( "ReportSupplier",             makeAny( ::rtl::OUString() ) ),
+        AsciiPropertyValue( "KeyAlterationServiceName",   makeAny( ::rtl::OUString() ) ),
+        AsciiPropertyValue( "IndexAlterationServiceName", makeAny( ::rtl::OUString() ) ),
+
         AsciiPropertyValue()
     };
     return aKnownSettings;
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 043198388976..41ae7e0e0b25 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -42,6 +42,7 @@
 #include "ContainerMediator.hxx"
 #include "SingleSelectQueryComposer.hxx"
 #include "querycomposer.hxx"
+#include "sdbcoretools.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -617,7 +618,7 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::refresh" );
     if ( _rToBeRefreshed == Reference< XNameAccess >(m_pTables) )
     {
-        if (!m_pTables->isInitialized())
+        if (m_pTables && !m_pTables->isInitialized())
         {
             impl_fillTableFilter();
             // check if our "master connection" can supply tables
@@ -635,7 +636,7 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
     }
     else if ( _rToBeRefreshed == Reference< XNameAccess >(m_pViews) )
     {
-        if (!m_pViews->isInitialized())
+        if (m_pViews && !m_pViews->isInitialized())
         {
             impl_fillTableFilter();
             // check if our "master connection" can supply tables
@@ -729,6 +730,28 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const ::rtl::OUStr
         xRet = new OSingleSelectQueryComposer( getTables(),this, m_aContext );
         m_aComposers.push_back(WeakReferenceHelper(xRet));
     }
+    else
+    {
+        Reference<XInterface> xDs = dbaccess::getDataSource(*this);
+        Any aValue;
+        if ( dbtools::getDataSourceSetting(xDs,_sServiceSpecifier,aValue) )
+        {
+            ::rtl::OUString sSupportService;
+            aValue >>= sSupportService;
+            if ( sSupportService.getLength() )
+            {
+                TSupportServices::iterator aFind = m_aSupportServices.find(sSupportService);
+                if ( aFind == m_aSupportServices.end())
+                {
+                    Sequence<Any> aArgs(1);
+                    Reference<XConnection> xMy(this);
+                    aArgs[0] <<= NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),makeAny(xMy));
+                    aFind = m_aSupportServices.insert(TSupportServices::value_type(sSupportService,m_aContext.createComponentWithArguments(sSupportService,aArgs))).first;
+                }
+                return aFind->second;
+            }
+        }
+    }
     return Reference< XInterface >(xRet,UNO_QUERY);
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 88e59f007a25..98b8535953db 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -30,62 +30,25 @@
 #ifndef _DBA_CORE_CONNECTION_HXX_
 #define _DBA_CORE_CONNECTION_HXX_
 
-#ifndef _DBASHARED_APITOOLS_HXX_
 #include "apitools.hxx"
-#endif
-#ifndef _DBA_CORE_QUERYCONTAINER_HXX_
 #include "querycontainer.hxx"
-#endif
-#ifndef _DBA_CORE_TABLECONTAINER_HXX_
 #include "tablecontainer.hxx"
-#endif
-#ifndef _DBA_CORE_VIEWCONTAINER_HXX_
 #include "viewcontainer.hxx"
-#endif
-#ifndef DBA_CORE_REFRESHLISTENER_HXX
 #include "RefreshListener.hxx"
-#endif
-#ifndef DBTOOLS_WARNINGSCONTAINER_HXX
-#include <connectivity/warningscontainer.hxx>
-#endif
 
 /** === begin UNO includes === **/
-#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_
 #include <com/sun/star/container/XChild.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
 #include <com/sun/star/lang/DisposedException.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSERFACTORY_HPP_
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_XCOMMANDPREPARATION_HPP_
 #include <com/sun/star/sdb/XCommandPreparation.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XVIEWSSUPPLIER_HPP_
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XUSERSSUPPLIER_HPP_
 #include <com/sun/star/sdbcx/XUsersSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XGROUPSSUPPLIER_HPP_
 #include <com/sun/star/sdbcx/XGroupsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_TOOLS_XCONNECTIONTOOLS_HPP_
 #include <com/sun/star/sdb/tools/XConnectionTools.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_APPLICATION_XTABLEUIPROVIDER_HPP_
 #include <com/sun/star/sdb/application/XTableUIProvider.hpp>
-#endif
 /** === end UNO includes === **/
 
 #if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_14)
@@ -93,14 +56,10 @@
 #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 14
 #include <comphelper/implbase_var.hxx>
 #endif
-
-#ifndef COMPHELPER_COMPONENTCONTEXT_HXX
 #include <comphelper/componentcontext.hxx>
-#endif
-
-#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_
+#include <comphelper/stl_types.hxx>
 #include <connectivity/ConnectionWrapper.hxx>
-#endif
+#include <connectivity/warningscontainer.hxx>
 
 //........................................................................
 namespace dbaccess
@@ -151,6 +110,11 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XConnectionTools >          m_xConnectionTools;
     ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XTableUIProvider >    m_xTableUIProvider;
 
+    // defines the helper services for example to query the command of a view
+    // @ see com.sun.star.sdb.tools.XViewSupport
+    DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>, TSupportServices);
+    TSupportServices                m_aSupportServices;
+
 
     OTableContainer*                m_pTables;
     OViewContainer*                 m_pViews;
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 5b6593261e1a..801f766fc827 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -74,6 +74,13 @@
 #include <comphelper/numberedcollection.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/storagehelper.hxx>
+#include <comphelper/genericpropertyset.hxx>
+#include <comphelper/property.hxx>
+
+#include <connectivity/dbtools.hxx>
+
+#include <svtools/saveopt.hxx>
+
 #include <cppuhelper/exc_hlp.hxx>
 #include <framework/titlehelper.hxx>
 #include <svtools/saveopt.hxx>
@@ -1148,8 +1155,25 @@ Reference< XNameAccess > ODatabaseDocument::impl_getDocumentContainer_throw( ODa
     Reference< XNameAccess > xContainer = rContainerRef;
     if ( !xContainer.is() )
     {
-        TContentPtr& rContainerData( m_pImpl->getObjectContainer( _eType ) );
-        rContainerRef = xContainer = new ODocumentContainer( m_pImpl->m_aContext.getLegacyServiceFactory(), *this, rContainerData, bFormsContainer );
+        Any aValue;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xMy(*this);
+        if ( dbtools::getDataSourceSetting(xMy,bFormsContainer ? "FormSupplier" : "ReportSupplier",aValue) )
+        {
+            ::rtl::OUString sSupportService;
+            aValue >>= sSupportService;
+            if ( sSupportService.getLength() )
+            {
+                Sequence<Any> aArgs(1);
+                aArgs[0] <<= NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSource")),makeAny(xMy));
+                xContainer.set(m_pImpl->m_aContext.createComponentWithArguments(sSupportService,aArgs),UNO_QUERY);
+                rContainerRef = xContainer;
+            }
+        }
+        if ( !xContainer.is() )
+        {
+            TContentPtr& rContainerData( m_pImpl->getObjectContainer( _eType ) );
+            rContainerRef = xContainer = new ODocumentContainer( m_pImpl->m_aContext.getLegacyServiceFactory(), *this, rContainerData, bFormsContainer );
+        }
         impl_reparent_nothrow( xContainer );
     }
     return xContainer;
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 4fe5101863db..f0cca707fc3b 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -42,6 +42,7 @@
 #include "SharedConnection.hxx"
 #include "databasedocument.hxx"
 
+
 /** === begin UNO includes === **/
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -70,6 +71,7 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/string.hxx>
 #include <connectivity/dbexception.hxx>
+#include <connectivity/dbtools.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
@@ -1340,8 +1342,24 @@ Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(
     Reference< XNameAccess > xContainer = m_pImpl->m_xCommandDefinitions;
     if ( !xContainer.is() )
     {
-        TContentPtr& rContainerData( m_pImpl->getObjectContainer( ODatabaseModelImpl::E_QUERY ) );
-        xContainer = new OCommandContainer( m_pImpl->m_aContext.getLegacyServiceFactory(), *this, rContainerData, sal_False );
+        Any aValue;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xMy(*this);
+        if ( dbtools::getDataSourceSetting(xMy,"CommandDefinitionSupplier",aValue) )
+        {
+            ::rtl::OUString sSupportService;
+            aValue >>= sSupportService;
+            if ( sSupportService.getLength() )
+            {
+                Sequence<Any> aArgs(1);
+                aArgs[0] <<= NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSource")),makeAny(xMy));
+                xContainer.set(m_pImpl->m_aContext.createComponentWithArguments(sSupportService,aArgs),UNO_QUERY);
+            }
+        }
+        if ( !xContainer.is() )
+        {
+            TContentPtr& rContainerData( m_pImpl->getObjectContainer( ODatabaseModelImpl::E_QUERY ) );
+            xContainer = new OCommandContainer( m_pImpl->m_aContext.getLegacyServiceFactory(), *this, rContainerData, sal_False );
+        }
         m_pImpl->m_xCommandDefinitions = xContainer;
     }
     return xContainer;
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 20d1ce157b45..f4426025c6fa 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -721,7 +721,7 @@ void ODocumentDefinition::impl_onActivateEmbeddedObject_nothrow()
 
         // ensure that we ourself are kept alive as long as the embedded object's frame is
         // opened
-        LifetimeCoupler::couple( *this, Reference< XComponent >( xFrame, UNO_QUERY_THROW ) );
+        LifetimeCoupler::couple( *this, xFrame.get() );
 
         // init the edit view
         if ( m_bForm && m_bOpenInDesign )
@@ -1036,6 +1036,11 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons
         m_xEmbeddedObject->changeState( EmbedStates::ACTIVE );
         ODocumentDefinition::impl_onActivateEmbeddedObject_nothrow();
     }
+    else
+    {
+        // ensure that we ourself are kept alive as long as the document is open
+        LifetimeCoupler::couple( *this, xModel.get() );
+    }
 
     if ( !m_bForm && m_pImpl->m_aProps.bAsTemplate && !m_bOpenInDesign )
         ODocumentDefinition::fillReportData( m_aContext, getComponent(), xConnection );
diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx
new file mode 100644
index 000000000000..0cda27afcf82
--- /dev/null
+++ b/dbaccess/source/core/inc/View.hxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * 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: View.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * 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 DBACCESS_VIEW_HXX
+#define DBACCESS_VIEW_HXX
+
+#include "connectivity/sdbcx/VView.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/sdbcx/XAlterView.hpp>
+#include <com/sun/star/sdb/tools/XViewSupport.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/uno3.hxx>
+#include <cppuhelper/implbase1.hxx>
+
+//........................................................................
+namespace dbaccess
+{
+//........................................................................
+
+    //====================================================================
+    //= View
+    //====================================================================
+    typedef ::connectivity::sdbcx::OView                                View_Base;
+    typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XAlterView >  View_IBASE;
+    class View :public View_Base
+                ,public View_IBASE
+    {
+    public:
+        View(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+            sal_Bool _bCaseSensitive,
+            const ::rtl::OUString& _rCatalogName,
+            const ::rtl::OUString& _rSchemaName,
+            const ::rtl::OUString& _rName
+        );
+
+        // UNO
+        DECLARE_XINTERFACE()
+        DECLARE_XTYPEPROVIDER()
+
+        // XAlterView
+        virtual void SAL_CALL alterCommand( const ::rtl::OUString& NewCommand ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+
+    protected:
+        virtual ~View();
+
+    protected:
+        // OPropertyContainer
+        virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const;
+
+    private:
+         ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XViewSupport>     m_xViewSupport;
+        sal_Int32       m_nCommandHandle;
+    private:
+        using View_Base::getFastPropertyValue;
+    };
+
+//........................................................................
+} // namespace dbaccess
+//........................................................................
+
+#endif // DBACCESS_VIEW_HXX
diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx
index c5151e6bffd5..b67b0de70c59 100644
--- a/dbaccess/source/core/inc/definitioncolumn.hxx
+++ b/dbaccess/source/core/inc/definitioncolumn.hxx
@@ -167,7 +167,8 @@ namespace dbaccess
     public:
         OQueryColumn(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxParserColumn,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection
+            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+            const ::rtl::OUString& _sNewName
         );
 
         // XTypeProvider
diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx
index 92a163b3d24e..5f3e967e79a4 100644
--- a/dbaccess/source/core/inc/sdbcoretools.hxx
+++ b/dbaccess/source/core/inc/sdbcoretools.hxx
@@ -52,31 +52,11 @@ namespace dbaccess
         getDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDependentObject );
 
     // -----------------------------------------------------------------------------
-    /** retrieves a particular indirect data source setting
-
-        @param _rxDataSource
-            a data source component
-        @param _pAsciiSettingsName
-            the ASCII name of the setting to obtain
-        @param _rSettingsValue
-            the value of the setting, upon successfull return
-
-        @return
-            <FALSE/> if the setting is not present in the <member scope="com::sun::star::sdb">DataSource::Info</member>
-            member of the data source
-            <TRUE/> otherwise
-    */
-    bool    getDataSourceSetting(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDataSource,
-        const sal_Char* _pAsciiSettingsName,
-        ::com::sun::star::uno::Any& /* [out] */ _rSettingsValue
-    );
 
     // -----------------------------------------------------------------------------
     /** retrieves a to-be-displayed string for a given caught exception;
     */
     ::rtl::OUString extractExceptionMessage( const ::comphelper::ComponentContext& _rContext, const ::com::sun::star::uno::Any& _rError );
-
 //.........................................................................
 }   // namespace dbaccess
 //.........................................................................
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index 9573f03ba40c..1f34dfd5dd9b 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -31,58 +31,24 @@
 #ifndef _DBA_CORE_TABLE_HXX_
 #define _DBA_CORE_TABLE_HXX_
 
-#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XINDEXESSUPPLIER_HPP_
 #include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XKEYSSUPPLIER_HPP_
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_
 #include <com/sun/star/sdbcx/XRename.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XALTERTABLE_HPP_
 #include <com/sun/star/sdbcx/XAlterTable.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_
 #include <com/sun/star/sdbc/XConnection.hpp>
-#endif
 
-#ifndef _CPPUHELPER_COMPBASE2_HXX_
 #include <cppuhelper/compbase7.hxx>
-#endif
-#ifndef _DBASHARED_APITOOLS_HXX_
 #include "apitools.hxx"
-#endif
-#ifndef _DBA_CORE_DATASETTINGS_HXX_
 #include "datasettings.hxx"
-#endif
-#ifndef _DBA_COREAPI_COLUMN_HXX_
 #include <column.hxx>
-#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
 #include <connectivity/CommonTools.hxx>
-#endif
-#ifndef CONNECTIVITY_TABLEHELPER_HXX
 #include <connectivity/TTableHelper.hxx>
-#endif
-#ifndef _COMPHELPER_UNO3_HXX_
 #include <comphelper/uno3.hxx>
-#endif
-#ifndef COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX
 #include <comphelper/IdPropArrayHelper.hxx>
-#endif
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index b6aff3db3240..2cb2b29f8e87 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -37,6 +37,7 @@
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbtools.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <rtl/math.hxx>
 
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/sdb/XCompletedExecution.hpp>
@@ -633,7 +634,14 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat
         for (sal_Int32 j = _bHasCategories ? 2 : 1,i = 0; j <= nCount; ++j,++i)
         {
             aValue.fill(j,aColumnTypes[j-1],xRow);
-            aRow.push_back(aValue.getDouble());
+            if ( aValue.isNull() )
+            {
+                double nValue;
+                ::rtl::math::setNan( &nValue );
+                aRow.push_back(nValue);
+            }
+            else
+                aRow.push_back(aValue.getDouble());
         } // for (sal_Int32 j = 2,i = 0; j <= nCount; ++j,++i)
         aDataValues.push_back(aRow);
     } // while( xRes->next() && (!m_RowLimit || nRowCount < m_RowLimit) )
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index 48e08b7ff7e4..9858e1935626 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -91,39 +91,6 @@ namespace dbaccess
         return xReturn;
     }
 
-    // -------------------------------------------------------------------------
-    bool getDataSourceSetting( const Reference< XInterface >& _rxDataSource, const sal_Char* _pAsciiSettingsName,
-        Any& /* [out] */ _rSettingsValue )
-    {
-        bool bIsPresent = false;
-        try
-        {
-            Reference< XPropertySet > xDataSource( _rxDataSource, UNO_QUERY );
-            OSL_ENSURE( xDataSource.is(), "getDataSourceSetting: invalid data source object!" );
-            if ( !xDataSource.is() )
-                return false;
-
-            Sequence< PropertyValue > aSettings;
-            OSL_VERIFY( xDataSource->getPropertyValue( PROPERTY_INFO ) >>= aSettings );
-            const PropertyValue* pSetting = aSettings.getConstArray();
-            const PropertyValue* pSettingEnd = aSettings.getConstArray() + aSettings.getLength();
-            for ( ; pSetting != pSettingEnd; ++pSetting )
-            {
-                if ( pSetting->Name.equalsAscii( _pAsciiSettingsName ) )
-                {
-                    _rSettingsValue = pSetting->Value;
-                    bIsPresent = true;
-                    break;
-                }
-            }
-        }
-        catch( const Exception& )
-        {
-            OSL_ENSURE( sal_False, "getDataSourceSetting: caught an exception!" );
-        }
-        return bIsPresent;
-    }
-
 // -----------------------------------------------------------------------------
     ::rtl::OUString extractExceptionMessage( const ::comphelper::ComponentContext& _rContext, const Any& _rError )
     {
diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx
index 3f3f183ba038..89111c6e6e48 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.cxx
@@ -30,45 +30,20 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
-#ifndef DBA_XMLDATABASE_HXX
 #include "xmlDatabase.hxx"
-#endif
-#ifndef DBA_XMLFILTER_HXX
 #include "xmlfilter.hxx"
-#endif
-#ifndef _XMLOFF_XMLTOKEN_HXX
 #include <xmloff/xmltoken.hxx>
-#endif
-#ifndef _XMLOFF_XMLNMSPE_HXX
 #include <xmloff/xmlnmspe.hxx>
-#endif
-#ifndef DBA_XMLDATASOURCE_HXX
 #include "xmlDataSource.hxx"
-#endif
-#ifndef DBA_XMLDOCUMENTS_HXX
 #include "xmlDocuments.hxx"
-#endif
-#ifndef DBA_XMLENUMS_HXX
 #include "xmlEnums.hxx"
-#endif
-#ifndef _COM_SUN_STAR_SDB_XREPORTDOCUMENTSSUPPLIER_HPP_
 #include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_XFORMDOCUMENTSSUPPLIER_HPP_
 #include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_XQUERYDEFINITIONSSUPPLIER_HPP_
 #include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
-#endif
-#ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
 #include "xmlstrings.hrc"
-#endif
-#ifndef _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
+#include <connectivity/dbtools.hxx>
 
 namespace dbaxml
 {
@@ -111,25 +86,46 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext(
         case XML_TOK_FORMS:
             {
                 GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                Reference<XFormDocumentsSupplier> xSup(GetOwnImport().GetModel(),UNO_QUERY);
-                if ( xSup.is() )
-                    pContext = new OXMLDocuments( GetOwnImport(), nPrefix, rLocalName,xSup->getFormDocuments(),SERVICE_NAME_FORM_COLLECTION,SERVICE_SDB_DOCUMENTDEFINITION);
+                Any aValue;
+                ::rtl::OUString sService;
+                dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"FormSupplier",aValue);
+                aValue >>= sService;
+                if ( !sService.getLength() )
+                {
+                    Reference<XFormDocumentsSupplier> xSup(GetOwnImport().GetModel(),UNO_QUERY);
+                    if ( xSup.is() )
+                        pContext = new OXMLDocuments( GetOwnImport(), nPrefix, rLocalName,xSup->getFormDocuments(),SERVICE_NAME_FORM_COLLECTION,SERVICE_SDB_DOCUMENTDEFINITION);
+                }
             }
             break;
         case XML_TOK_REPORTS:
             {
                 GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                Reference<XReportDocumentsSupplier> xSup(GetOwnImport().GetModel(),UNO_QUERY);
-                if ( xSup.is() )
-                    pContext = new OXMLDocuments( GetOwnImport(), nPrefix, rLocalName,xSup->getReportDocuments(),SERVICE_NAME_REPORT_COLLECTION,SERVICE_SDB_DOCUMENTDEFINITION);
+                Any aValue;
+                ::rtl::OUString sService;
+                dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"ReportSupplier",aValue);
+                aValue >>= sService;
+                if ( !sService.getLength() )
+                {
+                    Reference<XReportDocumentsSupplier> xSup(GetOwnImport().GetModel(),UNO_QUERY);
+                    if ( xSup.is() )
+                        pContext = new OXMLDocuments( GetOwnImport(), nPrefix, rLocalName,xSup->getReportDocuments(),SERVICE_NAME_REPORT_COLLECTION,SERVICE_SDB_DOCUMENTDEFINITION);
+                }
             }
             break;
         case XML_TOK_QUERIES:
             {
                 GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                Reference<XQueryDefinitionsSupplier> xSup(GetOwnImport().getDataSource(),UNO_QUERY);
-                if ( xSup.is() )
-                    pContext = new OXMLDocuments( GetOwnImport(), nPrefix, rLocalName,xSup->getQueryDefinitions(),SERVICE_NAME_QUERY_COLLECTION);
+                Any aValue;
+                ::rtl::OUString sService;
+                dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"CommandDefinitionSupplier",aValue);
+                aValue >>= sService;
+                if ( !sService.getLength() )
+                {
+                    Reference<XQueryDefinitionsSupplier> xSup(GetOwnImport().getDataSource(),UNO_QUERY);
+                    if ( xSup.is() )
+                        pContext = new OXMLDocuments( GetOwnImport(), nPrefix, rLocalName,xSup->getQueryDefinitions(),SERVICE_NAME_QUERY_COLLECTION);
+                }
             }
             break;
         case XML_TOK_TABLES:
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 8008416956f4..370e849c40b3 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -31,82 +31,37 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
 
-#ifndef DBA_XMLEXPORT_HXX
 #include "xmlExport.hxx"
-#endif
-#ifndef DBA_XMLAUTOSTYLE_HXX
 #include "xmlAutoStyle.hxx"
-#endif
-#ifndef _FLT_REGHELPER_HXX_
 #include "flt_reghelper.hxx"
-#endif
-#ifndef _XMLOFF_PROGRESSBARHELPER_HXX
 #include <xmloff/ProgressBarHelper.hxx>
-#endif
-#ifndef _XMLOFF_XMLTOKEN_HXX
 #include <xmloff/xmltoken.hxx>
-#endif
-#ifndef _XMLOFF_TEXTIMP_HXX_
 #include <xmloff/txtimp.hxx>
-#endif
-#ifndef _XMLOFF_XMLNMSPE_HXX
 #include <xmloff/xmlnmspe.hxx>
-#endif
-#ifndef _XMLOFF_XMLUCONV_HXX
 #include <xmloff/xmluconv.hxx>
-#endif
-#ifndef _XMLOFF_NMSPMAP_HXX
 #include <xmloff/nmspmap.hxx>
-#endif
-#ifndef _COMPHELPER_TYPES_HXX_
 #include <comphelper/types.hxx>
-#endif
-#ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
 #include "xmlstrings.hrc"
-#endif
-#ifndef DBA_XMLENUMS_HXX
 #include "xmlEnums.hxx"
-#endif
-#ifndef _XMLOFF_NMSPMAP_HXX
 #include <xmloff/nmspmap.hxx>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATE_HPP_
 #include <com/sun/star/beans/XPropertyState.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_XFORMDOCUMENTSSUPPLIER_HPP_
 #include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_XOFFICEDATABASEDOCUMENT_HPP_
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_XREPORTDOCUMENTSSUPPLIER_HPP_
 #include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_XQUERYDEFINITIONSSUPPLIER_HPP_
 #include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
-#endif
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 
-#ifndef _COM_SUN_STAR_AWT_TEXTALIGN_HPP_
 #include <com/sun/star/awt/TextAlign.hpp>
-#endif
-#ifndef _XMLOFF_XMLUCONV_HXX
 #include <xmloff/xmluconv.hxx>
-#endif
-#ifndef DBA_XMLHELPER_HXX
 #include "xmlHelper.hxx"
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_
 #include <com/sun/star/awt/FontDescriptor.hpp>
-#endif
 #include <svtools/filenotation.hxx>
 #include <svtools/pathoptions.hxx>
 #include <tools/diagnose_ex.h>
 #include <connectivity/DriversConfig.hxx>
+#include <connectivity/dbtools.hxx>
 
 #include <boost/optional.hpp>
 
@@ -1110,47 +1065,68 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup)
 // -----------------------------------------------------------------------------
 void ODBExport::exportForms()
 {
-    Reference<XFormDocumentsSupplier> xSup(GetModel(),UNO_QUERY);
-    if ( xSup.is() )
+    Any aValue;
+    ::rtl::OUString sService;
+    dbtools::getDataSourceSetting(getDataSource(),"ReportSupplier",aValue);
+    aValue >>= sService;
+    if ( !sService.getLength() )
     {
-        Reference< XNameAccess > xCollection = xSup->getFormDocuments();
-        if ( xCollection.is() && xCollection->hasElements() )
+        Reference<XFormDocumentsSupplier> xSup(GetModel(),UNO_QUERY);
+        if ( xSup.is() )
         {
-            ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > aMemFunc(&ODBExport::exportComponent);
-            exportCollection(xCollection,XML_FORMS,XML_COMPONENT_COLLECTION,sal_True,aMemFunc);
+            Reference< XNameAccess > xCollection = xSup->getFormDocuments();
+            if ( xCollection.is() && xCollection->hasElements() )
+            {
+                ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > aMemFunc(&ODBExport::exportComponent);
+                exportCollection(xCollection,XML_FORMS,XML_COMPONENT_COLLECTION,sal_True,aMemFunc);
+            }
         }
     }
 }
 // -----------------------------------------------------------------------------
 void ODBExport::exportReports()
 {
-    Reference<XReportDocumentsSupplier> xSup(GetModel(),UNO_QUERY);
-    if ( xSup.is() )
+    Any aValue;
+    ::rtl::OUString sService;
+    dbtools::getDataSourceSetting(getDataSource(),"ReportSupplier",aValue);
+    aValue >>= sService;
+    if ( !sService.getLength() )
     {
-        Reference< XNameAccess > xCollection = xSup->getReportDocuments();
-        if ( xCollection.is() && xCollection->hasElements() )
+        Reference<XReportDocumentsSupplier> xSup(GetModel(),UNO_QUERY);
+        if ( xSup.is() )
         {
-            ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > aMemFunc(&ODBExport::exportComponent);
-            exportCollection(xCollection,XML_REPORTS,XML_COMPONENT_COLLECTION,sal_True,aMemFunc);
+            Reference< XNameAccess > xCollection = xSup->getReportDocuments();
+            if ( xCollection.is() && xCollection->hasElements() )
+            {
+                ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > aMemFunc(&ODBExport::exportComponent);
+                exportCollection(xCollection,XML_REPORTS,XML_COMPONENT_COLLECTION,sal_True,aMemFunc);
+            }
         }
     }
 }
 // -----------------------------------------------------------------------------
 void ODBExport::exportQueries(sal_Bool _bExportContext)
 {
-    Reference<XQueryDefinitionsSupplier> xSup(getDataSource(),UNO_QUERY);
-    if ( xSup.is() )
+    Any aValue;
+    ::rtl::OUString sService;
+    dbtools::getDataSourceSetting(getDataSource(),"CommandDefinitionSupplier",aValue);
+    aValue >>= sService;
+    if ( !sService.getLength() )
     {
-        Reference< XNameAccess > xCollection = xSup->getQueryDefinitions();
-        if ( xCollection.is() && xCollection->hasElements() )
+        Reference<XQueryDefinitionsSupplier> xSup(getDataSource(),UNO_QUERY);
+        if ( xSup.is() )
         {
-            ::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
-            if ( _bExportContext )
-                pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportQuery) );
-            else
-                pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportAutoStyle) );
+            Reference< XNameAccess > xCollection = xSup->getQueryDefinitions();
+            if ( xCollection.is() && xCollection->hasElements() )
+            {
+                ::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
+                if ( _bExportContext )
+                    pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportQuery) );
+                else
+                    pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportAutoStyle) );
 
-            exportCollection(xCollection,XML_QUERIES,XML_QUERY_COLLECTION,_bExportContext,*pMemFunc);
+                exportCollection(xCollection,XML_QUERIES,XML_QUERY_COLLECTION,_bExportContext,*pMemFunc);
+            }
         }
     }
 }
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 8db327fb8b85..1caae8c6bf11 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1712,7 +1712,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
             {
                 // a native statement can't be filtered or sorted
                 const Reference< XPropertySet >  xFormSet(getRowSet(), UNO_QUERY);
-                if ( !::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_ESCAPE_PROCESSING)))
+                if ( !::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_ESCAPE_PROCESSING)) || !m_xParser.is() )
                     break;
 
                 Reference< XPropertySet >  xCurrentField = getBoundField();
@@ -1731,7 +1731,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
             break;
 
             case ID_BROWSER_FILTERCRIT:
-                if ( m_bCannotSelectUnfiltered )
+                if ( m_bCannotSelectUnfiltered && m_xParser.is() )
                 {
                     aReturn.bEnabled = sal_True;
                     break;
@@ -1740,7 +1740,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
             case ID_BROWSER_ORDERCRIT:
                 {
                     const Reference< XPropertySet >  xFormSet(getRowSet(), UNO_QUERY);
-                    if ( !::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_ESCAPE_PROCESSING)))
+                    if ( !::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_ESCAPE_PROCESSING)) || !m_xParser.is() )
                         break;
 
                     aReturn.bEnabled =  getRowSet().is()
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 51121b022e88..6e522dd293f0 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -119,9 +119,21 @@ SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType( SvLBoxEntry*
         return etTableOrView;
 
     if (pQueries == pEntryParent)
+    {
+        DBTreeListUserData* pEntryData = static_cast<DBTreeListUserData*>(_pEntry->GetUserData());
+        if ( pEntryData )
+            return pEntryData->eType;
+
         return etQuery;
+    }
+    while( pEntryParent != pQueries )
+    {
+        pEntryParent = m_pTreeView->getListBox().GetParent(pEntryParent);
+        if ( !pEntryParent )
+            return etUnknown;
+    }
 
-    return etUnknown;
+    return etQueryContainer;
 }
 //------------------------------------------------------------------------------
 void SbaTableQueryBrowser::select(SvLBoxEntry* _pEntry, sal_Bool _bSelect)
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index b2cfbe04a515..5b32eff98d25 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -519,6 +519,8 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
 
                 DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(m_pCurrentlyDisplayed->GetUserData());
                 OSL_ENSURE( pData->xObjectProperties.is(), "SbaTableQueryBrowser::InitializeGridModel: No table available!" );
+                if ( !pData->xObjectProperties.is() )
+                    return sal_False;
 
                 ::rtl::OUString* pStringIter = aProperties.getArray();
                 Any* pValueIter = aValues.getArray();
@@ -732,7 +734,7 @@ Reference<XPropertySet> getColumnHelper(SvLBoxEntry* _pCurrentlyDisplayed,const
         ::rtl::OUString aName;
         _rxSource->getPropertyValue(PROPERTY_NAME) >>= aName;
         if(xNames.is() && xNames->hasByName(aName))
-            ::cppu::extractInterface(xRet,xNames->getByName(aName));
+            xRet.set(xNames->getByName(aName),UNO_QUERY);
     }
     return xRet;
 }
@@ -1100,7 +1102,47 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::rtl::OUString& _rDataS
                     m_pTreeView->getListBox().Expand(pCommandType);
 
                 // look for the object
-                pObject = m_pTreeView->getListBox().GetEntryPosByName(_rCommand, pCommandType);
+                ::rtl::OUString sCommand = _rCommand;
+                sal_Int32 nIndex = 0;
+                do
+                {
+                    ::rtl::OUString sPath = sCommand.getToken( 0, '/', nIndex );
+                    pObject = m_pTreeView->getListBox().GetEntryPosByName(sPath, pCommandType);
+                    pCommandType = pObject;
+                    if ( nIndex >= 0 )
+                    {
+                        if (ensureEntryObject(pObject))
+                        {
+                            DBTreeListUserData* pParentData = static_cast< DBTreeListUserData* >( pObject->GetUserData() );
+                            Reference< XNameAccess > xCollection( pParentData->xContainer, UNO_QUERY );
+                            sal_Int32 nIndex2 = nIndex;
+                            sPath = sCommand.getToken( 0, '/', nIndex2 );
+                            try
+                            {
+                                if ( xCollection->hasByName(sPath) )
+                                {
+                                    if(!m_pTreeView->getListBox().GetEntryPosByName(sPath,pObject))
+                                    {
+                                        Reference<XNameAccess> xChild(xCollection->getByName(sPath),UNO_QUERY);
+                                        DBTreeListUserData* pEntryData = new DBTreeListUserData;
+                                        pEntryData->eType = etQuery;
+                                        if ( xChild.is() )
+                                        {
+                                            pEntryData->eType = etQueryContainer;
+                                        }
+                                        implAppendEntry( pObject, sPath, pEntryData, pEntryData->eType );
+                                    }
+                                }
+                            }
+                            catch(Exception&)
+                            {
+                                DBG_ERROR("SbaTableQueryBrowser::populateTree: could not fill the tree");
+                            }
+                        }
+                    }
+                     //   m_pTreeView->getListBox().Expand(pCommandType);
+                }
+                while ( nIndex >= 0 );
             }
         }
     }
@@ -1991,7 +2033,7 @@ void SbaTableQueryBrowser::initializeTreeModel()
     }
 }
 // -------------------------------------------------------------------------
-sal_Bool SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAccess,
+void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAccess,
                                             SvLBoxEntry* _pParent,
                                             EntryType _eEntryType)
 {
@@ -2008,34 +2050,39 @@ sal_Bool SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xName
         {
             if(!m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent))
             {
+                Reference<XNameAccess> xChild(_xNameAccess->getByName(*pIter),UNO_QUERY);
                 DBTreeListUserData* pEntryData = new DBTreeListUserData;
                 pEntryData->eType = _eEntryType;
-                implAppendEntry( _pParent, *pIter, pEntryData, _eEntryType );
+                if ( _eEntryType == etQuery && xChild.is() )
+                {
+                    pEntryData->eType = etQueryContainer;
+                }
+                implAppendEntry( _pParent, *pIter, pEntryData, pEntryData->eType );
             }
         }
     }
     catch(Exception&)
     {
         DBG_ERROR("SbaTableQueryBrowser::populateTree: could not fill the tree");
-        return sal_False;
     }
-    return sal_True;
 }
 
 //------------------------------------------------------------------------------
-void SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const String& _rName, void* _pUserData, EntryType _eEntryType )
+SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const String& _rName, void* _pUserData, EntryType _eEntryType )
 {
     ::std::auto_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) );
 
     Image aImage, aImageHC;
     pImageProvider->getImages( _rName, getDatabaseObjectType( _eEntryType ), aImage, aImageHC );
 
-    SvLBoxEntry* pNewEntry = m_pTreeView->getListBox().InsertEntry( _rName, _pParent, sal_False, LIST_APPEND, _pUserData );
+    SvLBoxEntry* pNewEntry = m_pTreeView->getListBox().InsertEntry( _rName, _pParent, _eEntryType == etQueryContainer , LIST_APPEND, _pUserData );
 
     m_pTreeView->getListBox().SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
     m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
     m_pTreeView->getListBox().SetExpandedEntryBmp( pNewEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
     m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
+
+    return pNewEntry;
 }
 
 //------------------------------------------------------------------------------
@@ -2166,29 +2213,54 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvLBoxEntry* _pEntry )
                 break;
             }
 
-            try
             {
-                Reference< XQueryDefinitionsSupplier > xQuerySup;
-                m_xDatabaseContext->getByName( getDataSourceAcessor( pDataSourceEntry ) ) >>= xQuerySup;
-                if (xQuerySup.is())
+                SvLBoxEntry* pParent = m_pTreeView->getListBox().GetParent(_pEntry);
+                if ( pParent != pDataSourceEntry )
                 {
-                    Reference< XNameAccess > xQueryDefs = xQuerySup->getQueryDefinitions();
-                    Reference< XContainer > xCont(xQueryDefs, UNO_QUERY);
-                    if (xCont.is())
-                        // add as listener to get notified if elements are inserted or removed
-                        xCont->addContainerListener(this);
+                    SvLBoxString* pString = (SvLBoxString*)_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING);
+                    OSL_ENSURE(pString,"There must be a string item!");
+                    ::rtl::OUString aName(pString->GetText());
+                    DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pParent->GetUserData());
+                    try
+                    {
+                        Reference< XNameAccess > xNameAccess(pData->xContainer,UNO_QUERY);
+                        if ( xNameAccess.is() )
+                            pEntryData->xContainer.set(xNameAccess->getByName(aName),UNO_QUERY);
+                    }
+                    catch(const Exception& )
+                    {
+                        DBG_UNHANDLED_EXCEPTION();
+                    }
 
-                    pEntryData->xContainer = xQueryDefs;
                     bSuccess = pEntryData->xContainer.is();
                 }
-                else {
-                    DBG_ERROR("SbaTableQueryBrowser::ensureEntryObject: no XQueryDefinitionsSupplier interface!");
+                else
+                {
+                    try
+                    {
+                        Reference< XQueryDefinitionsSupplier > xQuerySup;
+                        m_xDatabaseContext->getByName( getDataSourceAcessor( pDataSourceEntry ) ) >>= xQuerySup;
+                        if (xQuerySup.is())
+                        {
+                            Reference< XNameAccess > xQueryDefs = xQuerySup->getQueryDefinitions();
+                            Reference< XContainer > xCont(xQueryDefs, UNO_QUERY);
+                            if (xCont.is())
+                                // add as listener to get notified if elements are inserted or removed
+                                xCont->addContainerListener(this);
+
+                            pEntryData->xContainer = xQueryDefs;
+                            bSuccess = pEntryData->xContainer.is();
+                        }
+                        else {
+                            DBG_ERROR("SbaTableQueryBrowser::ensureEntryObject: no XQueryDefinitionsSupplier interface!");
+                        }
+                    }
+                    catch( const Exception& )
+                    {
+                        DBG_UNHANDLED_EXCEPTION();
+                    }
                 }
             }
-            catch( const Exception& )
-            {
-                DBG_UNHANDLED_EXCEPTION();
-            }
             break;
 
         default:
@@ -2343,7 +2415,18 @@ IMPL_LINK(SbaTableQueryBrowser, OnSelectionChange, void*, /*NOINTERESTEDIN*/)
 {
     return implSelect( m_pTreeView->getListBox().FirstSelected() ) ? 1L : 0L;
 }
-
+//------------------------------------------------------------------------------
+SvLBoxEntry* SbaTableQueryBrowser::implGetConnectionEntry(SvLBoxEntry* _pEntry) const
+{
+    SvLBoxEntry* pCurrentEntry = _pEntry;
+    DBTreeListUserData* pEntryData = static_cast< DBTreeListUserData* >( pCurrentEntry->GetUserData() );
+    while(pEntryData->eType != etDatasource )
+    {
+        pCurrentEntry = m_pTreeModel->GetParent(pCurrentEntry);
+        pEntryData = static_cast< DBTreeListUserData* >( pCurrentEntry->GetUserData() );
+    }
+    return pCurrentEntry;
+}
 //------------------------------------------------------------------------------
 bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry )
 {
@@ -2369,7 +2452,7 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry )
     DBTreeListUserData* pContainerData = static_cast<DBTreeListUserData*>(pContainer->GetUserData());
 
     // get the entry for the datasource
-    SvLBoxEntry* pConnection = m_pTreeModel->GetParent(pContainer);
+    SvLBoxEntry* pConnection = implGetConnectionEntry(pContainer);
     DBTreeListUserData* pConData = static_cast<DBTreeListUserData*>(pConnection->GetUserData());
 
     // reinitialize the rowset
@@ -2380,12 +2463,26 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry )
     xRowSetProps->getPropertyValue(PROPERTY_COMMAND) >>= aOldName;
     sal_Int32 nOldType = 0;
     xRowSetProps->getPropertyValue(PROPERTY_COMMAND_TYPE) >>= nOldType;
-    Reference<XConnection> xOldConnection;
-    ::cppu::extractInterface(xOldConnection,xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION));
+    Reference<XConnection> xOldConnection(xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY);
+
     // the name of the table or query
     SvLBoxString* pString = (SvLBoxString*)_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING);
     OSL_ENSURE(pString,"There must be a string item!");
-    ::rtl::OUString aName(pString->GetText().GetBuffer());
+    const ::rtl::OUString sSimpleName = pString->GetText();
+    ::rtl::OUStringBuffer sNameBuffer(sSimpleName);
+    if ( etQueryContainer == pContainerData->eType )
+    {
+        SvLBoxEntry* pTemp = pContainer;
+        while( m_pTreeModel->GetParent(pTemp) != pConnection )
+        {
+            sNameBuffer.insert(0,sal_Unicode('/'));
+            pString = (SvLBoxString*)pTemp->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING);
+            OSL_ENSURE(pString,"There must be a string item!");
+            sNameBuffer.insert(0,pString->GetText());
+            pTemp = m_pTreeModel->GetParent(pTemp);
+        }
+    }
+    ::rtl::OUString aName = sNameBuffer.makeStringAndClear();
 
     sal_Int32 nCommandType =    ( etTableContainer == pContainerData->eType)
                             ?   CommandType::TABLE
@@ -2443,9 +2540,14 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry )
                     break;
                 case CommandType::QUERY:
                     {
-                        Reference<XQueriesSupplier> xSup( pConData->xConnection, UNO_QUERY );
-                        if(xSup.is())
-                            xNameAccess = xSup->getQueries();
+                        if ( pContainerData->xContainer.is() )
+                            xNameAccess.set( pContainerData->xContainer, UNO_QUERY );
+                        else
+                        {
+                            Reference<XQueriesSupplier> xSup( pConData->xConnection, UNO_QUERY );
+                            if(xSup.is())
+                                xNameAccess = xSup->getQueries();
+                        }
                     }
                     break;
             }
@@ -2453,13 +2555,13 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry )
             sStatus.SearchAndReplaceAscii("$name$", aName);
             BrowserViewStatusDisplay aShowStatus(static_cast<UnoDataBrowserView*>(getView()), sStatus);
 
-            if(xNameAccess.is() && xNameAccess->hasByName(aName))
+            if(xNameAccess.is() && xNameAccess->hasByName(sSimpleName))
             {
                 DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(_pEntry->GetUserData());
                 if ( !pData->xObjectProperties.is() )
                 {
                     Reference<XInterface> xObject;
-                    if(xNameAccess->getByName(aName) >>= xObject) // remember the table or query object
+                    if(xNameAccess->getByName(sSimpleName) >>= xObject) // remember the table or query object
                     {
                         pData->xObjectProperties = pData->xObjectProperties.query( xObject );
                         // if the query contains a parameterized statement and preview is enabled we won't get any data.
@@ -3499,7 +3601,7 @@ void SbaTableQueryBrowser::loadMenu(const Reference< XFrame >& _xFrame)
     {
         SvLBoxEntry* pContainer = m_pTreeModel->GetParent(m_pCurrentlyDisplayed);
         // get the entry for the datasource
-        SvLBoxEntry* pConnection = m_pTreeModel->GetParent(pContainer);
+        SvLBoxEntry* pConnection = implGetConnectionEntry(pContainer);
         ::rtl::OUString sName = m_pTreeView->getListBox().GetEntryText(m_pCurrentlyDisplayed);
         sTitle = GetEntryText( pConnection );
         INetURLObject aURL(sTitle);
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index dd7e736240ec..fd62eba4ff5f 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -356,6 +356,11 @@ void ODbDataSourceAdministrationHelper::clearPassword()
 // -----------------------------------------------------------------------------
 Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver()
 {
+    return getDriver(getConnectionURL());
+}
+// -----------------------------------------------------------------------------
+Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const ::rtl::OUString& _sURL)
+{
     // get the global DriverManager
     Reference< XDriverAccess > xDriverManager;
     String sCurrentActionError = String(ModuleRes(STR_COULDNOTCREATE_DRIVERMANAGER));
@@ -376,11 +381,11 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver()
         throw SQLException(sCurrentActionError, getORB(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")), 0, Any());
 
 
-    Reference< XDriver > xDriver = xDriverManager->getDriverByURL(getConnectionURL());
+    Reference< XDriver > xDriver = xDriverManager->getDriverByURL(_sURL);
     if (!xDriver.is())
     {
         sCurrentActionError = String(ModuleRes(STR_NOREGISTEREDDRIVER));
-        sCurrentActionError.SearchAndReplaceAscii("#connurl#", getConnectionURL());
+        sCurrentActionError.SearchAndReplaceAscii("#connurl#", _sURL);
         // will be caught and translated into an SQLContext exception
         throw SQLException(sCurrentActionError, getORB(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")), 0, Any());
     }
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index a194ebc7b23c..6c64363a1623 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -140,6 +140,7 @@ namespace dbaui
         /** return the corresponding driver for the selected URL
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >         getDriver();
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >         getDriver(const ::rtl::OUString& _sURL);
 
         /** returns the data source the dialog is currently working with
         */
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index bab1dcca3694..ced0640b928c 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -945,7 +945,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
     {
         ::rtl::OUString sEmbeddedURL = m_pCollection->getEmbeddedDatabase();
         ::connectivity::DriversConfig aDriverConfig(getORB());
-        if ( !aDriverConfig.getDriverFactoryName(sEmbeddedURL).getLength() )
+        if ( !aDriverConfig.getDriverFactoryName(sEmbeddedURL).getLength() || m_pImpl->getDriver(sEmbeddedURL).is() )
             sEmbeddedURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:"));
 
         return sEmbeddedURL;
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 23d9cfd5b542..3436d565367f 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -374,7 +374,7 @@ namespace dbaui
         */
         void        closeConnection(SvLBoxEntry* _pEntry,sal_Bool _bDisposeConnection = sal_True);
 
-        sal_Bool    populateTree(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xNameAccess, SvLBoxEntry* _pParent, EntryType _eEntryType);
+        void        populateTree(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xNameAccess, SvLBoxEntry* _pParent, EntryType _eEntryType);
         void        initializeTreeModel();
 
         /** search in the tree for query- or tablecontainer equal to this interface and return
@@ -433,8 +433,9 @@ namespace dbaui
             sal_Bool _bSelectDirect = sal_False
         );
 
+        SvLBoxEntry* implGetConnectionEntry(SvLBoxEntry* _pEntry) const;
         /// inserts an entry into the tree
-        void implAppendEntry(
+        SvLBoxEntry* implAppendEntry(
             SvLBoxEntry* _pParent,
             const String& _rName,
             void* _pUserData,
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index b95423b77c24..b5733d0bebe5 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -509,6 +509,8 @@ sal_Bool OHTMLReader::CreateTable(int nToken)
                     else if ( m_sCurrent.Len() )
                         aColumnName = m_sCurrent;
 
+                    aColumnName.EraseLeadingChars();
+                    aColumnName.EraseTrailingChars();
                     CreateDefaultColumn(aColumnName);
                     aColumnName.Erase();
                     m_sCurrent.Erase();
@@ -553,6 +555,8 @@ sal_Bool OHTMLReader::CreateTable(int nToken)
 
     if ( m_sCurrent.Len() )
         aColumnName = m_sCurrent;
+    aColumnName.EraseLeadingChars();
+    aColumnName.EraseTrailingChars();
     if(aColumnName.Len())
         CreateDefaultColumn(aColumnName);
 
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index a964b0e13d38..2d2d6e5ed241 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -323,6 +323,8 @@ IMPL_LINK( OWizTypeSelect, ColumnSelectHdl, MultiListBox *, /*pListBox*/ )
     OFieldDescription* pField = static_cast<OFieldDescription*>(m_lbColumnNames.GetEntryData(m_lbColumnNames.GetEntryPos(aColumnName)));
     if(pField)
         m_aTypeControl.DisplayData(pField);
+
+    m_aTypeControl.Enable(m_lbColumnNames.GetSelectEntryCount() == 1 );
     return 0;
 }
 // -----------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 1b468b2a69c9..16fd0a9211ef 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -757,11 +757,22 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes
         bool bInternational = ( nPass % 2 ) == 0;
 
         ::rtl::OUString sSql;
-        sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT "));
         if ( bQuote )
             sSql += ::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), _sFieldName );
         else
             sSql += _sFieldName;
+
+        if  ( _pEntry->isAggreateFunction() )
+        {
+            DBG_ASSERT(_pEntry->GetFunction().getLength(),"Functionname darf hier nicht leer sein! ;-(");
+            ::rtl::OUStringBuffer aTmpStr2( _pEntry->GetFunction());
+            aTmpStr2.appendAscii("(");
+            aTmpStr2.append(sSql);
+            aTmpStr2.appendAscii(")");
+            sSql = aTmpStr2.makeStringAndClear();
+        }
+
+        sSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")) + sSql;
         if ( sFieldAlias.getLength() )
         { // always quote the alias name there canbe no function in it
             sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));