Attachment 39384 Details for Bug 30801 – Remove tons of comments

[patch] Remove tons of comments

0001-Removed-tons-of-comments.patch (text/plain), 772.79 KB, created by Gil Forcada on 2010-10-12 07:12:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gil Forcada

Created: 2010-10-12 07:12:27 UTC

Size: 772.79 KB

patch

obsolete

>From 2c63d1b3a3504204f6ac45ccffde52244ce90c4b Mon Sep 17 00:00:00 2001
>From: Gil Forcada <gforcada@gnome.org>
>Date: Tue, 12 Oct 2010 16:04:58 +0200
>Subject: [PATCH] Removed tons of comments
>
>---
> dbaccess/source/core/api/BookmarkSet.cxx           |   15 --
> dbaccess/source/core/api/CIndexes.cxx              |    5 -
> dbaccess/source/core/api/CRowSetColumn.cxx         |    4 -
> dbaccess/source/core/api/CRowSetDataColumn.cxx     |   17 --
> dbaccess/source/core/api/CRowSetDataColumn.hxx     |    1 -
> dbaccess/source/core/api/CacheSet.cxx              |   56 -------
> dbaccess/source/core/api/FilteredContainer.cxx     |   12 --
> dbaccess/source/core/api/HelperCollections.cxx     |    6 -
> dbaccess/source/core/api/HelperCollections.hxx     |    1 -
> dbaccess/source/core/api/KeySet.cxx                |   62 -------
> dbaccess/source/core/api/KeySet.hxx                |    6 -
> dbaccess/source/core/api/OptimisticSet.cxx         |   18 --
> dbaccess/source/core/api/OptimisticSet.hxx         |    1 -
> dbaccess/source/core/api/RowSet.cxx                |  168 --------------------
> dbaccess/source/core/api/RowSetBase.cxx            |   95 -----------
> dbaccess/source/core/api/RowSetCache.cxx           |   59 -------
> dbaccess/source/core/api/RowSetCacheIterator.cxx   |   14 --
> .../source/core/api/SingleSelectQueryComposer.cxx  |   53 ------
> dbaccess/source/core/api/StaticSet.cxx             |   34 ----
> dbaccess/source/core/api/TableDeco.cxx             |   37 -----
> dbaccess/source/core/api/View.cxx                  |    8 -
> dbaccess/source/core/api/WrappedResultSet.cxx      |   15 --
> dbaccess/source/core/api/callablestatement.cxx     |   29 ----
> dbaccess/source/core/api/column.cxx                |   33 ----
> dbaccess/source/core/api/columnsettings.cxx        |    6 -
> dbaccess/source/core/api/datacolumn.cxx            |   45 ------
> dbaccess/source/core/api/datasettings.cxx          |    6 -
> dbaccess/source/core/api/definitioncolumn.cxx      |   46 ------
> dbaccess/source/core/api/preparedstatement.cxx     |   40 -----
> dbaccess/source/core/api/query.cxx                 |   18 --
> dbaccess/source/core/api/query.hxx                 |    1 -
> dbaccess/source/core/api/querycomposer.cxx         |   27 ---
> dbaccess/source/core/api/querycontainer.cxx        |   25 ---
> dbaccess/source/core/api/querydescriptor.cxx       |   30 ----
> dbaccess/source/core/api/resultcolumn.cxx          |   11 --
> dbaccess/source/core/api/resultset.cxx             |   94 -----------
> dbaccess/source/core/api/statement.cxx             |   40 -----
> dbaccess/source/core/api/table.cxx                 |   25 ---
> dbaccess/source/core/api/tablecontainer.cxx        |   18 --
> dbaccess/source/core/api/viewcontainer.cxx         |   13 --
> .../source/core/dataaccess/ComponentDefinition.cxx |   23 ---
> dbaccess/source/core/dataaccess/ContentHelper.cxx  |   30 ----
> dbaccess/source/core/dataaccess/ModelImpl.cxx      |   74 ---------
> .../source/core/dataaccess/SharedConnection.cxx    |   16 --
> .../source/core/dataaccess/SharedConnection.hxx    |    1 -
> .../source/core/dataaccess/bookmarkcontainer.cxx   |   27 ---
> .../source/core/dataaccess/bookmarkcontainer.hxx   |    1 -
> .../source/core/dataaccess/commandcontainer.cxx    |    7 -
> .../source/core/dataaccess/commanddefinition.cxx   |   13 --
> dbaccess/source/core/dataaccess/connection.cxx     |   58 -------
> .../core/dataaccess/dataaccessdescriptor.cxx       |   21 ---
> .../source/core/dataaccess/databasecontext.cxx     |   44 -----
> .../source/core/dataaccess/databasedocument.cxx    |  109 -------------
> .../core/dataaccess/databaseregistrations.cxx      |   18 --
> dbaccess/source/core/dataaccess/datasource.cxx     |   71 --------
> .../source/core/dataaccess/definitioncontainer.cxx |   37 -----
> .../source/core/dataaccess/documentcontainer.cxx   |   28 ----
> .../source/core/dataaccess/documentdefinition.cxx  |   70 --------
> .../source/core/dataaccess/documentdefinition.hxx  |    2 -
> .../core/dataaccess/documenteventexecutor.cxx      |    5 -
> .../core/dataaccess/documenteventnotifier.cxx      |   17 --
> dbaccess/source/core/dataaccess/documentevents.cxx |   12 --
> dbaccess/source/core/dataaccess/intercept.cxx      |    2 -
> dbaccess/source/core/inc/column.hxx                |    2 -
> dbaccess/source/core/inc/core_resource.hrc         |    2 -
> dbaccess/source/core/inc/querycontainer.hxx        |    1 -
> dbaccess/source/core/inc/sdbcoretools.hxx          |    4 -
> dbaccess/source/core/misc/ContainerListener.cxx    |    8 -
> dbaccess/source/core/misc/ContainerMediator.cxx    |    9 -
> dbaccess/source/core/misc/DatabaseDataProvider.cxx |  109 -------------
> dbaccess/source/core/misc/PropertyForward.cxx      |    5 -
> dbaccess/source/core/misc/apitools.cxx             |    6 -
> dbaccess/source/core/misc/dsntypes.cxx             |   35 ----
> dbaccess/source/core/misc/objectnameapproval.cxx   |    3 -
> dbaccess/source/core/misc/sdbcoretools.cxx         |    5 -
> dbaccess/source/core/misc/services.cxx             |    4 -
> dbaccess/source/core/misc/userinformation.cxx      |    1 -
> dbaccess/source/core/misc/veto.cxx                 |    4 -
> dbaccess/source/core/recovery/dbdocrecovery.cxx    |    4 -
> dbaccess/source/core/recovery/settingsimport.cxx   |   21 ---
> dbaccess/source/core/recovery/storagestream.cxx    |    6 -
> .../source/core/recovery/storagetextstream.cxx     |    6 -
> dbaccess/source/core/recovery/storagexmlstream.cxx |   11 --
> .../source/core/recovery/subcomponentloader.cxx    |    8 -
> .../source/core/recovery/subcomponentrecovery.cxx  |   22 ---
> dbaccess/source/core/recovery/subcomponents.hxx    |    3 -
> dbaccess/source/core/resource/core_resource.cxx    |    7 -
> 87 files changed, 0 insertions(+), 2166 deletions(-)
>
>diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
>index e896469..ba5e0fe 100644
>--- a/dbaccess/source/core/api/BookmarkSet.cxx
>+++ b/dbaccess/source/core/api/BookmarkSet.cxx
>@@ -55,43 +55,36 @@ void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const ::r
>     OCacheSet::construct(_xDriverSet,i_sRowSetFilter);
>     m_xRowLocate.set(_xDriverSet,UNO_QUERY);
> }
>-// -----------------------------------------------------------------------------
> Any SAL_CALL OBookmarkSet::getBookmark() throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::getBookmark" );
>     return m_xRowLocate->getBookmark();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OBookmarkSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::moveToBookmark" );
>     return m_xRowLocate->moveToBookmark(bookmark);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OBookmarkSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::moveRelativeToBookmark" );
>     return m_xRowLocate->moveRelativeToBookmark(bookmark,rows);
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL OBookmarkSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::compareBookmarks" );
>     return m_xRowLocate->compareBookmarks(_first,_second);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OBookmarkSet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::hasOrderedBookmarks" );
>     return m_xRowLocate->hasOrderedBookmarks();
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL OBookmarkSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::hashBookmark" );
>     return m_xRowLocate->hashBookmark(bookmark);
> }
>-// -------------------------------------------------------------------------
> // ::com::sun::star::sdbcx::XDeleteRows
> Sequence< sal_Int32 > SAL_CALL OBookmarkSet::deleteRows( const Sequence< Any >& rows ,const connectivity::OSQLTable& /*_xTable*/) throw(SQLException, RuntimeException)
> {
>@@ -103,7 +96,6 @@ Sequence< sal_Int32 > SAL_CALL OBookmarkSet::deleteRows( const Sequence< Any >&
>     }
>     return Sequence< sal_Int32 >();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::insertRow" );
>@@ -128,7 +120,6 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne
>     else
>         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), SQL_GENERAL_ERROR, *this );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::updateRow" );
>@@ -153,7 +144,6 @@ void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowS
>     else
>         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), SQL_GENERAL_ERROR, *this );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::deleteRow" );
>@@ -161,12 +151,10 @@ void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const c
> 
>     xUpd->deleteRow();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OBookmarkSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::cancelRowUpdates" );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OBookmarkSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::moveToInsertRow" );
>@@ -174,18 +162,15 @@ void SAL_CALL OBookmarkSet::moveToInsertRow(  ) throw(SQLException, RuntimeExcep
>     if(xUpd.is())
>         xUpd->moveToInsertRow();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OBookmarkSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::moveToCurrentRow" );
> }
>-// -------------------------------------------------------------------------
> void OBookmarkSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::fillValueRow" );
>     OCacheSet::fillValueRow(_rRow,_nPosition);
> }
>-// -------------------------------------------------------------------------
> void OBookmarkSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParameter,const ORowSetValue& _rValue)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::updateColumn" );
>diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx
>index 27fd74a..8ed5d27 100644
>--- a/dbaccess/source/core/api/CIndexes.cxx
>+++ b/dbaccess/source/core/api/CIndexes.cxx
>@@ -59,7 +59,6 @@ ObjectType OIndexes::createObject(const ::rtl::OUString& _rName)
> 
>     return xRet;
> }
>-// -------------------------------------------------------------------------
> Reference< XPropertySet > OIndexes::createDescriptor()
> {
>     Reference<XDataDescriptorFactory> xData( m_xIndexes,UNO_QUERY);
>@@ -68,7 +67,6 @@ Reference< XPropertySet > OIndexes::createDescriptor()
>     else
>         return OIndexesHelper::createDescriptor();
> }
>-// -------------------------------------------------------------------------
> // XAppend
> ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
> {
>@@ -79,7 +77,6 @@ ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Refer
>     xData->appendByDescriptor(descriptor);
>     return createObject( _rForName );
> }
>-// -------------------------------------------------------------------------
> // XDrop
> void OIndexes::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
> {
>@@ -92,7 +89,6 @@ void OIndexes::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
>     else
>         OIndexesHelper::dropObject(_nPos,_sElementName);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OIndexes::disposing(void)
> {
>     if ( m_xIndexes.is() )
>@@ -100,7 +96,6 @@ void SAL_CALL OIndexes::disposing(void)
>     else
>         OIndexesHelper::disposing();
> }
>-// -----------------------------------------------------------------------------
> 
> 
> 
>diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
>index 60c4fe1..9bfa7e7 100644
>--- a/dbaccess/source/core/api/CRowSetColumn.cxx
>+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
>@@ -48,14 +48,12 @@ namespace dbaccess
> {
> //..............................................................................
> 
>-//------------------------------------------------------------------------------
> ORowSetColumn::ORowSetColumn(	const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos,
>                 const Reference< XDatabaseMetaData >& _rxDBMeta, const ::rtl::OUString& _rDescription, const ::rtl::OUString& i_sLabel,ORowSetCacheIterator& _rColumnValue )
>     :ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, _rDescription, i_sLabel,_rColumnValue )
> {
> }
> 
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* ORowSetColumn::createArrayHelper( ) const
> {
>     const sal_Int32 nDerivedProperties = 21;
>@@ -92,13 +90,11 @@ ORowSetColumn::ORowSetColumn(	const Reference < XResultSetMetaData >& _xMetaData
>     return new ::cppu::OPropertyArrayHelper( ::comphelper::concatSequences( aDerivedProperties, aRegisteredProperties ), sal_False );
> }
> 
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& ORowSetColumn::getInfoHelper()
> {
>     return *static_cast< ::comphelper::OPropertyArrayUsageHelper< ORowSetColumn >* >(this)->getArrayHelper();
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL ORowSetColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue )throw (Exception)
> {
>     OSL_ENSURE( nHandle != PROPERTY_ID_VALUE, "ORowSetColumn::setFastPropertyValue_NoBroadcast: hmm? This property is marked as READONLY!" );
>diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
>index ab1ef90..6a6e8a0 100644
>--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
>+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
>@@ -50,7 +50,6 @@ using namespace cppu;
> using namespace osl;
> 
> DBG_NAME(ORowSetDataColumn)
>-// -------------------------------------------------------------------------
> ORowSetDataColumn::ORowSetDataColumn(	const Reference < XResultSetMetaData >& _xMetaData,
>                                       const Reference < XRow >& _xRow,
>                                       const Reference < XRowUpdate >& _xRowUpdate,
>@@ -68,14 +67,11 @@ ORowSetDataColumn::ORowSetDataColumn(	const Reference < XResultSetMetaData >& _x
>     OColumnSettings::registerProperties( *this );
>     registerProperty( PROPERTY_DESCRIPTION, PROPERTY_ID_DESCRIPTION, PropertyAttribute::READONLY, &m_aDescription, ::getCppuType( &m_aDescription ) );
> }
>-// -------------------------------------------------------------------------
> ORowSetDataColumn::~ORowSetDataColumn()
> {
>     DBG_DTOR(ORowSetDataColumn,NULL);
> }
>-// -------------------------------------------------------------------------
> // comphelper::OPropertyArrayUsageHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* ORowSetDataColumn::createArrayHelper( ) const
> {
>     const sal_Int32 nDerivedProperties = 21;
>@@ -113,12 +109,10 @@ ORowSetDataColumn::~ORowSetDataColumn()
> }
> 
> // cppu::OPropertySetHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& ORowSetDataColumn::getInfoHelper()
> {
>     return *static_cast< ::comphelper::OPropertyArrayUsageHelper< ORowSetDataColumn >* >(this)->getArrayHelper();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSetDataColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
> {
>     if ( PROPERTY_ID_VALUE == nHandle )
>@@ -140,7 +134,6 @@ void SAL_CALL ORowSetDataColumn::getFastPropertyValue( Any& rValue, sal_Int32 nH
>         ODataColumn::getFastPropertyValue( rValue, nHandle );
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSetDataColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue )throw (Exception)
> {
>     switch( nHandle )
>@@ -160,7 +153,6 @@ void SAL_CALL ORowSetDataColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHan
>             break;
>     }
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetDataColumn::convertFastPropertyValue( Any & rConvertedValue,
>                                                             Any & rOldValue,
>                                                             sal_Int32 nHandle,
>@@ -190,7 +182,6 @@ sal_Bool SAL_CALL ORowSetDataColumn::convertFastPropertyValue( Any & rConvertedV
> 
>     return bModified;
> }
>-//--------------------------------------------------------------------------
> Sequence< sal_Int8 > ORowSetDataColumn::getImplementationId() throw (RuntimeException)
> {
>     static OImplementationId * pId = 0;
>@@ -205,7 +196,6 @@ Sequence< sal_Int8 > ORowSetDataColumn::getImplementationId() throw (RuntimeExce
>     }
>     return pId->getImplementationId();
> }
>-// -------------------------------------------------------------------------
> void ORowSetDataColumn::fireValueChange(const ORowSetValue& _rOldValue)
> {
>     if ( !m_aColumnValue.isNull() && m_aColumnValue->isValid() && (!(((*m_aColumnValue)->get())[m_nPos] == _rOldValue)) )
>@@ -225,7 +215,6 @@ void ORowSetDataColumn::fireValueChange(const ORowSetValue& _rOldValue)
>         fire(&nHandle, &aNew, &m_aOldValue, 1, sal_False );
>     }
> }
>-// -----------------------------------------------------------------------------
> DBG_NAME(ORowSetDataColumns )
> ORowSetDataColumns::ORowSetDataColumns(
>                 sal_Bool _bCase,
>@@ -238,12 +227,10 @@ ORowSetDataColumns::ORowSetDataColumns(
> {
>     DBG_CTOR(ORowSetDataColumns ,NULL);
> }
>-// -----------------------------------------------------------------------------
> ORowSetDataColumns::~ORowSetDataColumns()
> {
>     DBG_DTOR(ORowSetDataColumns ,NULL);
> }
>-// -----------------------------------------------------------------------------
> sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName)
> {
>     connectivity::sdbcx::ObjectType xNamed;
>@@ -255,7 +242,6 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName
> 
>     return xNamed;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ORowSetDataColumns::disposing(void)
> {
>     //	clear_NoDispose();
>@@ -263,16 +249,13 @@ void SAL_CALL ORowSetDataColumns::disposing(void)
>     m_aColumns = NULL;
>     //	m_aColumns.clear();
> }
>-// -----------------------------------------------------------------------------
> void ORowSetDataColumns::assign(const ::vos::ORef< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector)
> {
>     m_aColumns = _rColumns;
>     reFill(_rVector);
> }
>-// -----------------------------------------------------------------------------
> void ORowSetDataColumns::impl_refresh() throw(::com::sun::star::uno::RuntimeException)
> {
> }
>-// -----------------------------------------------------------------------------
> 
> 
>diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
>index 90677d1..27cfb4d 100644
>--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
>+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
>@@ -83,7 +83,6 @@ namespace dbaccess
>     protected:
>         using ODataColumn::getFastPropertyValue;
>     };
>-    // -------------------------------------------------------------------------
> //	typedef connectivity::ORefVector< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> >
> //			ORowSetDataColumns_COLLECTION;
> 
>diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
>index 8208025..74411da 100644
>--- a/dbaccess/source/core/api/CacheSet.cxx
>+++ b/dbaccess/source/core/api/CacheSet.cxx
>@@ -69,7 +69,6 @@ using namespace ::com::sun::star::io;
> using namespace ::osl;
> 
> DBG_NAME(OCacheSet)
>-// -------------------------------------------------------------------------
> OCacheSet::OCacheSet() 
>             :m_bInserted(sal_False)
>             ,m_bUpdated(sal_False)
>@@ -79,7 +78,6 @@ OCacheSet::OCacheSet()
>     DBG_CTOR(OCacheSet,NULL);
> 
> }
>-// -------------------------------------------------------------------------
> ::rtl::OUString OCacheSet::getIdentifierQuoteString() const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getIdentifierQuoteString" );
>@@ -89,7 +87,6 @@ OCacheSet::OCacheSet()
>         sQuote = xMeta->getIdentifierQuoteString();
>     return sQuote;
> }
>-// -------------------------------------------------------------------------
> void OCacheSet::construct(	const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/) 
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::construct" );
>@@ -126,7 +123,6 @@ void OCacheSet::construct(	const Reference< XResultSet>& _xDriverSet,const ::rtl
>         }
>     }
> }
>-// -------------------------------------------------------------------------
> OCacheSet::~OCacheSet()
> {
>     try
>@@ -147,7 +143,6 @@ OCacheSet::~OCacheSet()
> 
>     DBG_DTOR(OCacheSet,NULL);
> }
>-// -----------------------------------------------------------------------------
> void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable)  throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::fillTableName" );
>@@ -163,7 +158,6 @@ void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable)  throw(SQL
>                         ,::dbtools::eInDataManipulation);
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::insertRow" );
>@@ -225,7 +219,6 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti
>     
>     // TODO set the bookmark in the insert row
> }
>-// -------------------------------------------------------------------------
> void OCacheSet::fillParameters( const ORowSetRow& _rRow
>                                         ,const connectivity::OSQLTable& _xTable 
>                                         ,::rtl::OUStringBuffer& _sCondition
>@@ -311,7 +304,6 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
>         }
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::updateRow" );
>@@ -359,7 +351,6 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR
> 
>      m_bUpdated = xPrep->executeUpdate() > 0;
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::deleteRow" );
>@@ -418,7 +409,6 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
> 
>     m_bDeleted = xPrep->executeUpdate() > 0;
> }
>-// -------------------------------------------------------------------------
> void OCacheSet::setParameter(sal_Int32 nPos
>                              ,const Reference< XParameters >& _xParameter
>                              ,const ORowSetValue& _rValue
>@@ -429,7 +419,6 @@ void OCacheSet::setParameter(sal_Int32 nPos
>     sal_Int32 nType = ( _nType != DataType::OTHER ) ? _nType : _rValue.getTypeKind();
>     ::dbtools::setObjectWithInfo(_xParameter,nPos,_rValue,nType,_nScale);
> }
>-// -------------------------------------------------------------------------
> void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::fillValueRow" );
>@@ -447,127 +436,106 @@ void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
>         aIter->fill(i,m_aColumnTypes[i-1],m_aNullable[i-1],this);
>     }
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::wasNull(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::wasNull" );
>     return m_xDriverRow->wasNull();
> }
>-// -------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getString" );
>     return m_xDriverRow->getString(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getBoolean" );
>     return m_xDriverRow->getBoolean(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int8 SAL_CALL OCacheSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getByte" );
>     return m_xDriverRow->getByte(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int16 SAL_CALL OCacheSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getShort" );
>     return m_xDriverRow->getShort(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL OCacheSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getInt" );
>     return m_xDriverRow->getInt(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int64 SAL_CALL OCacheSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getLong" );
>     return m_xDriverRow->getLong(columnIndex);
> }
>-// -------------------------------------------------------------------------
> float SAL_CALL OCacheSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getFloat" );
>     return m_xDriverRow->getFloat(columnIndex);
> }
>-// -------------------------------------------------------------------------
> double SAL_CALL OCacheSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getDouble" );
>     return m_xDriverRow->getDouble(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Sequence< sal_Int8 > SAL_CALL OCacheSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getBytes" );
>     return m_xDriverRow->getBytes(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::Date SAL_CALL OCacheSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getDate" );
>     return m_xDriverRow->getDate(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::Time SAL_CALL OCacheSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getTime" );
>     return m_xDriverRow->getTime(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::DateTime SAL_CALL OCacheSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getTimestamp" );
>     return m_xDriverRow->getTimestamp(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCacheSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getBinaryStream" );
>     return m_xDriverRow->getBinaryStream(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCacheSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getCharacterStream" );
>     return m_xDriverRow->getCharacterStream(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Any SAL_CALL OCacheSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getObject" );
>     return m_xDriverRow->getObject(columnIndex,typeMap);
> }
>-// -------------------------------------------------------------------------
> Reference< XRef > SAL_CALL OCacheSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getRef" );
>     return m_xDriverRow->getRef(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< XBlob > SAL_CALL OCacheSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getBlob" );
>     return m_xDriverRow->getBlob(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< XClob > SAL_CALL OCacheSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getClob" );
>     return m_xDriverRow->getClob(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< XArray > SAL_CALL OCacheSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getArray" );
>     return m_xDriverRow->getArray(columnIndex);
> }
>-// -------------------------------------------------------------------------
> // XResultSet
> sal_Bool SAL_CALL OCacheSet::next(  ) throw(SQLException, RuntimeException)
> {
>@@ -575,143 +543,119 @@ sal_Bool SAL_CALL OCacheSet::next(  ) throw(SQLException, RuntimeException)
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
>     return m_xDriverSet->next();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::isBeforeFirst" );
>     return m_xDriverSet->isBeforeFirst();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::isAfterLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::isAfterLast" );
>     return m_xDriverSet->isAfterLast();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::isFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::isFirst" );
>     return m_xDriverSet->isFirst();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::isLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::isLast" );
>     return m_xDriverSet->isLast();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OCacheSet::beforeFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::beforeFirst" );
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
>     m_xDriverSet->beforeFirst();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OCacheSet::afterLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::afterLast" );
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
>     m_xDriverSet->afterLast();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::first(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::first" );
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
>     return m_xDriverSet->first();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::last(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::last" );
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
>     return m_xDriverSet->last();
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL OCacheSet::getRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getRow" );
>     return m_xDriverSet->getRow();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::absolute" );
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
>     return m_xDriverSet->absolute(row);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::relative" );
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
>     return m_xDriverSet->relative(rows);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::previous(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::previous" );
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
>     return m_xDriverSet->previous();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OCacheSet::refreshRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::refreshRow" );
>     m_xDriverSet->refreshRow();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::rowUpdated(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::rowUpdated" );
>     return m_xDriverSet->rowUpdated();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::rowInserted(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::rowInserted" );
>     return m_xDriverSet->rowInserted();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OCacheSet::rowDeleted(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::rowDeleted" );
>     return m_xDriverSet->rowDeleted();
> }
>-// -------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL OCacheSet::getStatement(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getStatement" );
>     return m_xDriverSet->getStatement();
> }
>-// -----------------------------------------------------------------------------
> bool OCacheSet::isResultSetChanged() const
> {
>     return false;
> }
>-// -----------------------------------------------------------------------------
> void OCacheSet::reset(const Reference< XResultSet>& /*_xDriverSet*/)
> {
>     OSL_ENSURE(0,"Illegal call!");
> }
>-// -----------------------------------------------------------------------------
> void OCacheSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& /*io_aInsertRow*/,ORowSetValueVector::Vector& /*io_aRow*/,::std::vector<sal_Int32>& o_aChangedColumns)
> {
>     o_aChangedColumns.push_back(i_nColumnIndex);
> }
>-// -----------------------------------------------------------------------------
> bool OCacheSet::columnValuesUpdated(ORowSetValueVector::Vector& /*io_aCachedRow*/,const ORowSetValueVector::Vector& /*io_aRow*/)
> {
>     return false;
> }
>-// -----------------------------------------------------------------------------
> bool OCacheSet::updateColumnValues(const ORowSetValueVector::Vector& /*io_aCachedRow*/,ORowSetValueVector::Vector& /*io_aRow*/,const ::std::vector<sal_Int32>& /*i_aChangedColumns*/)
> {
>     return true;
> }
>-// -----------------------------------------------------------------------------
> void OCacheSet::fillMissingValues(ORowSetValueVector::Vector& /*io_aRow*/) const
> {
> }
>-// -----------------------------------------------------------------------------
> 
>diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
>index e71ddf7..ea806ff 100644
>--- a/dbaccess/source/core/api/FilteredContainer.cxx
>+++ b/dbaccess/source/core/api/FilteredContainer.cxx
>@@ -56,7 +56,6 @@ namespace dbaccess
>     using namespace ::cppu;
>     using namespace ::connectivity::sdbcx;
> 
>-//------------------------------------------------------------------------------
> /** creates a vector of WildCards and reduce the _rTableFilter of the length of WildsCards
> */
> sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut)
>@@ -87,7 +86,6 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
>     return nShiftPos;
> }
> 
>-    // -------------------------------------------------------------------------
>     bool lcl_isElementAllowed(  const ::rtl::OUString& _rName,
>                                 const Sequence< ::rtl::OUString >& _rTableFilter,
>                                 const ::std::vector< WildCard >& _rWCSearch )
>@@ -110,7 +108,6 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
>         return bFilterMatch;
>     }
> 
>-    //--------------------------------------------------------------------------
>     typedef ::boost::optional< ::rtl::OUString >    OptionalString;
>     struct TableInfo
>     {
>@@ -137,7 +134,6 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
>     };
>     typedef ::std::vector< TableInfo >    TableInfos;
> 
>-    //--------------------------------------------------------------------------
>     void lcl_ensureComposedName( TableInfo& _io_tableInfo, const Reference< XDatabaseMetaData >& _metaData )
>     {
>         if ( !_metaData.is() )
>@@ -154,7 +150,6 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
>         }
>     }
> 
>-    //--------------------------------------------------------------------------
>     void lcl_ensureType( TableInfo& _io_tableInfo, const Reference< XDatabaseMetaData >& _metaData, const Reference< XNameAccess >& _masterContainer )
>     {
>         if ( !!_io_tableInfo.sType )
>@@ -178,7 +173,6 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
>         _io_tableInfo.sType = OptionalString( sTypeName );
>     }
> 
>-    //--------------------------------------------------------------------------
>     connectivity::TStringVector lcl_filter( const TableInfos& _unfilteredTables,
>         const Sequence< ::rtl::OUString >& _tableFilter, const Sequence< ::rtl::OUString >& _tableTypeFilter,
>         const Reference< XDatabaseMetaData >& _metaData, const Reference< XNameAccess >& _masterContainer )
>@@ -271,7 +265,6 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
>         ,m_xConnection(_xCon)
>     {					  
>     }
>-    // -------------------------------------------------------------------------
>     void OFilteredContainer::construct(const Reference< XNameAccess >& _rxMasterContainer,
>                                     const Sequence< ::rtl::OUString >& _rTableFilter,
>                                     const Sequence< ::rtl::OUString >& _rTableTypeFilter)
>@@ -311,7 +304,6 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
>             construct( _rTableFilter, _rTableTypeFilter );
>         }
>     }
>-    //------------------------------------------------------------------------------
>     void OFilteredContainer::construct(const Sequence< ::rtl::OUString >& _rTableFilter, const Sequence< ::rtl::OUString >& _rTableTypeFilter)
>     {
>         // build sorted versions of the filter sequences, so the visibility decision is faster
>@@ -399,7 +391,6 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
>         m_bConstructed = sal_True;
>     }
> 
>-    //------------------------------------------------------------------------------
>     void OFilteredContainer::disposing()
>     {
>         OCollection::disposing();
>@@ -414,7 +405,6 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
>         m_bConstructed		= sal_False;
>     }
> 
>-    // -------------------------------------------------------------------------
>     void OFilteredContainer::impl_refresh() throw(RuntimeException)
>     {
>         RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OFilteredContainer::impl_refresh" );
>@@ -428,14 +418,12 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
>         }
>     }
> 
>-    // -----------------------------------------------------------------------------
>     ::rtl::OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject)
>     {
>         OSL_ENSURE( _xObject.is(), "OFilteredContainer::getNameForObject: Object is NULL!" );
>         return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false );
>     }
> 
>-    // -----------------------------------------------------------------------------
>     // multiple to obtain all tables from XDatabaseMetaData::getTables, via passing a particular
>     // table type filter:
>     // adhere to the standard, which requests to pass a NULL table type filter, if
>diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
>index 3e71e4a..efd4112 100644
>--- a/dbaccess/source/core/api/HelperCollections.cxx
>+++ b/dbaccess/source/core/api/HelperCollections.cxx
>@@ -46,7 +46,6 @@ namespace dbaccess
>     using namespace ::com::sun::star::script;
>     using namespace ::cppu;
>     using namespace ::osl;
>-    // -----------------------------------------------------------------------------
>     OPrivateColumns::OPrivateColumns(const ::vos::ORef< ::connectivity::OSQLColumns>& _rColumns,
>                         sal_Bool _bCase,
>                         ::cppu::OWeakObject& _rParent,
>@@ -58,7 +57,6 @@ namespace dbaccess
>     {
>     }
> 
>-    // -------------------------------------------------------------------------
>     OPrivateColumns* OPrivateColumns::createWithIntrinsicNames( const ::vos::ORef< ::connectivity::OSQLColumns >& _rColumns,
>         sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex )
>     {
>@@ -77,7 +75,6 @@ namespace dbaccess
>         return new OPrivateColumns( _rColumns, _bCase, _rParent, _rMutex, aNames, sal_False );
>     }
> 
>-    // -------------------------------------------------------------------------
>     void SAL_CALL OPrivateColumns::disposing(void)
>     {
>         m_aColumns = NULL;
>@@ -86,7 +83,6 @@ namespace dbaccess
>             // So we're not allowed to dispose our elements.
>         OPrivateColumns_Base::disposing();
>     }
>-    // -------------------------------------------------------------------------
>     connectivity::sdbcx::ObjectType OPrivateColumns::createObject(const ::rtl::OUString& _rName)
>     {
>         if ( m_aColumns.isValid() )
>@@ -102,7 +98,6 @@ namespace dbaccess
>         }
>         return NULL;
>     }
>-    // -------------------------------------------------------------------------
>     connectivity::sdbcx::ObjectType OPrivateTables::createObject(const ::rtl::OUString& _rName)
>     {
>         if ( !m_aTables.empty() )
>@@ -114,5 +109,4 @@ namespace dbaccess
>         }
>         return NULL;
>     }
>-    // -----------------------------------------------------------------------------
> }
>diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx
>index fa91dfd..753ff52 100644
>--- a/dbaccess/source/core/api/HelperCollections.hxx
>+++ b/dbaccess/source/core/api/HelperCollections.hxx
>@@ -48,7 +48,6 @@ namespace dbaccess
>     using namespace ::com::sun::star::script;
>     using namespace ::cppu;
>     using namespace ::osl;
>-    // -----------------------------------------------------------------------------
>     typedef connectivity::sdbcx::OCollection OPrivateColumns_Base;
>     class OPrivateColumns : public OPrivateColumns_Base
>     {
>diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
>index 3d127a7..f015860 100644
>--- a/dbaccess/source/core/api/KeySet.cxx
>+++ b/dbaccess/source/core/api/KeySet.cxx
>@@ -98,7 +98,6 @@ namespace
>     }
> }
> DBG_NAME(OKeySet)
>-// -------------------------------------------------------------------------
> OKeySet::OKeySet(const connectivity::OSQLTable& _xTable,
>                  const Reference< XIndexAccess>& _xTableKeys,
>                  const ::rtl::OUString& _rUpdateTableName,	  // this can be the alias or the full qualified name
>@@ -119,7 +118,6 @@ OKeySet::OKeySet(const connectivity::OSQLTable& _xTable,
>     DBG_CTOR(OKeySet,NULL);
> 
> }
>-// -----------------------------------------------------------------------------
> OKeySet::~OKeySet()
> {
>     try
>@@ -225,7 +223,6 @@ void OKeySet::findTableColumnsMatching_throw(const Any& i_aTable
>     }
>     return aFilter;
> }
>-// -----------------------------------------------------------------------------
> void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::construct" );
>@@ -323,7 +320,6 @@ void OKeySet::executeStatement(::rtl::OUStringBuffer& io_aFilter,const ::rtl::OU
>     m_xStatement = m_xConnection->prepareStatement(io_xAnalyzer->getQueryWithSubstitution());
>     ::comphelper::disposeComponent(io_xAnalyzer);
> }
>-// -------------------------------------------------------------------------
> Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getBookmark" );
>@@ -332,7 +328,6 @@ Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException)
>     return makeAny(m_aKeyIter->first);
> }
> 
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::moveToBookmark" );
>@@ -340,7 +335,6 @@ sal_Bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLExcept
>     m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark));
>     return m_aKeyIter != m_aKeyMap.end();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::moveRelativeToBookmark" );
>@@ -353,7 +347,6 @@ sal_Bool SAL_CALL OKeySet::moveRelativeToBookmark( const Any& bookmark, sal_Int3
> 
>     return !isBeforeFirst() && !isAfterLast();
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::compareBookmarks" );
>@@ -363,19 +356,16 @@ sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _sec
> 
>     return (nFirst != nSecond) ? CompareBookmark::NOT_EQUAL : CompareBookmark::EQUAL;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::hasOrderedBookmarks" );
>     return sal_True;
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL OKeySet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::hashBookmark" );
>     return ::comphelper::getINT32(bookmark);
> }
>-// -------------------------------------------------------------------------
> // ::com::sun::star::sdbcx::XDeleteRows
> Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows ,const connectivity::OSQLTable& _xTable) throw(SQLException, RuntimeException)
> {
>@@ -464,7 +454,6 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows
>     }
>     return aRet;
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::updateRow" );
>@@ -577,7 +566,6 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
>     ::rtl::OUString sEmpty;
>     executeUpdate(_rInsertRow ,_rOrginalRow,aSql.makeStringAndClear(),sEmpty,aIndexColumnPositions);
> }
>-// -----------------------------------------------------------------------------
> void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions)
> {
>     // now create end execute the prepared statement
>@@ -643,7 +631,6 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO
>         tryRefetch(_rInsertRow,bRefetch);
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::insertRow" );
>@@ -688,7 +675,6 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi
>     ::rtl::OUString sEmpty;
>     executeInsert(_rInsertRow,aSql.makeStringAndClear(),sEmpty,bRefetch);
> }
>-// -------------------------------------------------------------------------
> void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,bool bRefetch )
> {
>     // now create,fill and execute the prepared statement
>@@ -886,7 +872,6 @@ void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch)
>         m_aKeyIter->second.second.second = new OPrivateRow(_rInsertRow->get());
>     }
> }
>-// -----------------------------------------------------------------------------
> void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sal_Int32 i_nBookmark)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::copyRowValue" );
>@@ -926,7 +911,6 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sa
>         aIter->setTypeKind(aPosIter->second.nType);
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable   ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::deleteRow" );
>@@ -1032,23 +1016,19 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
>         m_bDeleted = sal_True;
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OKeySet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::cancelRowUpdates" );
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OKeySet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::moveToInsertRow" );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OKeySet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::moveToCurrentRow" );
> }
>-// -------------------------------------------------------------------------
> Reference<XNameAccess> OKeySet::getKeyColumns() const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getKeyColumns" );
>@@ -1089,7 +1069,6 @@ Reference<XNameAccess> OKeySet::getKeyColumns() const
> 
>     return xKeyColumns;
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::next(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::next" );
>@@ -1109,19 +1088,16 @@ sal_Bool SAL_CALL OKeySet::next(  ) throw(SQLException, RuntimeException)
>     refreshRow();
>     return !isAfterLast();
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::isBeforeFirst" );
>     return m_aKeyIter == m_aKeyMap.begin();
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::isAfterLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::isAfterLast" );
>     return  m_bRowCountFinal && m_aKeyIter == m_aKeyMap.end();
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::isFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::isFirst" );
>@@ -1129,7 +1105,6 @@ sal_Bool SAL_CALL OKeySet::isFirst(  ) throw(SQLException, RuntimeException)
>     ++aTemp;
>     return m_aKeyIter == aTemp && m_aKeyIter != m_aKeyMap.end();
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::isLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::isLast" );
>@@ -1140,7 +1115,6 @@ sal_Bool SAL_CALL OKeySet::isLast(  ) throw(SQLException, RuntimeException)
>     --aTemp;
>     return m_aKeyIter == aTemp;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OKeySet::beforeFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::beforeFirst" );
>@@ -1149,7 +1123,6 @@ void SAL_CALL OKeySet::beforeFirst(  ) throw(SQLException, RuntimeException)
>     m_xRow = NULL;
>     ::comphelper::disposeComponent(m_xSet);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OKeySet::afterLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::afterLast" );
>@@ -1159,7 +1132,6 @@ void SAL_CALL OKeySet::afterLast(  ) throw(SQLException, RuntimeException)
>     m_xRow = NULL;
>     ::comphelper::disposeComponent(m_xSet);
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::first(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::first" );
>@@ -1172,7 +1144,6 @@ sal_Bool SAL_CALL OKeySet::first(  ) throw(SQLException, RuntimeException)
>     refreshRow();
>     return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::last(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::last" );
>@@ -1184,7 +1155,6 @@ sal_Bool SAL_CALL OKeySet::last(  ) throw(SQLException, RuntimeException)
>     refreshRow();
>     return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
> }
>-// -----------------------------------------------------------------------------
> sal_Int32 SAL_CALL OKeySet::getRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getRow" );
>@@ -1193,7 +1163,6 @@ sal_Int32 SAL_CALL OKeySet::getRow(  ) throw(SQLException, RuntimeException)
> 
>     return ::std::distance(m_aKeyMap.begin(),m_aKeyIter);
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::absolute" );
>@@ -1231,7 +1200,6 @@ sal_Bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, Runtime
> 
>     return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::relative" );
>@@ -1242,7 +1210,6 @@ sal_Bool SAL_CALL OKeySet::relative( sal_Int32 rows ) throw(SQLException, Runtim
>     }
>     return absolute(getRow()+rows);
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::previous(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::previous" );
>@@ -1254,7 +1221,6 @@ sal_Bool SAL_CALL OKeySet::previous(  ) throw(SQLException, RuntimeException)
>     }
>     return m_aKeyIter != m_aKeyMap.begin();
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::refreshRow" );
>@@ -1313,7 +1279,6 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
>     m_xRow.set(m_xSet,UNO_QUERY);
>     OSL_ENSURE(m_xRow.is(),"No row form statement!");
> }
>-// -----------------------------------------------------------------------------
> sal_Bool OKeySet::fetchRow()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::fetchRow" );
>@@ -1347,7 +1312,6 @@ sal_Bool OKeySet::fetchRow()
>         m_bRowCountFinal = sal_True;
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> void OKeySet::fillAllRows()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::fillAllRows" );
>@@ -1363,152 +1327,130 @@ sal_Bool SAL_CALL OKeySet::wasNull(  ) throw(SQLException, RuntimeException)
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::wasNull" );
>     return m_xRow->wasNull();
> }
>-// -------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OKeySet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getString" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getString(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getBoolean" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getBoolean(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int8 SAL_CALL OKeySet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getByte" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getByte(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int16 SAL_CALL OKeySet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getShort" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getShort(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL OKeySet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getInt" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getInt(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int64 SAL_CALL OKeySet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getLong" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getLong(columnIndex);
> }
>-// -------------------------------------------------------------------------
> float SAL_CALL OKeySet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getFloat" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getFloat(columnIndex);
> }
>-// -------------------------------------------------------------------------
> double SAL_CALL OKeySet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getDouble" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getDouble(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Sequence< sal_Int8 > SAL_CALL OKeySet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getBytes" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getBytes(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::Date SAL_CALL OKeySet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getDate" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getDate(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::Time SAL_CALL OKeySet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getTime" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getTime(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::DateTime SAL_CALL OKeySet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getTimestamp" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getTimestamp(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream > SAL_CALL OKeySet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getBinaryStream" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getBinaryStream(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream > SAL_CALL OKeySet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getCharacterStream" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getCharacterStream(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Any SAL_CALL OKeySet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getObject" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getObject(columnIndex,typeMap);
> }
>-// -------------------------------------------------------------------------
> Reference< XRef > SAL_CALL OKeySet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getRef" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getRef(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< XBlob > SAL_CALL OKeySet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getBlob" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getBlob(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< XClob > SAL_CALL OKeySet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getClob" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getClob(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< XArray > SAL_CALL OKeySet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getArray" );
>     OSL_ENSURE(m_xRow.is(),"m_xRow is null!");
>     return m_xRow->getArray(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::rowUpdated(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::rowUpdated" );
>     return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 2;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::rowInserted(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::rowInserted" );
>     return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 1;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OKeySet::rowDeleted(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::rowDeleted" );
>@@ -1516,7 +1458,6 @@ sal_Bool SAL_CALL OKeySet::rowDeleted(  ) throw(SQLException, RuntimeException)
>     m_bDeleted = sal_False;
>     return bDeleted;
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OKeySet::getComposedTableName(const ::rtl::OUString& _sCatalog,
>                                               const ::rtl::OUString& _sSchema,
>                                               const ::rtl::OUString& _sTable)
>@@ -1549,7 +1490,6 @@ sal_Bool SAL_CALL OKeySet::rowDeleted(  ) throw(SQLException, RuntimeException)
> 
>     return aComposedName;
> }
>-// -----------------------------------------------------------------------------
> namespace dbaccess
> {
> 
>@@ -1616,7 +1556,6 @@ void getColumnPositions(const Reference<XNameAccess>& _rxQueryColumns,
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> void OKeySet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData)
> {
>     ORowSetValue& aValue((_rInsertRow->get())[i_aMetaData.nPosition]);
>@@ -1637,5 +1576,4 @@ void OKeySet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const Select
>             break;
>     }
> }
>-// -----------------------------------------------------------------------------
> 
>diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
>index 5d2ef8b..eaabc78 100644
>--- a/dbaccess/source/core/api/KeySet.hxx
>+++ b/dbaccess/source/core/api/KeySet.hxx
>@@ -197,17 +197,11 @@ namespace dbaccess
>         virtual void SAL_CALL refreshRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
>         // ::com::sun::star::sdbcx::XRowLocate
>         virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
>-        // -------------------------------------------------------------------------
>         virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
>-        // -------------------------------------------------------------------------
>         virtual sal_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
>-        // -------------------------------------------------------------------------
>         virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& first, const ::com::sun::star::uno::Any& second ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
>-        // -------------------------------------------------------------------------
>         virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
>-        // -------------------------------------------------------------------------
>         virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
>-        // -------------------------------------------------------------------------
>         // ::com::sun::star::sdbcx::XDeleteRows
>         virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ,const connectivity::OSQLTable& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
>         // ::com::sun::star::sdbc::XResultSetUpdate
>diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
>index b68910d..60a79e9 100644
>--- a/dbaccess/source/core/api/OptimisticSet.cxx
>+++ b/dbaccess/source/core/api/OptimisticSet.cxx
>@@ -98,7 +98,6 @@ namespace
> }
> 
> DBG_NAME(OptimisticSet)
>-// -------------------------------------------------------------------------
> OptimisticSet::OptimisticSet(const ::comphelper::ComponentContext& _rContext,
>                              const Reference< XConnection>& i_xConnection,
>                              const Reference< XSingleSelectQueryAnalyzer >& _xComposer,
>@@ -111,12 +110,10 @@ OptimisticSet::OptimisticSet(const ::comphelper::ComponentContext& _rContext,
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::OptimisticSet" );
>     DBG_CTOR(OptimisticSet,NULL);
> }
>-// -----------------------------------------------------------------------------
> OptimisticSet::~OptimisticSet()
> {
>     DBG_DTOR(OptimisticSet,NULL);
> }
>-// -----------------------------------------------------------------------------
> void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::construct" );
>@@ -169,14 +166,12 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const ::
>     m_xStatement = m_xConnection->prepareStatement(xAnalyzer->getQueryWithSubstitution());
>     ::comphelper::disposeComponent(xAnalyzer);
> }
>-// -------------------------------------------------------------------------
> // ::com::sun::star::sdbcx::XDeleteRows
> Sequence< sal_Int32 > SAL_CALL OptimisticSet::deleteRows( const Sequence< Any >& /*rows*/ ,const connectivity::OSQLTable& /*_xTable*/) throw(SQLException, RuntimeException)
> {
>     Sequence< sal_Int32 > aRet;
>     return aRet;
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::updateRow" );
>@@ -264,7 +259,6 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
>         }
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::insertRow" );
>@@ -375,7 +369,6 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
>         }
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/   ) throw(SQLException, RuntimeException)
> {
>     ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
>@@ -421,7 +414,6 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne
>         }
>     }
> }
>-// -------------------------------------------------------------------------
> void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::executeDelete" );
>@@ -449,7 +441,6 @@ void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUS
>         m_bDeleted = sal_True;
>     }
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OptimisticSet::getComposedTableName(const ::rtl::OUString& /*_sCatalog*/,
>                                               const ::rtl::OUString& /*_sSchema*/,
>                                               const ::rtl::OUString& /*_sTable*/)
>@@ -483,7 +474,6 @@ void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUS
> */
>     return aComposedName;
> }
>-// -----------------------------------------------------------------------------
> void OptimisticSet::fillJoinedColumns_throw(const ::std::vector< TNodePair >& i_aJoinColumns)
> {
>     ::std::vector< TNodePair >::const_iterator aIter = i_aJoinColumns.begin();
>@@ -502,7 +492,6 @@ void OptimisticSet::fillJoinedColumns_throw(const ::std::vector< TNodePair >& i_
>         fillJoinedColumns_throw(sLeft.makeStringAndClear(),sRight.makeStringAndClear());
>     }
> }
>-// -----------------------------------------------------------------------------
> void OptimisticSet::fillJoinedColumns_throw(const ::rtl::OUString& i_sLeftColumn,const ::rtl::OUString& i_sRightColumn)
> {    
>     sal_Int32 nLeft = 0,nRight = 0;
>@@ -542,14 +531,12 @@ void OptimisticSet::fillJoinedColumns_throw(const ::rtl::OUString& i_sLeftColumn
>     else
>         m_aJoinedColumns[nRight] = nLeft;
> }
>-// -----------------------------------------------------------------------------
> bool OptimisticSet::isResultSetChanged() const
> {
>     bool bOld = m_bResultSetChanged;
>     m_bResultSetChanged = false;
>     return bOld;
> }
>-// -----------------------------------------------------------------------------
> void OptimisticSet::reset(const Reference< XResultSet>& _xDriverSet)
> {
>     OCacheSet::construct(_xDriverSet,::rtl::OUString());
>@@ -558,7 +545,6 @@ void OptimisticSet::reset(const Reference< XResultSet>& _xDriverSet)
>     m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair<sal_Int32,Reference<XRow> >(0,NULL))));
>     m_aKeyIter = m_aKeyMap.begin();
> }
>-// -----------------------------------------------------------------------------
> void OptimisticSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,::std::vector<sal_Int32>& o_aChangedColumns)
> {
>     o_aChangedColumns.push_back(i_nColumnIndex);
>@@ -600,7 +586,6 @@ namespace
>         }
>     };
> }
>-// -----------------------------------------------------------------------------
> bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const ::std::vector<sal_Int32>& i_aChangedColumns)
> {
>     bool bRet = false;
>@@ -637,7 +622,6 @@ bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCac
>     }
>     return bRet;
> }
>-// -----------------------------------------------------------------------------
> bool OptimisticSet::columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow,const ORowSetValueVector::Vector& i_aRow)
> {
>     bool bRet = false;
>@@ -676,7 +660,6 @@ bool OptimisticSet::columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow
>     }
>     return bRet;
> }
>-// -----------------------------------------------------------------------------
> void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const
> {
>     TSQLStatements aSql;
>@@ -760,5 +743,4 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> 
>diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx
>index fd1b304..972a599 100644
>--- a/dbaccess/source/core/api/OptimisticSet.hxx
>+++ b/dbaccess/source/core/api/OptimisticSet.hxx
>@@ -84,7 +84,6 @@ namespace dbaccess
>         // late ctor which can throw exceptions
>         virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter);
> 
>-        // -------------------------------------------------------------------------
>         // ::com::sun::star::sdbcx::XDeleteRows
>         virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ,const connectivity::OSQLTable& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
>         // ::com::sun::star::sdbc::XResultSetUpdate
>diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
>index b194a2a..b3aa706 100644
>--- a/dbaccess/source/core/api/RowSet.cxx
>+++ b/dbaccess/source/core/api/RowSet.cxx
>@@ -103,12 +103,10 @@ using namespace ::com::sun::star::util;
> using namespace ::cppu;
> using namespace ::osl;
> 
>-//--------------------------------------------------------------------------
> extern "C" void SAL_CALL createRegistryInfo_ORowSet()
> {
>     static ::dba::OAutoRegistration< ORowSet > aAutoRegistration;
> }
>-// -----------------------------------------------------------------------------
> 
> #define NOTIFY_LISTERNERS_CHECK(_rListeners,T,method)							  \
>     Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \
>@@ -139,12 +137,10 @@ extern "C" void SAL_CALL createRegistryInfo_ORowSet()
> namespace dbaccess
> {
> //..................................................................
>-//--------------------------------------------------------------------------
> Reference< XInterface > ORowSet_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
> {
>     return *(new ORowSet(_rxFactory));
> }
>-//--------------------------------------------------------------------------
> ORowSet::ORowSet( const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB )
>     :ORowSet_BASE1(m_aMutex)
>     ,ORowSetBase( _rxORB, ORowSet_BASE1::rBHelper, &m_aMutex )
>@@ -239,7 +235,6 @@ ORowSet::~ORowSet()
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) const
> {
>     switch( _nHandle )
>@@ -291,7 +286,6 @@ void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) c
>             break;
>     }
> }
>-// -------------------------------------------------------------------------
> //	typedef ::comphelper::OPropertyArrayUsageHelper<ORowSet> ORowSet_Prop;
> 
> void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
>@@ -385,7 +379,6 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
>             break;
>     };
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
> {
>     if(m_pCache)
>@@ -429,7 +422,6 @@ void SAL_CALL ORowSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
>         }
>     }
> }
>-// -------------------------------------------------------------------------
> // com::sun::star::XTypeProvider
> Sequence< Type > SAL_CALL ORowSet::getTypes() throw (RuntimeException)
> {
>@@ -439,7 +431,6 @@ Sequence< Type > SAL_CALL ORowSet::getTypes() throw (RuntimeException)
>                            ::comphelper::concatSequences(ORowSet_BASE1::getTypes(),ORowSetBase::getTypes()));
>     return aTypes.getTypes();
> }
>-// -------------------------------------------------------------------------
> Sequence< sal_Int8 > SAL_CALL ORowSet::getImplementationId() throw (RuntimeException)
> {
>     static OImplementationId * pId = 0;
>@@ -454,24 +445,20 @@ Sequence< sal_Int8 > SAL_CALL ORowSet::getImplementationId() throw (RuntimeExcep
>     }
>     return pId->getImplementationId();
> }
>-// -------------------------------------------------------------------------
> 
> // com::sun::star::XInterface
> Any SAL_CALL ORowSet::queryInterface( const Type & rType ) throw (RuntimeException)
> {
>     return ORowSet_BASE1::queryInterface( rType);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::acquire() throw()
> {
>     ORowSet_BASE1::acquire();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::release() throw()
> {
>     ORowSet_BASE1::release();
> }
>-// -------------------------------------------------------------------------
> 
> // com::sun::star::XUnoTunnel
> sal_Int64 SAL_CALL ORowSet::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
>@@ -481,7 +468,6 @@ sal_Int64 SAL_CALL ORowSet::getSomething( const Sequence< sal_Int8 >& rId ) thro
> 
>     return 0;
> }
>-// -------------------------------------------------------------------------
> // com::sun::star::XAggregation
> Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeException)
> {
>@@ -490,23 +476,19 @@ Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeExcepti
>         aRet = ORowSet_BASE1::queryAggregation(rType);
>     return aRet;
> }
>-//------------------------------------------------------------------------------
> rtl::OUString ORowSet::getImplementationName_static(  ) throw(RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.comp.dba.ORowSet");
> }
>-// -------------------------------------------------------------------------
> // ::com::sun::star::XServiceInfo
> ::rtl::OUString SAL_CALL ORowSet::getImplementationName(  ) throw(RuntimeException)
> {
>     return getImplementationName_static();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSet::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
> {
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > ORowSet::getSupportedServiceNames_static(  ) throw (RuntimeException)
> {
>     Sequence< rtl::OUString > aSNS( 5 );
>@@ -517,18 +499,15 @@ Sequence< ::rtl::OUString > ORowSet::getSupportedServiceNames_static(  ) throw (
>     aSNS[4] = SERVICE_SDB_ROWSET;
>     return aSNS;
> }
>-// -------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL ORowSet::getSupportedServiceNames(  ) throw(RuntimeException)
> {
>     return getSupportedServiceNames_static();
> }
>-//------------------------------------------------------------------------------
> Reference< XInterface > ORowSet::Create(const Reference< XComponentContext >& _rxContext)
> {
>     ::comphelper::ComponentContext aContext( _rxContext );
>     return ORowSet_CreateInstance( aContext.getLegacyServiceFactory() );
> }
>-// -------------------------------------------------------------------------
> // OComponentHelper
> void SAL_CALL ORowSet::disposing()
> {
>@@ -560,7 +539,6 @@ void SAL_CALL ORowSet::disposing()
> 
>     ORowSetBase::disposing();
> }
>-// -------------------------------------------------------------------------
> void ORowSet::freeResources( bool _bComplete )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -617,7 +595,6 @@ void ORowSet::freeResources( bool _bComplete )
>     }
> }
> 
>-// -------------------------------------------------------------------------
> void ORowSet::setActiveConnection( Reference< XConnection >& _rxNewConn, sal_Bool _bFireEvent )
> {
>     if (_rxNewConn.get() == m_xActiveConnection.get())
>@@ -663,7 +640,6 @@ void ORowSet::setActiveConnection( Reference< XConnection >& _rxNewConn, sal_Boo
>     }
> }
> 
>-// -------------------------------------------------------------------------
> // ::com::sun::star::XEventListener
> void SAL_CALL ORowSet::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException)
> {
>@@ -679,7 +655,6 @@ void SAL_CALL ORowSet::disposing( const ::com::sun::star::lang::EventObject& Sou
>         }
>     }
> }
>-// -------------------------------------------------------------------------
> 
> // XCloseable
> void SAL_CALL ORowSet::close(  ) throw(SQLException, RuntimeException)
>@@ -691,7 +666,6 @@ void SAL_CALL ORowSet::close(  ) throw(SQLException, RuntimeException)
>     // additionals things to set
>     freeResources( true );
> }
>-// -------------------------------------------------------------------------
> // comphelper::OPropertyArrayUsageHelper
> ::cppu::IPropertyArrayHelper* ORowSet::createArrayHelper( ) const
> {
>@@ -699,14 +673,12 @@ void SAL_CALL ORowSet::close(  ) throw(SQLException, RuntimeException)
>     describeProperties(aProps);
>     return new ::cppu::OPropertyArrayHelper(aProps);
> }
>-// -------------------------------------------------------------------------
> // cppu::OPropertySetHelper
> ::cppu::IPropertyArrayHelper& SAL_CALL ORowSet::getInfoHelper()
> {
>     typedef ::comphelper::OPropertyArrayUsageHelper<ORowSet> ORowSet_PROP;
>     return *ORowSet_PROP::getArrayHelper();
> }
>-// -----------------------------------------------------------------------------
> void ORowSet::updateValue(sal_Int32 columnIndex,const ORowSetValue& x)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -720,7 +692,6 @@ void ORowSet::updateValue(sal_Int32 columnIndex,const ORowSetValue& x)
>     m_pCache->updateValue(columnIndex,x,rRow,aNotify.getChangedColumns());
>     aNotify.firePropertyChange();
> }
>-// -------------------------------------------------------------------------
> // XRowUpdate
> void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>@@ -735,67 +706,54 @@ void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, R
>     m_pCache->updateNull(columnIndex,rRow,aNotify.getChangedColumns());
>     aNotify.firePropertyChange();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException)
> {
>     updateValue(columnIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -810,7 +768,6 @@ void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Referenc
>         updateValue(columnIndex,aSeq);
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -822,7 +779,6 @@ void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Refer
>     m_pCache->updateCharacterStream(columnIndex,x,length,rRow,aNotify.getChangedColumns());
>     aNotify.firePropertyChange();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -866,7 +822,6 @@ void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw
>         aNotify.firePropertyChange();
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 scale ) throw(SQLException, RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -878,7 +833,6 @@ void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x,
>     m_pCache->updateNumericObject(columnIndex,x,scale,rRow,aNotify.getChangedColumns());
>     aNotify.firePropertyChange();
> }
>-// -------------------------------------------------------------------------
> 
> // XResultSetUpdate
> void SAL_CALL ORowSet::insertRow(  ) throw(SQLException, RuntimeException)
>@@ -940,7 +894,6 @@ void SAL_CALL ORowSet::insertRow(  ) throw(SQLException, RuntimeException)
>         fireRowcount();
>     }
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL ORowSet::getRow(  ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>@@ -949,7 +902,6 @@ sal_Int32 SAL_CALL ORowSet::getRow(  ) throw(SQLException, RuntimeException)
>     // check if we are inserting a row
>     return (m_pCache && ( m_pCache->m_bNew || m_bModified )) ? 0 : ORowSetBase::getRow();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::updateRow(  ) throw(SQLException, RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -1007,7 +959,6 @@ void SAL_CALL ORowSet::updateRow(  ) throw(SQLException, RuntimeException)
>         }
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::deleteRow(  ) throw(SQLException, RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -1059,7 +1010,6 @@ void SAL_CALL ORowSet::deleteRow(  ) throw(SQLException, RuntimeException)
>     fireRowcount();
> }
> 
>-// -------------------------------------------------------------------------
> void ORowSet::implCancelRowUpdates( sal_Bool _bNotifyModified ) SAL_THROW( ( SQLException, RuntimeException ) )
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -1096,13 +1046,11 @@ void ORowSet::implCancelRowUpdates( sal_Bool _bNotifyModified ) SAL_THROW( ( SQL
>         fireProperty(PROPERTY_ID_ISMODIFIED,sal_False,sal_True);
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
> {
>     implCancelRowUpdates( sal_True );
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::addRowSetListener( const Reference< XRowSetListener >& listener ) throw(RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -1111,7 +1059,6 @@ void SAL_CALL ORowSet::addRowSetListener( const Reference< XRowSetListener >& li
>     if(listener.is())
>         m_aRowsetListeners.addInterface(listener);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::removeRowSetListener( const Reference< XRowSetListener >& listener ) throw(RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -1120,7 +1067,6 @@ void SAL_CALL ORowSet::removeRowSetListener( const Reference< XRowSetListener >&
>     if(listener.is())
>         m_aRowsetListeners.removeInterface(listener);
> }
>-// -----------------------------------------------------------------------------
> void ORowSet::notifyAllListeners(::osl::ResettableMutexGuard& _rGuard)
> {
>     EventObject aEvt(*m_pMySelf);
>@@ -1128,7 +1074,6 @@ void ORowSet::notifyAllListeners(::osl::ResettableMutexGuard& _rGuard)
>     m_aRowsetListeners.notifyEach( &XRowSetListener::rowSetChanged, aEvt );
>     _rGuard.reset();
> }
>-// -------------------------------------------------------------------------
> void ORowSet::notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& _rGuard)
> {
>     EventObject aEvt(*m_pMySelf);
>@@ -1136,7 +1081,6 @@ void ORowSet::notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& _rGuard
>     m_aRowsetListeners.notifyEach( &XRowSetListener::cursorMoved, aEvt );
>     _rGuard.reset();
> }
>-// -------------------------------------------------------------------------
> void ORowSet::notifyAllListenersRowChanged(::osl::ResettableMutexGuard& _rGuard, const RowsChangeEvent& aEvt)
> {
>     _rGuard.clear();
>@@ -1144,21 +1088,18 @@ void ORowSet::notifyAllListenersRowChanged(::osl::ResettableMutexGuard& _rGuard,
>     m_aRowsChangeListener.notifyEach( &XRowsChangeListener::rowsChanged, aEvt );
>     _rGuard.reset();
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSet::notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& _rGuard)
> {
>     EventObject aEvt(*m_pMySelf);
>     NOTIFY_LISTERNERS_CHECK(m_aApproveListeners,XRowSetApproveListener,approveCursorMove);
>     return bCheck;
> }
>-// -------------------------------------------------------------------------
> void ORowSet::notifyAllListenersRowBeforeChange(::osl::ResettableMutexGuard& _rGuard,const RowChangeEvent &aEvt)
> {
>     NOTIFY_LISTERNERS_CHECK(m_aApproveListeners,XRowSetApproveListener,approveRowChange);
>     if ( !bCheck )
>         m_aErrors.raiseTypedException( sdb::ErrorCondition::ROW_SET_OPERATION_VETOED, *this, ::cppu::UnoType< RowSetVetoException >::get() );
> }
>-// -------------------------------------------------------------------------
> void ORowSet::fireRowcount()
> {
>     sal_Int32 nCurrentRowCount( impl_getRowCount() );
>@@ -1182,7 +1123,6 @@ void ORowSet::fireRowcount()
>         m_bLastKnownRowCountFinal = bCurrentRowCountFinal;
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -1241,7 +1181,6 @@ void SAL_CALL ORowSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
>         fireRowcount();
>     }
> }
>-// -------------------------------------------------------------------------
> void ORowSet::impl_setDataColumnsWriteable_throw()
> {
>     impl_restoreDataColumnsWriteable_throw();
>@@ -1257,7 +1196,6 @@ void ORowSet::impl_setDataColumnsWriteable_throw()
>         (*aIter)->setPropertyValue(PROPERTY_ISREADONLY,makeAny(sal_False));
>     }
> }
>-// -------------------------------------------------------------------------
> void ORowSet::impl_restoreDataColumnsWriteable_throw()
> {
>     TDataColumns::iterator aIter = m_aDataColumns.begin();
>@@ -1268,7 +1206,6 @@ void ORowSet::impl_restoreDataColumnsWriteable_throw()
>     }
>     m_aReadOnlyDataColumns.clear();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -1303,7 +1240,6 @@ void SAL_CALL ORowSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException
>         aNotifier.fire();
>     }
> }
>-// -------------------------------------------------------------------------
> // XRow
> sal_Bool SAL_CALL ORowSet::wasNull(  ) throw(SQLException, RuntimeException)
> {
>@@ -1312,7 +1248,6 @@ sal_Bool SAL_CALL ORowSet::wasNull(  ) throw(SQLException, RuntimeException)
> 
>     return ( m_pCache && isInsertRow() ) ? ((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex].isNull() : ORowSetBase::wasNull();
> }
>-// -----------------------------------------------------------------------------
> const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex)
> {
>     checkCache();
>@@ -1322,79 +1257,66 @@ const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex)
> 
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL ORowSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int8 SAL_CALL ORowSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int16 SAL_CALL ORowSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL ORowSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int64 SAL_CALL ORowSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> float SAL_CALL ORowSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> double SAL_CALL ORowSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Sequence< sal_Int8 > SAL_CALL ORowSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::Date SAL_CALL ORowSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::Time SAL_CALL ORowSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::DateTime SAL_CALL ORowSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>@@ -1406,7 +1328,6 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSet::getBinaryStrea
> 
>     return ORowSetBase::getBinaryStream(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>@@ -1418,18 +1339,15 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSet::getCharacterSt
> 
>     return ORowSetBase::getCharacterStream(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Any SAL_CALL ORowSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getInsertValue(columnIndex).makeAny();
> }
>-// -------------------------------------------------------------------------
> Reference< XRef > SAL_CALL ORowSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
> {
>     return Reference< XRef >();
> }
>-// -------------------------------------------------------------------------
> Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     if ( m_pCache && isInsertRow() )
>@@ -1439,17 +1357,14 @@ Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 columnIndex ) throw(SQLE
>     }
>     return ORowSetBase::getBlob(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< XClob > SAL_CALL ORowSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     return Reference< XClob >(getInsertValue(columnIndex).makeAny(),UNO_QUERY);
> }
>-// -------------------------------------------------------------------------
> Reference< XArray > SAL_CALL ORowSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
> {
>     return Reference< XArray >();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException)
> {
>     if (!_rxHandler.is())
>@@ -1506,7 +1421,6 @@ void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandl
>     execute_NoApprove_NoNewConn(aGuard);
> }
> 
>-// -------------------------------------------------------------------------
> Reference< XIndexAccess > SAL_CALL ORowSet::getParameters(  ) throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard( *m_pMutex );
>@@ -1533,7 +1447,6 @@ Reference< XIndexAccess > SAL_CALL ORowSet::getParameters(  ) throw (RuntimeExce
>     return m_pParameters.get();
> }
> 
>-// -------------------------------------------------------------------------
> void ORowSet::approveExecution() throw (RowSetVetoException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aColumnsMutex );
>@@ -1561,9 +1474,7 @@ void ORowSet::approveExecution() throw (RowSetVetoException, RuntimeException)
>         }
>     }
> }
>-// -------------------------------------------------------------------------
> // XRowSet
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::execute(  ) throw(SQLException, RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -1588,7 +1499,6 @@ void SAL_CALL ORowSet::execute(  ) throw(SQLException, RuntimeException)
>     execute_NoApprove_NoNewConn(aGuard);
> }
> 
>-//------------------------------------------------------------------------------
> void ORowSet::setStatementResultSetType( const Reference< XPropertySet >& _rxStatement, sal_Int32 _nDesiredResultSetType, sal_Int32 _nDesiredResultSetConcurrency )
> {
>     OSL_ENSURE( _rxStatement.is(), "ORowSet::setStatementResultSetType: invalid statement - this will crash!" );
>@@ -1642,7 +1552,6 @@ void ORowSet::setStatementResultSetType( const Reference< XPropertySet >& _rxSta
>     _rxStatement->setPropertyValue( PROPERTY_RESULTSETCONCURRENCY, makeAny( nResultSetConcurrency ) );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
> {
>     ::rtl::OUString sCommandToExecute;
>@@ -1702,7 +1611,6 @@ Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
>     return xResultSet;
> }
> 
>-// -----------------------------------------------------------------------------
> void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertySet >& _rxTemplateColumn, const Reference< XPropertySet >& _rxRowSetColumn )
> {
>     OSL_ENSURE( _rxTemplateColumn.is() && _rxRowSetColumn.is(),
>@@ -1788,7 +1696,6 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotification)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", "ORowSet::execute_NoApprove_NoNewConn" );
>@@ -2023,7 +1930,6 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
>     // notify the rowset listeners
>     notifyAllListeners(_rClearForNotification);
> }
>-// -------------------------------------------------------------------------
> // XRowSetApproveBroadcaster
> void SAL_CALL ORowSet::addRowSetApproveListener( const Reference< XRowSetApproveListener >& listener ) throw(RuntimeException)
> {
>@@ -2033,7 +1939,6 @@ void SAL_CALL ORowSet::addRowSetApproveListener( const Reference< XRowSetApprove
> 
>     m_aApproveListeners.addInterface(listener);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::removeRowSetApproveListener( const Reference< XRowSetApproveListener >& listener ) throw(RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -2051,7 +1956,6 @@ void SAL_CALL ORowSet::addRowsChangeListener( const Reference< XRowsChangeListen
> 
>     m_aRowsChangeListener.addInterface(listener);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::removeRowsChangeListener( const Reference< XRowsChangeListener >& listener ) throw(RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -2060,7 +1964,6 @@ void SAL_CALL ORowSet::removeRowsChangeListener( const Reference< XRowsChangeLis
> 
>     m_aRowsChangeListener.removeInterface(listener);
> }
>-// -------------------------------------------------------------------------
> 
> // XResultSetAccess
> Reference< XResultSet > SAL_CALL ORowSet::createResultSet(  ) throw(SQLException, RuntimeException)
>@@ -2076,14 +1979,12 @@ Reference< XResultSet > SAL_CALL ORowSet::createResultSet(  ) throw(SQLException
>     }
>     return Reference< XResultSet >();
> }
>-// -------------------------------------------------------------------------
> 
> // ::com::sun::star::util::XCancellable
> void SAL_CALL ORowSet::cancel(  ) throw(RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
> }
>-// -------------------------------------------------------------------------
> 
> // ::com::sun::star::sdbcx::XDeleteRows
> Sequence< sal_Int32 > SAL_CALL ORowSet::deleteRows( const Sequence< Any >& rows ) throw(SQLException, RuntimeException)
>@@ -2139,7 +2040,6 @@ Sequence< sal_Int32 > SAL_CALL ORowSet::deleteRows( const Sequence< Any >& rows
> 
>     return aResults;
> }
>-// -----------------------------------------------------------------------------
> void ORowSet::notifyRowSetAndClonesRowDelete( const Any& _rBookmark )
> {
>     // notify ourself
>@@ -2157,7 +2057,6 @@ void ORowSet::notifyRowSetAndClonesRowDelete( const Any& _rBookmark )
>         }
>     }
> }
>-//------------------------------------------------------------------------------
> void ORowSet::notifyRowSetAndClonesRowDeleted( const Any& _rBookmark, sal_Int32 _nPos )
> {
>     // notify ourself
>@@ -2175,7 +2074,6 @@ void ORowSet::notifyRowSetAndClonesRowDeleted( const Any& _rBookmark, sal_Int32
>         }
>     }
> }
>-//------------------------------------------------------------------------------
> Reference< XConnection >  ORowSet::calcConnection(const Reference< XInteractionHandler >& _rxHandler) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -2219,7 +2117,6 @@ Reference< XConnection >  ORowSet::calcConnection(const Reference< XInteractionH
>     }
>     return m_xActiveConnection;
> }
>-//------------------------------------------------------------------------------
> Reference< XNameAccess > ORowSet::impl_getTables_throw()
> {
>     Reference< XNameAccess > xTables;
>@@ -2259,7 +2156,6 @@ Reference< XNameAccess > ORowSet::impl_getTables_throw()
>     return xTables;
> }
> 
>-//------------------------------------------------------------------------------
> void ORowSet::impl_resetTables_nothrow()
> {
>     if ( !m_pTables )
>@@ -2277,7 +2173,6 @@ void ORowSet::impl_resetTables_nothrow()
>     DELETEZ( m_pTables );
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool ORowSet::impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecute )
> {
>     sal_Bool bUseEscapeProcessing = impl_buildActiveCommand_throw( );
>@@ -2329,7 +2224,6 @@ sal_Bool ORowSet::impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecu
>     return bUseEscapeProcessing;
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool ORowSet::impl_buildActiveCommand_throw()
> {
>     // create the sql command
>@@ -2425,7 +2319,6 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
>     return bDoEscapeProcessing;
> }
> 
>-//------------------------------------------------------------------------------
> void ORowSet::impl_initParametersContainer_nothrow()
> {
>     OSL_PRECOND( !m_pParameters.is(), "ORowSet::impl_initParametersContainer_nothrow: already initialized the parameters!" );
>@@ -2439,7 +2332,6 @@ void ORowSet::impl_initParametersContainer_nothrow()
>     }
> }
> 
>-//------------------------------------------------------------------------------
> void ORowSet::impl_disposeParametersContainer_nothrow()
> {
>     if ( !m_pParameters.is() )
>@@ -2457,7 +2349,6 @@ void ORowSet::impl_disposeParametersContainer_nothrow()
>     m_pParameters = NULL;
> }
> 
>-// -----------------------------------------------------------------------------
> ORowSetValue& ORowSet::getParameterStorage(sal_Int32 parameterIndex)
> {
>     ::connectivity::checkDisposed( ORowSet_BASE1::rBHelper.bDisposed );
>@@ -2490,7 +2381,6 @@ ORowSetValue& ORowSet::getParameterStorage(sal_Int32 parameterIndex)
>         m_aPrematureParamValues.get().resize( parameterIndex );
>     return m_aPrematureParamValues.get()[ parameterIndex - 1 ];
> }
>-// -------------------------------------------------------------------------
> // XParameters
> void SAL_CALL ORowSet::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException)
> {
>@@ -2498,12 +2388,10 @@ void SAL_CALL ORowSet::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/
> 
>     getParameterStorage( parameterIndex ).setNull();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
> {
>     setNull( parameterIndex, sqlType );
> }
>-// -----------------------------------------------------------------------------
> void ORowSet::setParameter(sal_Int32 parameterIndex, const ORowSetValue& x)
> {
>     ::osl::MutexGuard aGuard( m_aColumnsMutex );
>@@ -2511,67 +2399,54 @@ void ORowSet::setParameter(sal_Int32 parameterIndex, const ORowSetValue& x)
>     getParameterStorage( parameterIndex ) = x;
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException)
> {
>     setParameter(parameterIndex,x);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aColumnsMutex );
>@@ -2589,7 +2464,6 @@ void SAL_CALL ORowSet::setBinaryStream( sal_Int32 parameterIndex, const Referenc
>         throw SQLException();
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aColumnsMutex );
>@@ -2611,7 +2485,6 @@ void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Refer
>         throw SQLException();
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
> {
>     if ( !::dbtools::implSetObject( this, parameterIndex, x ) )
>@@ -2619,7 +2492,6 @@ void SAL_CALL ORowSet::setObject( sal_Int32 parameterIndex, const Any& x ) throw
>         throw SQLException();
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aColumnsMutex );
>@@ -2627,27 +2499,22 @@ void SAL_CALL ORowSet::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x
>     setObject( parameterIndex, x );
>     rParamValue.setTypeKind( targetSqlType );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException)
> {
>     ::dbtools::throwFeatureNotImplementedException( "XParameters::setRef", *this );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException)
> {
>     ::dbtools::throwFeatureNotImplementedException( "XParameters::setBlob", *this );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException)
> {
>     ::dbtools::throwFeatureNotImplementedException( "XParameters::setClob", *this );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException)
> {
>     ::dbtools::throwFeatureNotImplementedException( "XParameters::setArray", *this );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::clearParameters(  ) throw(SQLException, RuntimeException)
> {
>     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
>@@ -2660,18 +2527,15 @@ void SAL_CALL ORowSet::clearParameters(  ) throw(SQLException, RuntimeException)
>     m_aParametersSet.clear();
> }
> 
>-// -------------------------------------------------------------------------
> Any SAL_CALL ORowSet::getWarnings(  ) throw (SQLException, RuntimeException)
> {
>     return m_aWarnings.getWarnings();
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSet::clearWarnings(  ) throw (SQLException, RuntimeException)
> {
>     m_aWarnings.clearWarnings();
> }
>-// -----------------------------------------------------------------------------
> void ORowSet::doCancelModification( )
> {
>     //OSL_ENSURE( isModification(), "ORowSet::doCancelModification: invalid call (no cache!)!" );
>@@ -2684,31 +2548,26 @@ void ORowSet::doCancelModification( )
>     m_bModified = sal_False;
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSet::isModification( )
> {
>     return isNew();
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSet::isModified( )
> {
>     return m_bModified;
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSet::isNew( )
> {
>     return m_bNew;
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSet::isPropertyChangeNotificationEnabled() const
> {
>     return m_bPropChangeNotifyEnabled;
> }
> 
>-// -----------------------------------------------------------------------------
> void ORowSet::checkUpdateIterator()
> {
>     if(!m_bModified && !m_bNew)
>@@ -2720,7 +2579,6 @@ void ORowSet::checkUpdateIterator()
>     else if ( m_bNew ) // here we are modifing a value
>         m_bModified = sal_True;
> }
>-// -----------------------------------------------------------------------------
> void ORowSet::checkUpdateConditions(sal_Int32 columnIndex)
> {
>     checkCache();
>@@ -2736,7 +2594,6 @@ void ORowSet::checkUpdateConditions(sal_Int32 columnIndex)
>     if ( columnIndex <= 0 || sal_Int32((*m_aCurrentRow)->get().size()) <= columnIndex )
>         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INVALID_INDEX ), SQL_INVALID_DESCRIPTOR_INDEX, *this );
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ORowSet::refreshRow(  ) throw(SQLException, RuntimeException)
> {
>     
>@@ -2754,7 +2611,6 @@ void SAL_CALL ORowSet::refreshRow(  ) throw(SQLException, RuntimeException)
>     // - IsNew
>     aNotifier.fire( );
> }
>-// -----------------------------------------------------------------------------
> void ORowSet::impl_rebuild_throw(::osl::ResettableMutexGuard& _rGuard)
> {
>     Reference< XResultSet > xResultSet( m_xStatement->executeQuery() );
>@@ -2766,7 +2622,6 @@ void ORowSet::impl_rebuild_throw(::osl::ResettableMutexGuard& _rGuard)
> //  ORowSetClone
> // ***********************************************************
> DBG_NAME(ORowSetClone);
>-//--------------------------------------------------------------------------
> ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORowSet& rParent, ::osl::Mutex* _pMutex )
>              :OSubComponent(m_aMutex, rParent)
>              ,ORowSetBase( _rContext, OComponentHelper::rBHelper, _pMutex )
>@@ -2857,19 +2712,16 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
>     registerProperty(PROPERTY_ISBOOKMARKABLE,		PROPERTY_ID_ISBOOKMARKABLE,			nRT,							&m_bIsBookmarable,		::getBooleanCppuType());
> }
> 
>-//--------------------------------------------------------------------------
> ORowSetClone::~ORowSetClone()
> {
>     DBG_DTOR(ORowSetClone, NULL);
> }
> // com::sun::star::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< Type > ORowSetClone::getTypes() throw (RuntimeException)
> {
>     return ::comphelper::concatSequences(OSubComponent::getTypes(),ORowSetBase::getTypes());
> }
> // com::sun::star::XInterface
>-//--------------------------------------------------------------------------
> Any ORowSetClone::queryInterface( const Type & rType ) throw (RuntimeException)
> {
>     Any aRet = ORowSetBase::queryInterface(rType);
>@@ -2877,32 +2729,27 @@ Any ORowSetClone::queryInterface( const Type & rType ) throw (RuntimeException)
>         aRet = OSubComponent::queryInterface(rType);
>     return aRet;
> }
>-//------------------------------------------------------------------------------
> void ORowSetClone::acquire() throw()
> {
>     OSubComponent::acquire();
> }
> 
>-//------------------------------------------------------------------------------
> void ORowSetClone::release() throw()
> {
>     OSubComponent::release();
> }
> 
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString ORowSetClone::getImplementationName(  ) throw(RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.ORowSetClone");
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool ORowSetClone::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > ORowSetClone::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSNS( 2 );
>@@ -2912,7 +2759,6 @@ Sequence< ::rtl::OUString > ORowSetClone::getSupportedServiceNames(  ) throw (Ru
> }
> 
> // OComponentHelper
>-//------------------------------------------------------------------------------
> void ORowSetClone::disposing()
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -2924,7 +2770,6 @@ void ORowSetClone::disposing()
> }
> 
> // XCloseable
>-//------------------------------------------------------------------------------
> void ORowSetClone::close(void) throw( SQLException, RuntimeException )
> {
>     {
>@@ -2934,7 +2779,6 @@ void ORowSetClone::close(void) throw( SQLException, RuntimeException )
>     }
>     dispose();
> }
>-// -------------------------------------------------------------------------
> 
> // comphelper::OPropertyArrayUsageHelper
> ::cppu::IPropertyArrayHelper* ORowSetClone::createArrayHelper( ) const
>@@ -2943,7 +2787,6 @@ void ORowSetClone::close(void) throw( SQLException, RuntimeException )
>     describeProperties(aProps);
>     return new ::cppu::OPropertyArrayHelper(aProps);
> }
>-// -------------------------------------------------------------------------
> 
> // cppu::OPropertySetHelper
> ::cppu::IPropertyArrayHelper& SAL_CALL ORowSetClone::getInfoHelper()
>@@ -2951,8 +2794,6 @@ void ORowSetClone::close(void) throw( SQLException, RuntimeException )
>     typedef ::comphelper::OPropertyArrayUsageHelper<ORowSetClone> ORowSetClone_PROP;
>     return *ORowSetClone_PROP::getArrayHelper();
> }
>-// -------------------------------------------------------------------------
>-//--------------------------------------------------------------------------
> Sequence< sal_Int8 > ORowSetClone::getUnoTunnelImplementationId()
> {
>     static ::cppu::OImplementationId * pId = 0;
>@@ -2967,7 +2808,6 @@ Sequence< sal_Int8 > ORowSetClone::getUnoTunnelImplementationId()
>     }
>     return pId->getImplementationId();
> }
>-// -----------------------------------------------------------------------------
> // com::sun::star::XUnoTunnel
> sal_Int64 SAL_CALL ORowSetClone::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
> {
>@@ -2976,7 +2816,6 @@ sal_Int64 SAL_CALL ORowSetClone::getSomething( const Sequence< sal_Int8 >& rId )
> 
>     return 0;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ORowSetClone::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
> {
>     if ( nHandle == PROPERTY_ID_FETCHSIZE )
>@@ -2988,43 +2827,36 @@ void SAL_CALL ORowSetClone::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,c
>     OPropertyStateContainer::setFastPropertyValue_NoBroadcast(nHandle,rValue);
> }
> 
>-// -----------------------------------------------------------------------------
> void ORowSetClone::doCancelModification( )
> {
>     //OSL_ENSURE( sal_False, "ORowSetClone::doCancelModification: invalid call!" );
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSetClone::isModification( )
> {
>     return sal_False;
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSetClone::isModified( )
> {
>     return sal_False;
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSetClone::isNew( )
> {
>     return sal_False;
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSetClone::execute(  ) throw(SQLException, RuntimeException)
> {
>     throwFunctionNotSupportedException( "RowSetClone::XRowSet::execute", *this );
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSetClone::addRowSetListener( const Reference< XRowSetListener >& ) throw(RuntimeException)
> {
>     throwFunctionNotSupportedException( "RowSetClone::XRowSet", *this );
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSetClone::removeRowSetListener( const Reference< XRowSetListener >& ) throw(RuntimeException)
> {
>     throwFunctionNotSupportedException( "RowSetClone::XRowSet", *this );
>diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
>index 57c844f..248f6e1 100644
>--- a/dbaccess/source/core/api/RowSetBase.cxx
>+++ b/dbaccess/source/core/api/RowSetBase.cxx
>@@ -70,7 +70,6 @@ namespace dbaccess
> // =========================================================================
> // = OEmptyCollection
> // =========================================================================
>-// -------------------------------------------------------------------------
> class OEmptyCollection : public sdbcx::OCollection
> {
> protected:
>@@ -79,22 +78,18 @@ protected:
> public:
>     OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent,sal_True,_rMutex,::std::vector< ::rtl::OUString>()){}
> };
>-// -----------------------------------------------------------------------------
> void OEmptyCollection::impl_refresh() throw(RuntimeException)
> {
> }
>-// -----------------------------------------------------------------------------
> connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const ::rtl::OUString& /*_rName*/)
> {
>     return connectivity::sdbcx::ObjectType();
> }
>-// -----------------------------------------------------------------------------
> 
> // =========================================================================
> // = ORowSetBase
> // =========================================================================
> DBG_NAME(ORowSetBase)
>-// -------------------------------------------------------------------------
> ORowSetBase::ORowSetBase( const ::comphelper::ComponentContext& _rContext, ::cppu::OBroadcastHelper& _rBHelper, ::osl::Mutex* _pMutex )
>     :OPropertyStateContainer(_rBHelper)
>     ,m_pMutex(_pMutex)
>@@ -123,7 +118,6 @@ ORowSetBase::ORowSetBase( const ::comphelper::ComponentContext& _rContext, ::cpp
>     registerPropertyNoMember( PROPERTY_ROWCOUNT,        PROPERTY_ID_ROWCOUNT,        nRBT, ::getCppuType( &nInitialRowCountValue ), &nInitialRowCountValue );
>     registerPropertyNoMember( PROPERTY_ISROWCOUNTFINAL, PROPERTY_ID_ISROWCOUNTFINAL, nRBT, ::getBooleanCppuType(),                  &bInitialRowCountFinalValue );
> }
>-// -----------------------------------------------------------------------------
> ORowSetBase::~ORowSetBase()
> {
>     if(m_pColumns)
>@@ -141,14 +135,12 @@ ORowSetBase::~ORowSetBase()
>     DBG_DTOR(ORowSetBase,NULL);
> }
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< Type > ORowSetBase::getTypes() throw (RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getTypes" );
>     return ::comphelper::concatSequences(ORowSetBase_BASE::getTypes(),OPropertyStateContainer::getTypes());
> }
> // com::sun::star::uno::XInterface
>-//--------------------------------------------------------------------------
> Any ORowSetBase::queryInterface( const Type & rType ) throw (RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::queryInterface" );
>@@ -157,7 +149,6 @@ Any ORowSetBase::queryInterface( const Type & rType ) throw (RuntimeException)
>         aRet = OPropertyStateContainer::queryInterface(rType);
>     return aRet;
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSetBase::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getFastPropertyValue" );
>@@ -178,7 +169,6 @@ void SAL_CALL ORowSetBase::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) c
>     else
>         OPropertyStateContainer::getFastPropertyValue(rValue,nHandle);
> }
>-// -------------------------------------------------------------------------
> // OComponentHelper
> void SAL_CALL ORowSetBase::disposing(void)
> {
>@@ -197,7 +187,6 @@ void SAL_CALL ORowSetBase::disposing(void)
>     }
>     m_pCache = NULL;
> }
>-// -------------------------------------------------------------------------
> // comphelper::OPropertyArrayUsageHelper
> ::cppu::IPropertyArrayHelper* ORowSetBase::createArrayHelper( ) const
> {
>@@ -206,14 +195,12 @@ void SAL_CALL ORowSetBase::disposing(void)
>     describeProperties(aProps);
>     return new ::cppu::OPropertyArrayHelper(aProps);
> }
>-// -------------------------------------------------------------------------
> // cppu::OPropertySetHelper
> ::cppu::IPropertyArrayHelper& SAL_CALL ORowSetBase::getInfoHelper()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getInfoHelper" );
>     return *const_cast<ORowSetBase*>(this)->getArrayHelper();
> }
>-// -------------------------------------------------------------------------
> // XRow
> sal_Bool SAL_CALL ORowSetBase::wasNull(  ) throw(SQLException, RuntimeException)
> {
>@@ -222,21 +209,18 @@ sal_Bool SAL_CALL ORowSetBase::wasNull(  ) throw(SQLException, RuntimeException)
>     checkCache();
>     return impl_wasNull();
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSetBase::impl_wasNull()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_wasNull" );
>     return ((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->isValid()) ? ((*m_aCurrentRow)->get())[m_nLastColumnIndex].isNull() : sal_True;
> }
> 
>-// -----------------------------------------------------------------------------
> const ORowSetValue& ORowSetBase::getValue(sal_Int32 columnIndex)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getValue" );
>     checkCache();
>     return impl_getValue(columnIndex);
> }
>-// -----------------------------------------------------------------------------
> const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
> {	
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_getValue" );
>@@ -291,91 +275,78 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
>     // we should normally never reach this
>     return m_aEmptyValue;
> }
>-// -------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getString" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getBoolean" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int8 SAL_CALL ORowSetBase::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getByte" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int16 SAL_CALL ORowSetBase::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getShort" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL ORowSetBase::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getInt" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> sal_Int64 SAL_CALL ORowSetBase::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getLong" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> float SAL_CALL ORowSetBase::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getFloat" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> double SAL_CALL ORowSetBase::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getDouble" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Sequence< sal_Int8 > SAL_CALL ORowSetBase::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getBytes" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::Date SAL_CALL ORowSetBase::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getDate" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::Time SAL_CALL ORowSetBase::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getTime" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> ::com::sun::star::util::DateTime SAL_CALL ORowSetBase::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getTimestamp" );
>     ::osl::MutexGuard aGuard( *m_pMutex );
>     return getValue(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getBinaryStream" );
>@@ -409,13 +380,11 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS
>     // we should normally never reach this
>     return Reference< ::com::sun::star::io::XInputStream >();
> }
>-// -------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getCharacterStream" );
>     return getBinaryStream(columnIndex);
> }
>-// -------------------------------------------------------------------------
> Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getObject" );
>@@ -424,33 +393,28 @@ Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNa
> 
>     return getValue(columnIndex).makeAny();
> }
>-// -------------------------------------------------------------------------
> Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getRef" );
>     ::dbtools::throwFeatureNotImplementedException( "XRow::getRef", *m_pMySelf );
>     return NULL;
> }
>-// -------------------------------------------------------------------------
> Reference< XBlob > SAL_CALL ORowSetBase::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getBlob" );
>     return Reference< XBlob >(getValue(columnIndex).makeAny(),UNO_QUERY);
> }
>-// -------------------------------------------------------------------------
> Reference< XClob > SAL_CALL ORowSetBase::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getClob" );
>     return Reference< XClob >(getValue(columnIndex).makeAny(),UNO_QUERY);
> }
>-// -------------------------------------------------------------------------
> Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getArray" );
>     ::dbtools::throwFeatureNotImplementedException( "XRow::getArray", *m_pMySelf );
>     return NULL;
> }
>-// -------------------------------------------------------------------------
> // ::com::sun::star::sdbcx::XRowLocate
> Any SAL_CALL ORowSetBase::getBookmark(  ) throw(SQLException, RuntimeException)
> {
>@@ -469,7 +433,6 @@ Any SAL_CALL ORowSetBase::getBookmark(  ) throw(SQLException, RuntimeException)
>     OSL_ENSURE( m_aBookmark.hasValue(), "ORowSetBase::getBookmark: bookmark has no value!" );
>     return m_aBookmark;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::moveToBookmark" );
>@@ -521,7 +484,6 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx
>     DBG_TRACE2("DBACCESS ORowSetBase::moveToBookmark(Any) = %i Clone = %i\n",bRet,m_bClone);
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::moveRelativeToBookmark" );
>@@ -565,7 +527,6 @@ sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_
>     DBG_TRACE3("DBACCESS ORowSetBase::moveRelativeToBookmark(Any,%i) = %i Clone = %i\n",rows,bRet,m_bClone);
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::compareBookmarks" );
>@@ -573,7 +534,6 @@ sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& _first, const Any&
>     checkCache();
>     return m_pCache->compareBookmarks(_first,_second);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::hasOrderedBookmarks" );
>@@ -581,7 +541,6 @@ sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks(  ) throw(SQLException, Runti
>     checkCache();
>     return m_pCache->hasOrderedBookmarks();
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::hashBookmark" );
>@@ -589,8 +548,6 @@ sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) throw(SQLExc
>     checkCache();
>     return m_pCache->hashBookmark(bookmark);
> }
>-// -------------------------------------------------------------------------
>-// -------------------------------------------------------------------------
> // XResultSetMetaDataSupplier
> Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData(  ) throw(SQLException, RuntimeException)
> {
>@@ -603,7 +560,6 @@ Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData(  ) throw(SQLE
> 
>     return xMeta;
> }
>-// -------------------------------------------------------------------------
> 
> // XColumnLocate
> sal_Int32 SAL_CALL ORowSetBase::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException)
>@@ -615,7 +571,6 @@ sal_Int32 SAL_CALL ORowSetBase::findColumn( const ::rtl::OUString& columnName )
>     // it is possible to save some time her when we remember the names - position relation in a map
>     return m_pColumns ? m_pColumns->findColumn(columnName) : sal_Int32(0);
> }
>-// -------------------------------------------------------------------------
> 
> // ::com::sun::star::sdbcx::XColumnsSupplier
> Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns(  ) throw(RuntimeException)
>@@ -633,7 +588,6 @@ Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns(  ) throw(RuntimeExcep
> 
>     return m_pColumns;
> }
>-// -------------------------------------------------------------------------
> // XResultSet
> sal_Bool SAL_CALL ORowSetBase::next(  ) throw(SQLException, RuntimeException)
> {
>@@ -684,7 +638,6 @@ sal_Bool SAL_CALL ORowSetBase::next(  ) throw(SQLException, RuntimeException)
>     DBG_TRACE3("DBACCESS ORowSetBase::next() = %i Clone = %i ID = %i\n",bRet,m_bClone,osl_getThreadIdentifier(NULL));
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::isBeforeFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isBeforeFirst" );
>@@ -696,7 +649,6 @@ sal_Bool SAL_CALL ORowSetBase::isBeforeFirst(  ) throw(SQLException, RuntimeExce
> 
>     return m_bBeforeFirst;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::isAfterLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isAfterLast" );
>@@ -707,13 +659,11 @@ sal_Bool SAL_CALL ORowSetBase::isAfterLast(  ) throw(SQLException, RuntimeExcept
> 
>     return m_bAfterLast;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetBase::isOnFirst()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isOnFirst" );
>     return isFirst();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::isFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isFirst" );
>@@ -735,13 +685,11 @@ sal_Bool SAL_CALL ORowSetBase::isFirst(  ) throw(SQLException, RuntimeException)
>     DBG_TRACE2("DBACCESS ORowSetBase::isFirst() = %i Clone = %i\n",bIsFirst,m_bClone);
>     return bIsFirst;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetBase::isOnLast()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isOnLast" );
>     return isLast();
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::isLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isLast" );
>@@ -767,7 +715,6 @@ sal_Bool SAL_CALL ORowSetBase::isLast(  ) throw(SQLException, RuntimeException)
>     DBG_TRACE2("DBACCESS ORowSetBase::isLast() = %i Clone = %i\n",bIsLast,m_bClone);
>     return bIsLast;
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSetBase::beforeFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::beforeFirst" );
>@@ -809,7 +756,6 @@ void SAL_CALL ORowSetBase::beforeFirst(  ) throw(SQLException, RuntimeException)
>     }
>     DBG_TRACE2("DBACCESS ORowSetBase::beforeFirst() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSetBase::afterLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::afterLast" );
>@@ -849,7 +795,6 @@ void SAL_CALL ORowSetBase::afterLast(  ) throw(SQLException, RuntimeException)
>     }
>     DBG_TRACE2("DBACCESS ORowSetBase::afterLast() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::move(	::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor,
>                                         ::std::mem_fun_t<sal_Bool,ORowSetCache>& _aMovementFunctor)
> {
>@@ -897,7 +842,6 @@ sal_Bool SAL_CALL ORowSetBase::move(	::std::mem_fun_t<sal_Bool,ORowSetBase>& _aC
>     DBG_TRACE2("DBACCESS ORowSetBase::move() = %i Clone = %i\n",bRet,m_bClone);
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::first(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::first" );
>@@ -906,7 +850,6 @@ sal_Bool SAL_CALL ORowSetBase::first(  ) throw(SQLException, RuntimeException)
>     ::std::mem_fun_t<sal_Bool,ORowSetCache> F_tmp(&ORowSetCache::first);
>     return move(ioF_tmp,F_tmp);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::last(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::last" );
>@@ -915,7 +858,6 @@ sal_Bool SAL_CALL ORowSetBase::last(  ) throw(SQLException, RuntimeException)
>     ::std::mem_fun_t<sal_Bool,ORowSetCache> L_tmp(&ORowSetCache::last);
>     return move(ioL_tmp,L_tmp);
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL ORowSetBase::getRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getRow" );
>@@ -925,7 +867,6 @@ sal_Int32 SAL_CALL ORowSetBase::getRow(  ) throw(SQLException, RuntimeException)
>     checkCache();
>     return impl_getRow();
> }
>-// -------------------------------------------------------------------------
> sal_Int32 ORowSetBase::impl_getRow()
> {   
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_getRow" );
>@@ -952,7 +893,6 @@ sal_Int32 ORowSetBase::impl_getRow()
>     DBG_TRACE3("DBACCESS ORowSetBase::impl_getRow() = %i Clone = %i ID = %i\n",nPos,m_bClone,osl_getThreadIdentifier(NULL));
>     return nPos;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::absolute" );
>@@ -998,7 +938,6 @@ sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, Run
>     DBG_TRACE3("DBACCESS ORowSetBase::absolute(%i) = %i Clone = %i\n",row,bRet,m_bClone);
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::relative" );
>@@ -1054,7 +993,6 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, Ru
>     DBG_TRACE3("DBACCESS ORowSetBase::relative(%i) = %i Clone = %i\n",rows,bRet,m_bClone);
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::previous(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::previous" );
>@@ -1107,7 +1045,6 @@ sal_Bool SAL_CALL ORowSetBase::previous(  ) throw(SQLException, RuntimeException
>     DBG_TRACE2("DBACCESS ORowSetBase::previous() = %i Clone = %i\n",bRet,m_bClone);
>     return bRet;
> }
>-// -----------------------------------------------------------------------------
> void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const ORowSetRow& _rOldValues, ::osl::ResettableMutexGuard& _rGuard )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::setCurrentRow" );
>@@ -1173,20 +1110,17 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
> 
>     DBG_TRACE2("DBACCESS ORowSetBase::setCurrentRow() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
> }
>-// -----------------------------------------------------------------------------
> void ORowSetBase::checkPositioningAllowed() throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::checkPositioningAllowed" );
>     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
>         throwFunctionSequenceException(*m_pMySelf);
> }
>-//------------------------------------------------------------------------------
> Reference< XInterface >  ORowSetBase::getStatement(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getStatement" );
>     return NULL;
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSetBase::refreshRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::refreshRow" );
>@@ -1202,7 +1136,6 @@ void SAL_CALL ORowSetBase::refreshRow(  ) throw(SQLException, RuntimeException)
>         m_pCache->refreshRow();
>     }
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::rowUpdated(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::rowUpdated" );
>@@ -1214,7 +1147,6 @@ sal_Bool SAL_CALL ORowSetBase::rowUpdated(  ) throw(SQLException, RuntimeExcepti
> 
>     return m_pCache->rowUpdated();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::rowInserted(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::rowInserted" );
>@@ -1227,7 +1159,6 @@ sal_Bool SAL_CALL ORowSetBase::rowInserted(  ) throw(SQLException, RuntimeExcept
> 
>     return m_pCache->rowInserted();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL ORowSetBase::rowDeleted(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::rowDeleted" );
>@@ -1235,12 +1166,10 @@ sal_Bool SAL_CALL ORowSetBase::rowDeleted(  ) throw(SQLException, RuntimeExcepti
>     checkCache();
>     return impl_rowDeleted();
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetBase::impl_rowDeleted(  )
> {
>     return !m_aBookmark.hasValue() && !m_bBeforeFirst && !m_bAfterLast;
> }
>-// -------------------------------------------------------------------------
> // XWarningsSupplier
> Any SAL_CALL ORowSetBase::getWarnings(  ) throw(SQLException, RuntimeException)
> {
>@@ -1256,7 +1185,6 @@ Any SAL_CALL ORowSetBase::getWarnings(  ) throw(SQLException, RuntimeException)
> 
>     return Any();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL ORowSetBase::clearWarnings(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::clearWarnings" );
>@@ -1269,7 +1197,6 @@ void SAL_CALL ORowSetBase::clearWarnings(  ) throw(SQLException, RuntimeExceptio
>             xWarnings->clearWarnings();
>     }
> }
>-// -------------------------------------------------------------------------
> void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow)
> {
>     if (!isPropertyChangeNotificationEnabled())
>@@ -1297,44 +1224,37 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow)
>     }
>     DBG_TRACE2("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
> }
>-// -------------------------------------------------------------------------
> void ORowSetBase::firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rOldValue)
> {
>     OSL_ENSURE(_nPos < (sal_Int32)m_aDataColumns.size(),"nPos is invalid!");
>     m_aDataColumns[_nPos]->fireValueChange(_rOldValue);
> }
>-// -----------------------------------------------------------------------------
> void ORowSetBase::fireRowcount()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::fireRowcount" );
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSetBase::notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& /*_rGuard*/)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::notifyAllListenersCursorBeforeMove" );
>     return sal_True;
> }
> 
>-// -----------------------------------------------------------------------------
> void ORowSetBase::notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& /*_rGuard*/)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::notifyAllListenersCursorMoved" );
> }
> 
>-// -----------------------------------------------------------------------------
> void ORowSetBase::notifyAllListeners(::osl::ResettableMutexGuard& /*_rGuard*/)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::notifyAllListeners" );
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSetBase::isPropertyChangeNotificationEnabled() const
> {
>     return sal_True;
> }
> 
>-// -----------------------------------------------------------------------------
> void ORowSetBase::fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::fireProperty" );
>@@ -1343,7 +1263,6 @@ void ORowSetBase::fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _
>     fire( &_nProperty, &aNew, &aOld, 1, sal_False );
> }
> 
>-// -----------------------------------------------------------------------------
> void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::positionCache" );
>@@ -1399,7 +1318,6 @@ void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection )
> 
>     DBG_TRACE2("DBACCESS ORowSetBase::positionCache() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
> }
>-// -----------------------------------------------------------------------------
> void ORowSetBase::checkCache()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::checkCache" );
>@@ -1407,7 +1325,6 @@ void ORowSetBase::checkCache()
>     if(!m_pCache)
>         throwFunctionSequenceException(*m_pMySelf);
> }
>-// -----------------------------------------------------------------------------
> void ORowSetBase::movementFailed()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::movementFailed" );
>@@ -1421,7 +1338,6 @@ void ORowSetBase::movementFailed()
>     OSL_ENSURE(m_bBeforeFirst || m_bAfterLast,"BeforeFirst or AfterLast is wrong!");
>     DBG_TRACE2("DBACCESS ORowSetBase::movementFailed() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
> }
>-// -----------------------------------------------------------------------------
> ORowSetRow ORowSetBase::getOldRow(sal_Bool _bWasNew)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getOldRow" );
>@@ -1431,13 +1347,11 @@ ORowSetRow ORowSetBase::getOldRow(sal_Bool _bWasNew)
>         aOldValues = new ORowSetValueVector( m_aOldRow->getRow().getBody());	 // remember the old values
>     return aOldValues;
> }
>-// -----------------------------------------------------------------------------
> void ORowSetBase::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any& _rDefault ) const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getPropertyDefaultByHandle" );
>     _rDefault.clear();
> }
>-// -----------------------------------------------------------------------------
> void ORowSetBase::onDeleteRow( const Any& _rBookmark )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::onDeleteRow" );
>@@ -1453,7 +1367,6 @@ void ORowSetBase::onDeleteRow( const Any& _rBookmark )
>         m_nDeletedPosition = m_pCache->getRow();
>     }
> }
>-// -----------------------------------------------------------------------------
> void ORowSetBase::onDeletedRow( const Any& _rBookmark, sal_Int32 _nPos )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::onDeletedRow" );
>@@ -1476,7 +1389,6 @@ void ORowSetBase::onDeletedRow( const Any& _rBookmark, sal_Int32 _nPos )
>         m_aCurrentRow.setBookmark( m_aBookmark );
>     }
> }
>-// -----------------------------------------------------------------------------
> sal_Int32 ORowSetBase::impl_getRowCount() const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_getRowCount" );
>@@ -1494,7 +1406,6 @@ struct ORowSetNotifierImpl
> 
> };
> DBG_NAME(ORowSetNotifier)
>-// -----------------------------------------------------------------------------
> ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet )
>     :m_pRowSet( _pRowSet )
>     ,m_bWasNew( sal_False )
>@@ -1515,7 +1426,6 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet )
>     if ( m_pRowSet->isModification( ORowSetBase::GrantNotifierAccess() ) )
>         m_pRowSet->doCancelModification( ORowSetBase::GrantNotifierAccess() );
> }
>-// -----------------------------------------------------------------------------
> ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet,const ORowSetValueVector::Vector& i_aRow )
>     :m_pImpl(new ORowSetNotifierImpl)
>     ,m_pRowSet( _pRowSet )
>@@ -1530,14 +1440,12 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet,const ORowSetValueVector
>     OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. This wil crash." );
>     m_pImpl->aRow = i_aRow; // yes, create a copy to store the old values
> }
>-// -----------------------------------------------------------------------------
> ORowSetNotifier::~ORowSetNotifier( )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetNotifier::~ORowSetNotifier" );
>     DBG_DTOR(ORowSetNotifier,NULL);
> }
> 
>-// -----------------------------------------------------------------------------
> void ORowSetNotifier::fire()
> {
>     // we're not interested in firing changes FALSE->TRUE, only TRUE->FALSE.
>@@ -1557,19 +1465,16 @@ void ORowSetNotifier::fire()
>     m_bNotifyCalled = sal_True;
> #endif
> }
>-// -----------------------------------------------------------------------------
> ::std::vector<sal_Int32>& ORowSetNotifier::getChangedColumns() const
> {
>     OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!");
>     return m_pImpl->aChangedColumns;
> }
>-// -----------------------------------------------------------------------------
> ::std::vector<Any>& ORowSetNotifier::getChangedBookmarks() const
> {
>     OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!");
>     return m_pImpl->aChangedBookmarks;
> }
>-// -----------------------------------------------------------------------------
> void ORowSetNotifier::firePropertyChange()
> {
>     OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!");
>diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
>index cbe9046..b1f8b54 100644
>--- a/dbaccess/source/core/api/RowSetCache.cxx
>+++ b/dbaccess/source/core/api/RowSetCache.cxx
>@@ -77,7 +77,6 @@ using namespace ::osl;
> #define CHECK_MATRIX_POS(M) OSL_ENSURE(((M) >= static_cast<ORowSetMatrix::difference_type>(0)) && ((M) < static_cast<sal_Int32>(m_pMatrix->size())),"Position is invalid!")
> 
> DBG_NAME(ORowSetCache)
>-// -------------------------------------------------------------------------
> ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
>                            const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer,
>                            const ::comphelper::ComponentContext& _rContext,
>@@ -340,7 +339,6 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
>         m_nPrivileges = Privilege::SELECT;
> }
> 
>-// -------------------------------------------------------------------------
> ORowSetCache::~ORowSetCache()
> {
>     m_pCacheSet = NULL;
>@@ -363,7 +361,6 @@ ORowSetCache::~ORowSetCache()
>     DBG_DTOR(ORowSetCache,NULL);
> }
> 
>-// -------------------------------------------------------------------------
> void ORowSetCache::setMaxRowSize(sal_Int32 _nSize)
> {
> 
>@@ -433,14 +430,12 @@ void ORowSetCache::setMaxRowSize(sal_Int32 _nSize)
>         m_nEndPos = _nSize;
>     }
> }
>-// -------------------------------------------------------------------------
> 
> // XResultSetMetaDataSupplier
> Reference< XResultSetMetaData > ORowSetCache::getMetaData(  )
> {
>     return m_xMetaData;
> }
>-// -------------------------------------------------------------------------
> Any lcl_getBookmark(ORowSetValue& i_aValue,OCacheSet* i_pCacheSet)
> {
>     switch ( i_aValue.getTypeKind() )
>@@ -455,7 +450,6 @@ Any lcl_getBookmark(ORowSetValue& i_aValue,OCacheSet* i_pCacheSet)
>             return i_aValue.getAny();
>     }
> }
>-// -------------------------------------------------------------------------
> // ::com::sun::star::sdbcx::XRowLocate
> Any ORowSetCache::getBookmark(  )
> {
>@@ -470,7 +464,6 @@ Any ORowSetCache::getBookmark(  )
> 
>     return lcl_getBookmark(((*m_aMatrixIter)->get())[0],m_pCacheSet);
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::moveToBookmark( const Any& bookmark )
> {
>     if ( m_pCacheSet->moveToBookmark(bookmark) )
>@@ -500,7 +493,6 @@ sal_Bool ORowSetCache::moveToBookmark( const Any& bookmark )
> 
>     return m_aMatrixIter != m_pMatrix->end() && (*m_aMatrixIter).isValid();
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows )
> {
>     sal_Bool bRet( moveToBookmark( bookmark ) );
>@@ -515,23 +507,19 @@ sal_Bool ORowSetCache::moveRelativeToBookmark( const Any& bookmark, sal_Int32 ro
> 
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> sal_Int32 ORowSetCache::compareBookmarks( const Any& _first, const Any& _second )
> {
>     return (!_first.hasValue() || !_second.hasValue()) ? CompareBookmark::NOT_COMPARABLE : m_pCacheSet->compareBookmarks(_first,_second);
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::hasOrderedBookmarks(  )
> {
>     return m_pCacheSet->hasOrderedBookmarks();
> }
>-// -------------------------------------------------------------------------
> sal_Int32 ORowSetCache::hashBookmark( const Any& bookmark )
> {
>     return m_pCacheSet->hashBookmark(bookmark);
> }
> // XRowUpdate
>-// -----------------------------------------------------------------------------
> void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector& io_aRow
>                               ,::std::vector<sal_Int32>& o_ChangedColumns
>                               )
>@@ -547,7 +535,6 @@ void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector&
>     m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
>     impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
> }
>-// -----------------------------------------------------------------------------
> void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x
>                                ,ORowSetValueVector::Vector& io_aRow
>                                ,::std::vector<sal_Int32>& o_ChangedColumns
>@@ -564,7 +551,6 @@ void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x
>     m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
>     impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
> }
>-// -------------------------------------------------------------------------
> void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x
>                                          , sal_Int32 length,ORowSetValueVector::Vector& io_aRow
>                                          ,::std::vector<sal_Int32>& o_ChangedColumns
>@@ -585,7 +571,6 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference
>     m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
>     impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
> }
>-// -------------------------------------------------------------------------
> void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x
>                                 ,ORowSetValueVector::Vector& io_aRow
>                                 ,::std::vector<sal_Int32>& o_ChangedColumns 
>@@ -602,7 +587,6 @@ void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x
>     m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
>     impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
> }
>-// -------------------------------------------------------------------------
> void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/
>                                        ,ORowSetValueVector::Vector& io_aRow
>                                        ,::std::vector<sal_Int32>& o_ChangedColumns
>@@ -619,7 +603,6 @@ void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal
>     m_pCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
>     impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
> }
>-// -------------------------------------------------------------------------
> // XResultSet
> sal_Bool ORowSetCache::next(  )
> {
>@@ -642,33 +625,28 @@ sal_Bool ORowSetCache::next(  )
> 
>     return !m_bAfterLast;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::isBeforeFirst(  )
> {
>     //	return !m_nPosition;
> 
>     return m_bBeforeFirst;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::isAfterLast(  )
> {
> 
>     return m_bAfterLast;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::isFirst(  )
> {
> 
>     return m_nPosition == 1; // ask resultset for
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::isLast(  )
> {
>     //	return m_bRowCountFinal ? (m_nPosition==m_nRowCount) : m_pCacheSet->isLast();
> 
>     return m_nPosition == m_nRowCount;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::beforeFirst(  )
> {
> 
>@@ -684,7 +662,6 @@ sal_Bool ORowSetCache::beforeFirst(  )
>     }
>     return sal_True;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::afterLast(  )
> {
> 
>@@ -707,7 +684,6 @@ sal_Bool ORowSetCache::afterLast(  )
>     }
>     return sal_True;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos)
> {
>     OSL_ENSURE(_nNewStartPos != _nNewEndPos,"ORowSetCache::fillMatrix: StartPos and EndPos can not be equal!");
>@@ -777,7 +753,6 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos
>     }
>     return bCheck;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::moveWindow()
> {
> 
>@@ -1015,7 +990,6 @@ sal_Bool ORowSetCache::moveWindow()
> 
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::first(  )
> {
>     // first move to the first row
>@@ -1040,7 +1014,6 @@ sal_Bool ORowSetCache::first(  )
>     }
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::last(  )
> {
>     sal_Bool bRet = m_pCacheSet->last();
>@@ -1075,12 +1048,10 @@ sal_Bool ORowSetCache::last(  )
> 
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> sal_Int32 ORowSetCache::getRow(  )
> {
>     return (isBeforeFirst() || isAfterLast()) ? 0 : m_nPosition;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::absolute( sal_Int32 row )
> {
>     if(!row )
>@@ -1133,7 +1104,6 @@ sal_Bool ORowSetCache::absolute( sal_Int32 row )
> 
>     return !(m_bAfterLast || m_bBeforeFirst);
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::relative( sal_Int32 rows )
> {
>     sal_Bool bErg = sal_True;
>@@ -1161,7 +1131,6 @@ sal_Bool ORowSetCache::relative( sal_Int32 rows )
>     }
>     return bErg;
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::previous(  )
> {
>     sal_Bool bRet = sal_False;
>@@ -1192,7 +1161,6 @@ sal_Bool ORowSetCache::previous(  )
>     }
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> void ORowSetCache::refreshRow(  )
> {
>     if(isAfterLast())
>@@ -1205,17 +1173,14 @@ void ORowSetCache::refreshRow(  )
>         cancelRowModification();
>     }
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::rowUpdated(  )
> {
>     return m_pCacheSet->rowUpdated();
> }
>-// -------------------------------------------------------------------------
> sal_Bool ORowSetCache::rowInserted(  )
> {
>     return m_pCacheSet->rowInserted();
> }
>-// -------------------------------------------------------------------------
> // XResultSetUpdate
> sal_Bool ORowSetCache::insertRow(::std::vector< Any >& o_aBookmarks)
> {
>@@ -1251,7 +1216,6 @@ sal_Bool ORowSetCache::insertRow(::std::vector< Any >& o_aBookmarks)
>     }
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> void ORowSetCache::resetInsertRow(sal_Bool _bClearInsertRow)
> {
>     if ( _bClearInsertRow )
>@@ -1259,7 +1223,6 @@ void ORowSetCache::resetInsertRow(sal_Bool _bClearInsertRow)
>     m_bNew		= sal_False;
>     m_bModified = sal_False;
> }
>-// -------------------------------------------------------------------------
> void ORowSetCache::cancelRowModification()
> {
>     // clear the insertrow references	-> implies that the current row of the rowset changes as well
>@@ -1272,7 +1235,6 @@ void ORowSetCache::cancelRowModification()
>     } // for(;aCacheIter != aCacheEnd;++aCacheIter)
>     resetInsertRow(sal_False);
> }
>-// -------------------------------------------------------------------------
> void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector< Any >& o_aBookmarks )
> {
>     if(isAfterLast() || isBeforeFirst())
>@@ -1303,7 +1265,6 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector
> 
>     m_bModified = sal_False;
> }
>-// -------------------------------------------------------------------------
> bool ORowSetCache::deleteRow(  )
> {
>     if(isAfterLast() || isBeforeFirst())
>@@ -1330,7 +1291,6 @@ bool ORowSetCache::deleteRow(  )
>     --m_nPosition;
>     return true;
> }
>-// -------------------------------------------------------------------------
> void ORowSetCache::cancelRowUpdates(  )
> {
>     m_bNew = m_bModified = sal_False;
>@@ -1348,7 +1308,6 @@ void ORowSetCache::cancelRowUpdates(  )
>         ::dbtools::throwFunctionSequenceException(NULL);
>     }
> }
>-// -------------------------------------------------------------------------
> void ORowSetCache::moveToInsertRow(  )
> {
>     m_bNew		= sal_True;
>@@ -1369,7 +1328,6 @@ void ORowSetCache::moveToInsertRow(  )
>         aIter->setTypeKind(m_xMetaData->getColumnType(i));
>     }
> }
>-// -------------------------------------------------------------------------
> ORowSetCacheIterator ORowSetCache::createIterator(ORowSetBase* _pRowSet)
> {
> 
>@@ -1378,7 +1336,6 @@ ORowSetCacheIterator ORowSetCache::createIterator(ORowSetBase* _pRowSet)
>     aHelper.pRowSet = _pRowSet;
>     return ORowSetCacheIterator(m_aCacheIterators.insert(m_aCacheIterators.begin(),ORowSetCacheMap::value_type(m_aCacheIterators.size()+1,aHelper)),this,_pRowSet);
> }
>-// -----------------------------------------------------------------------------
> void ORowSetCache::deleteIterator(const ORowSetBase* _pRowSet)
> {
>     ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin();
>@@ -1393,7 +1350,6 @@ void ORowSetCache::deleteIterator(const ORowSetBase* _pRowSet)
>             ++aCacheIter;
>     }
> }
>-// -----------------------------------------------------------------------------
> void ORowSetCache::rotateCacheIterator(ORowSetMatrix::difference_type _nDist)
> {
>     if(_nDist)
>@@ -1422,7 +1378,6 @@ void ORowSetCache::rotateCacheIterator(ORowSetMatrix::difference_type _nDist)
>         }
>     }
> }
>-// -------------------------------------------------------------------------
> void ORowSetCache::setUpdateIterator(const ORowSetMatrix::iterator& _rOriginalRow)
> {
>     m_aInsertRow = m_pInsertMatrix->begin();
>@@ -1436,7 +1391,6 @@ void ORowSetCache::setUpdateIterator(const ORowSetMatrix::iterator& _rOriginalRo
>     for(;aIter != aEnd;++aIter)
>         aIter->setModified(sal_False);
> }
>-// -----------------------------------------------------------------------------
> void ORowSetCache::checkPositionFlags()
> {
>     if(m_bRowCountFinal)
>@@ -1446,13 +1400,11 @@ void ORowSetCache::checkPositionFlags()
>             m_nPosition = 0;//m_nRowCount;
>     }
> }
>-// -----------------------------------------------------------------------------
> void ORowSetCache::checkUpdateConditions(sal_Int32 columnIndex)
> {
>     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->get().size())
>         throwFunctionSequenceException(m_xSet.get());
> }
>-//------------------------------------------------------------------------------
> sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,const Reference< XConnection>& _xConnection,const ::rtl::OUString& _sUpdateTableName)
> {
>     sal_Bool bOk = sal_False;
>@@ -1491,7 +1443,6 @@ sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode
>     }
>     return bOk;
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection,
>                                  const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer,
>                                  const ::rtl::OUString& _sUpdateTableName )
>@@ -1551,7 +1502,6 @@ sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection,
>     }
>     return bOk;
> }
>-// -----------------------------------------------------------------------------
> void ORowSetCache::clearInsertRow()
> {
>     // we don't unbound the bookmark column
>@@ -1567,14 +1517,12 @@ void ORowSetCache::clearInsertRow()
>         } // for(;aIter != (*m_aInsertRow)->end();++aIter)
>     }
> }
>-// -----------------------------------------------------------------------------
> ORowSetMatrix::iterator	ORowSetCache::calcPosition() const
> {
>     sal_Int32 nValue = (m_nPosition - m_nStartPos) - 1;
>     CHECK_MATRIX_POS(nValue);
>     return ( nValue < 0 || nValue >= static_cast<sal_Int32>(m_pMatrix->size()) ) ? m_pMatrix->end() : (m_pMatrix->begin() + nValue);
> }
>-// -----------------------------------------------------------------------------
> 
> TORowSetOldRowHelperRef ORowSetCache::registerOldRow()
> {
>@@ -1582,7 +1530,6 @@ TORowSetOldRowHelperRef ORowSetCache::registerOldRow()
>     m_aOldRows.push_back(pRef);
>     return pRef;
> }
>-// -----------------------------------------------------------------------------
> void ORowSetCache::deregisterOldRow(const TORowSetOldRowHelperRef& _rRow)
> {
>     TOldRowSetRows::iterator aOldRowEnd = m_aOldRows.end();
>@@ -1596,7 +1543,6 @@ void ORowSetCache::deregisterOldRow(const TORowSetOldRowHelperRef& _rRow)
> 
>     }
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSetCache::reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPos)
> {
>     TOldRowSetRows::iterator aOldRowEnd = m_aOldRows.end();
>@@ -1611,7 +1557,6 @@ sal_Bool ORowSetCache::reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPo
>     rotateCacheIterator(static_cast<sal_Int16>(m_nFetchSize+1)); // forces that every iterator will be set to null
>     return bRet;
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSetCache::fill(ORowSetMatrix::iterator& _aIter,const ORowSetMatrix::iterator& _aEnd,sal_Int32& _nPos,sal_Bool _bCheck)
> {
>     sal_Int32 nColumnCount = m_xMetaData->getColumnCount();
>@@ -1633,12 +1578,10 @@ sal_Bool ORowSetCache::fill(ORowSetMatrix::iterator& _aIter,const ORowSetMatrix:
>     }
>     return _bCheck;
> }
>-// -----------------------------------------------------------------------------
> bool ORowSetCache::isResultSetChanged() const
> {
>     return m_pCacheSet->isResultSetChanged();
> }
>-// -----------------------------------------------------------------------------
> void ORowSetCache::reset(const Reference< XResultSet>& _xDriverSet)
> {
>     m_xMetaData.set(Reference< XResultSetMetaDataSupplier >(_xDriverSet,UNO_QUERY)->getMetaData());
>@@ -1648,7 +1591,6 @@ void ORowSetCache::reset(const Reference< XResultSet>& _xDriverSet)
>     m_nRowCount = 0;
>     reFillMatrix(m_nStartPos+1,m_nEndPos+1);
> }
>-// -----------------------------------------------------------------------------
> void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_aRow
>                                            ,::std::vector<sal_Int32>& o_ChangedColumns)
> {
>@@ -1669,4 +1611,3 @@ void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
>diff --git a/dbaccess/source/core/api/RowSetCacheIterator.cxx b/dbaccess/source/core/api/RowSetCacheIterator.cxx
>index 9f1137d..cbfe27b 100644
>--- a/dbaccess/source/core/api/RowSetCacheIterator.cxx
>+++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx
>@@ -40,12 +40,10 @@ ORowSetCacheIterator::ORowSetCacheIterator(const ORowSetCacheIterator& _rRH)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::ORowSetCacheIterator" );
> }
>-// -----------------------------------------------------------------------------
> ORowSetCacheIterator::operator ORowSetMatrix::iterator()
> {
>     return m_aIter->second.aIterator;
> }
>-// -----------------------------------------------------------------------------
> ORowSetCacheIterator& ORowSetCacheIterator::operator =(const ORowSetCacheIterator& _rRH)
> {
>     if(this == &_rRH)
>@@ -57,18 +55,15 @@ ORowSetCacheIterator& ORowSetCacheIterator::operator =(const ORowSetCacheIterato
> 
>     return *this;
> }
>-// -----------------------------------------------------------------------------
> ORowSetCacheIterator& ORowSetCacheIterator::operator =(const ORowSetMatrix::iterator& _rIter)
> {
>     m_aIter->second.aIterator = _rIter;
>     return *this;
> }
>-// -----------------------------------------------------------------------------
> ORowSetRow& ORowSetCacheIterator::operator *()
> {
>     return *m_aIter->second.aIterator;
> }
>-// -----------------------------------------------------------------------------
> const ORowSetRow& ORowSetCacheIterator::operator *() const
> {
>     if ( !m_pRowSet->isInsertRow() && m_aIter->second.aIterator == m_pCache->m_pMatrix->end() )
>@@ -79,12 +74,10 @@ const ORowSetRow& ORowSetCacheIterator::operator *() const
>     }
>     return *m_aIter->second.aIterator;
> }
>-// -----------------------------------------------------------------------------
> ORowSetMatrix::iterator& ORowSetCacheIterator::operator ->()
> {
>     return m_aIter->second.aIterator;
> }
>-// -----------------------------------------------------------------------------
> const ORowSetMatrix::iterator& ORowSetCacheIterator::operator ->() const
> {
>     if ( !m_pRowSet->isInsertRow() && m_aIter->second.aIterator == m_pCache->m_pMatrix->end() )
>@@ -95,33 +88,27 @@ const ORowSetMatrix::iterator& ORowSetCacheIterator::operator ->() const
>     }
>     return m_aIter->second.aIterator;
> }
>-// -----------------------------------------------------------------------------
> bool ORowSetCacheIterator::operator <=(const ORowSetMatrix::iterator& _rRH) const
> {
>     return m_aIter->second.aIterator <= _rRH;
> }
>-// -----------------------------------------------------------------------------
> bool ORowSetCacheIterator::operator <(const ORowSetMatrix::iterator& _rRH) const
> {
>     return m_aIter->second.aIterator < _rRH;
> }
>-// -----------------------------------------------------------------------------
> bool ORowSetCacheIterator::operator !=(const ORowSetMatrix::iterator& _rRH) const
> {
>     return m_aIter->second.aIterator != _rRH;
> }
>-// -----------------------------------------------------------------------------
> bool ORowSetCacheIterator::operator ==(const ORowSetMatrix::iterator& _rRH) const
> {
>     return m_aIter->second.aIterator == _rRH;
> }
>-// -----------------------------------------------------------------------------
> void ORowSetCacheIterator::setBookmark(const ::com::sun::star::uno::Any&	_rBookmark)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::setBookmark" );
>     m_aIter->second.aBookmark = _rBookmark;
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ORowSetCacheIterator::isNull() const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::isNull" );
>@@ -138,7 +125,6 @@ sal_Bool ORowSetCacheIterator::isNull() const
>     }
>     return  bRet;
> }
>-// -----------------------------------------------------------------------------
> ::osl::Mutex* ORowSetCacheIterator::getMutex() const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::getMutex" );
>diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
>index eea07de..00090cb 100644
>--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
>+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
>@@ -103,7 +103,6 @@ namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode;
> #define R_BRACKET		::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))
> #define COMMA			::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","))
> 
>-// -------------------------------------------------------------------------
> namespace
> {
>     // .....................................................................
>@@ -240,7 +239,6 @@ namespace
> }
> 
> DBG_NAME(OSingleSelectQueryComposer)
>-// -------------------------------------------------------------------------
> OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAccess>& _rxTables,
>                                const Reference< XConnection>& _xConnection,
>                                const ::comphelper::ComponentContext& _rContext )
>@@ -291,7 +289,6 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc
>     {
>     }
> }
>-// -------------------------------------------------------------------------
> OSingleSelectQueryComposer::~OSingleSelectQueryComposer()
> {
>     DBG_DTOR(OSingleSelectQueryComposer,NULL);
>@@ -305,7 +302,6 @@ OSingleSelectQueryComposer::~OSingleSelectQueryComposer()
>     for(;aTabIter != aTabEnd;++aTabIter)
>         delete *aTabIter;
> }
>-// -------------------------------------------------------------------------
> // OComponentHelper
> void SAL_CALL OSingleSelectQueryComposer::disposing(void)
> {
>@@ -327,7 +323,6 @@ IMPLEMENT_SERVICE_INFO1(OSingleSelectQueryComposer,"org.openoffice.comp.dba.OSin
> IMPLEMENT_TYPEPROVIDER3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
> IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OSingleSelectQueryComposer)
> 
>-// -------------------------------------------------------------------------
> // com::sun::star::lang::XUnoTunnel
> sal_Int64 SAL_CALL OSingleSelectQueryComposer::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
> {
>@@ -338,7 +333,6 @@ sal_Int64 SAL_CALL OSingleSelectQueryComposer::getSomething( const Sequence< sal
>     return sal_Int64(0);
> }
> 
>-// -------------------------------------------------------------------------
> // XSingleSelectQueryAnalyzer
> ::rtl::OUString SAL_CALL OSingleSelectQueryComposer::getQuery(  ) throw(RuntimeException)
> {
>@@ -350,7 +344,6 @@ sal_Int64 SAL_CALL OSingleSelectQueryComposer::getSomething( const Sequence< sal
>     return getStatementPart(F_tmp,m_aSqlIterator);
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::setQuery( const ::rtl::OUString& command ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", "OSingleSelectQueryComposer::setQuery" );
>@@ -371,7 +364,6 @@ void SAL_CALL OSingleSelectQueryComposer::setQuery( const ::rtl::OUString& comma
>     for ( SQLPart eLoopParts = Where; eLoopParts != SQLPartCount; incSQLPart( eLoopParts ) )
>         m_aElementaryParts[ eLoopParts ] = ::rtl::OUString();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::setCommand( const ::rtl::OUString& Command,sal_Int32 _nCommandType ) throw(SQLException, RuntimeException)
> {   
>     ::rtl::OUStringBuffer sSQL;
>@@ -449,7 +441,6 @@ void SAL_CALL OSingleSelectQueryComposer::setCommand( const ::rtl::OUString& Com
>         m_aElementaryParts[ eLoopParts ] = ::rtl::OUString();
> */
> }
>-// -----------------------------------------------------------------------------
> void OSingleSelectQueryComposer::setQuery_Impl( const ::rtl::OUString& command )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", "OSingleSelectQueryComposer::setQuery_Impl" );
>@@ -465,35 +456,30 @@ void OSingleSelectQueryComposer::setQuery_Impl( const ::rtl::OUString& command )
> //	getColumns();
>     getTables();
> }
>-// -----------------------------------------------------------------------------
> Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredHavingClause(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getStructuredHavingClause" );
>     TGetParseNode F_tmp(&OSQLParseTreeIterator::getSimpleHavingTree);
>     return getStructuredCondition(F_tmp);
> }
>-// -------------------------------------------------------------------------
> Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredFilter(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getStructuredFilter" );
>     TGetParseNode F_tmp(&OSQLParseTreeIterator::getSimpleWhereTree);
>     return getStructuredCondition(F_tmp);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::appendHavingClauseByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::appendHavingClauseByColumn" );
>     ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,::rtl::OUString> F_tmp(&OSingleSelectQueryComposer::implSetHavingClause);
>     setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::appendFilterByColumn" );
>     ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,::rtl::OUString> F_tmp(&OSingleSelectQueryComposer::implSetFilter);
>     setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OSingleSelectQueryComposer::impl_getColumnName_throw(const Reference< XPropertySet >& column)
> {
>     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
>@@ -563,7 +549,6 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference<
>         aNewName = getTableAlias(column) + ::dbtools::quoteName(aQuote,aName);
>     return aNewName;
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::appendOrderByColumn" );
>@@ -579,7 +564,6 @@ void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference<
>     setOrder(sOrder);
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference< XPropertySet >& column) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::appendGroupByColumn" );
>@@ -590,7 +574,6 @@ void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference<
>     aComposer.append( sColumnName );
>     setGroup( aComposer.getComposedAndClear() );
> }
>-// -------------------------------------------------------------------------
> ::rtl::OUString OSingleSelectQueryComposer::composeStatementFromParts( const ::std::vector< ::rtl::OUString >& _rParts )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::composeStatementFromParts" );
>@@ -607,14 +590,12 @@ void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference<
>     return aSql.makeStringAndClear();
> }
> 
>-// -------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OSingleSelectQueryComposer::getElementaryQuery() throw (::com::sun::star::uno::RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getElementaryQuery" );
>     return composeStatementFromParts( m_aElementaryParts );
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const ::rtl::OUString& _rElementary ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", "OSingleSelectQueryComposer::setElementaryQuery" );
>@@ -649,7 +630,6 @@ void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const ::rtl::OUStr
>     }
> }
> 
>-// -------------------------------------------------------------------------
> namespace
> {
>     ::rtl::OUString getComposedClause( const ::rtl::OUString _rElementaryClause, const ::rtl::OUString _rAdditionalClause,
>@@ -665,7 +645,6 @@ namespace
>     }
> }
> 
>-// -------------------------------------------------------------------------
> void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const ::rtl::OUString& _rClause )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setSingleAdditiveClause" );
>@@ -729,33 +708,28 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const
>     }
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::setFilter( const ::rtl::OUString& filter ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setFilter" );
>     setSingleAdditiveClause( Where, filter );
> }
> 
>-// -------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::setOrder( const ::rtl::OUString& order ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setOrder" );
>     setSingleAdditiveClause( Order, order );
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::setGroup( const ::rtl::OUString& group ) throw (SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setGroup" );
>     setSingleAdditiveClause( Group, group );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::setHavingClause( const ::rtl::OUString& filter ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setHavingClause" );
>     setSingleAdditiveClause( Having, filter );
> }
> 
>-// -------------------------------------------------------------------------
> // XTablesSupplier
> Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables(  ) throw(RuntimeException)
> {
>@@ -776,7 +750,6 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables(  ) thro
> 
>     return m_pTables;
> }
>-// -------------------------------------------------------------------------
> // XColumnsSupplier
> Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  ) throw(RuntimeException)
> {
>@@ -993,7 +966,6 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  ) thr
> 
>     return m_aCurrentColumns[SelectColumns];
> }
>-// -------------------------------------------------------------------------
> sal_Bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OSQLParseTreeIterator& _rIterator,
>                                     ::std::vector< ::std::vector < PropertyValue > >& rFilters, const Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter) const
> {
>@@ -1032,7 +1004,6 @@ sal_Bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OS
>     }
> }
> 
>-//--------------------------------------------------------------------------------------------------
> sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
>     OSQLParseTreeIterator& _rIterator, ::std::vector < PropertyValue >& rFilter, const Reference< XNumberFormatter > & xFormatter) const
> {
>@@ -1123,7 +1094,6 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
> 
>     return sal_True;
> }
>-// -----------------------------------------------------------------------------
> sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredicate) const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getPredicateType" );
>@@ -1153,7 +1123,6 @@ sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredica
>     }
>     return nPredicate;
> }
>-//------------------------------------------------------------------------------
> sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCondition, OSQLParseTreeIterator& _rIterator,
>                                             ::std::vector < PropertyValue >& rFilter, const Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter) const
> {
>@@ -1281,7 +1250,6 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
>     return sal_True;
> }
> // functions for analysing SQL
>-//--------------------------------------------------------------------------------------------------
> ::rtl::OUString OSingleSelectQueryComposer::getColumnName( ::connectivity::OSQLParseNode* pColumnRef, OSQLParseTreeIterator& _rIterator ) const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getColumnName" );
>@@ -1289,7 +1257,6 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
>     _rIterator.getColumnRange(pColumnRef,aColumnName,aTableRange);
>     return aColumnName;
> }
>-//------------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OSingleSelectQueryComposer::getFilter(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getFilter" );
>@@ -1297,7 +1264,6 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
>     ::osl::MutexGuard aGuard( m_aMutex );
>     return getSQLPart(Where,m_aAdditiveIterator,sal_False);
> }
>-// -------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OSingleSelectQueryComposer::getOrder(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getOrder" );
>@@ -1305,7 +1271,6 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
>     ::osl::MutexGuard aGuard( m_aMutex );
>     return getSQLPart(Order,m_aAdditiveIterator,sal_False);
> }
>-// -------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OSingleSelectQueryComposer::getGroup(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getGroup" );
>@@ -1313,7 +1278,6 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
>     ::osl::MutexGuard aGuard( m_aMutex );
>     return getSQLPart(Group,m_aAdditiveIterator,sal_False);
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OSingleSelectQueryComposer::getHavingClause() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getHavingClause" );
>@@ -1321,7 +1285,6 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
>     ::osl::MutexGuard aGuard( m_aMutex );
>     return getSQLPart(Having,m_aAdditiveIterator,sal_False);
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OSingleSelectQueryComposer::getTableAlias(const Reference< XPropertySet >& column) const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getTableAlias" );
>@@ -1396,7 +1359,6 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
>     }
>     return sReturn;
> }
>-// -----------------------------------------------------------------------------
> Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getParameters" );
>@@ -1413,7 +1375,6 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters(  )
> 
>     return m_aCurrentColumns[ParameterColumns];
> }
>-// -----------------------------------------------------------------------------
> void OSingleSelectQueryComposer::clearColumns( const EColumnType _eType )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::clearColumns" );
>@@ -1425,7 +1386,6 @@ void OSingleSelectQueryComposer::clearColumns( const EColumnType _eType )
>         m_aCurrentColumns[ _eType ] = NULL;
>     }
> }
>-// -----------------------------------------------------------------------------
> void OSingleSelectQueryComposer::clearCurrentCollections()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::clearCurrentCollections" );
>@@ -1448,7 +1408,6 @@ void OSingleSelectQueryComposer::clearCurrentCollections()
>         m_pTables = NULL;
>     }
> }
>-// -----------------------------------------------------------------------------
> Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumnType _eType,
>     const ::vos::ORef< OSQLColumns >& _rCols )
> {
>@@ -1468,19 +1427,16 @@ Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumn
> 
>     return m_aCurrentColumns[_eType];
> }
>-// -----------------------------------------------------------------------------
> Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getGroupColumns(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getGroupColumns" );
>     return setCurrentColumns( GroupByColumns, m_aAdditiveIterator.getGroupColumns() );
> }
>-// -------------------------------------------------------------------------
> Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getOrderColumns(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getOrderColumns" );
>     return setCurrentColumns( OrderColumns, m_aAdditiveIterator.getOrderColumns() );
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OSingleSelectQueryComposer::getQueryWithSubstitution(  ) throw (SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getQueryWithSubstitution" );
>@@ -1499,7 +1455,6 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getOrderColumns(
> 
>     return sSqlStatement;
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OSingleSelectQueryComposer::getStatementPart( TGetParseNode& _aGetFunctor, OSQLParseTreeIterator& _rIterator )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getStatementPart" );
>@@ -1511,7 +1466,6 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getOrderColumns(
> 
>     return sResult;
> }
>-// -----------------------------------------------------------------------------
> namespace
> {
>     ::rtl::OUString lcl_getCondition(const Sequence< Sequence< PropertyValue > >& filter )
>@@ -1545,19 +1499,16 @@ namespace
>         return sRet.makeStringAndClear();
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::setStructuredFilter( const Sequence< Sequence< PropertyValue > >& filter ) throw (SQLException, ::com::sun::star::lang::IllegalArgumentException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setStructuredFilter" );
>     setFilter(lcl_getCondition(filter));
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const Sequence< Sequence< PropertyValue > >& filter ) throw (SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setStructuredHavingClause" );
>     setHavingClause(lcl_getCondition(filter));
> }
>-// -----------------------------------------------------------------------------
> void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,::rtl::OUString>& _aSetFunctor,sal_Int32 filterOperator)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setConditionByColumn" );
>@@ -1728,7 +1679,6 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
>     // add the filter and the sort order
>     _aSetFunctor(this,sFilter);
> }
>-// -----------------------------------------------------------------------------
> Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredCondition( TGetParseNode& _aGetFunctor )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getStructuredCondition" );
>@@ -1817,7 +1767,6 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
>     }
>     return aFilterSeq;
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OSingleSelectQueryComposer::getKeyword( SQLPart _ePart ) const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getKeyword" );
>@@ -1843,7 +1792,6 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
>     return sKeyword;
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OSingleSelectQueryComposer::getSQLPart( SQLPart _ePart, OSQLParseTreeIterator& _rIterator, sal_Bool _bWithKeyword )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getSQLPart" );
>@@ -1872,4 +1820,3 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
>         sRet = sKeyword + sRet;
>     return sRet;
> }
>-// -----------------------------------------------------------------------------
>diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
>index 936ac2e..7923f4b 100644
>--- a/dbaccess/source/core/api/StaticSet.cxx
>+++ b/dbaccess/source/core/api/StaticSet.cxx
>@@ -51,34 +51,29 @@ using namespace ::com::sun::star::lang;
> //	using namespace ::cppu;
> using namespace ::osl;
> 
>-// -------------------------------------------------------------------------
> void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::fillValueRow" );
>     _rRow = *m_aSetIter;
> }
>-// -------------------------------------------------------------------------
> // ::com::sun::star::sdbcx::XRowLocate
> Any SAL_CALL OStaticSet::getBookmark() throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::getBookmark" );
>     return makeAny(getRow());
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::moveToBookmark" );
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
>     return absolute(::comphelper::getINT32(bookmark));
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::moveRelativeToBookmark" );
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
>     return absolute(::comphelper::getINT32(bookmark)+rows);
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::compareBookmarks" );
>@@ -87,19 +82,16 @@ sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _
>     _second >>= nSecond;
>     return (nFirst < nSecond) ? CompareBookmark::LESS : ((nFirst > nSecond) ? CompareBookmark::GREATER : CompareBookmark::EQUAL);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::hasOrderedBookmarks" );
>     return sal_True;
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL OStaticSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::hashBookmark" );
>     return ::comphelper::getINT32(bookmark);
> }
>-// -------------------------------------------------------------------------
> sal_Bool OStaticSet::fetchRow()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::fetchRow" );
>@@ -117,7 +109,6 @@ sal_Bool OStaticSet::fetchRow()
>         m_bEnd = sal_True;
>     return bRet;
> }
>-// -------------------------------------------------------------------------
> void OStaticSet::fillAllRows()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::fillAllRows" );
>@@ -134,7 +125,6 @@ void OStaticSet::fillAllRows()
>         m_bEnd = sal_True;
>     }
> }
>-// -------------------------------------------------------------------------
> // XResultSet
> sal_Bool SAL_CALL OStaticSet::next(  ) throw(SQLException, RuntimeException)
> {
>@@ -153,38 +143,32 @@ sal_Bool SAL_CALL OStaticSet::next(  ) throw(SQLException, RuntimeException)
>         ++m_aSetIter;
>     return !isAfterLast();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::isBeforeFirst" );
>     return m_aSetIter == m_aSet.begin();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::isAfterLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::isAfterLast" );
>     return m_aSetIter == m_aSet.end() && m_bEnd;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::isFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::isFirst" );
>     return m_aSetIter == m_aSet.begin()+1;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::isLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::isLast" );
>     return m_aSetIter == m_aSet.end()-1 && m_bEnd;
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OStaticSet::beforeFirst(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::beforeFirst" );
>     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
>     m_aSetIter = m_aSet.begin();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OStaticSet::afterLast(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::afterLast" );
>@@ -192,7 +176,6 @@ void SAL_CALL OStaticSet::afterLast(  ) throw(SQLException, RuntimeException)
>     fillAllRows();
>     m_aSetIter = m_aSet.end();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::first(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::first" );
>@@ -203,7 +186,6 @@ sal_Bool SAL_CALL OStaticSet::first(  ) throw(SQLException, RuntimeException)
> 
>     return m_aSetIter != m_aSet.end();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::last(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::last" );
>@@ -213,7 +195,6 @@ sal_Bool SAL_CALL OStaticSet::last(  ) throw(SQLException, RuntimeException)
>     
>     return !isBeforeFirst() && !isAfterLast();
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL OStaticSet::getRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::getRow" );
>@@ -224,7 +205,6 @@ sal_Int32 SAL_CALL OStaticSet::getRow(  ) throw(SQLException, RuntimeException)
>     OSL_ENSURE(nPos > 0,"RowPos is < 0");
>     return nPos;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::absolute" );
>@@ -265,7 +245,6 @@ sal_Bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, Runt
> 
>     return m_aSetIter != m_aSet.end() && m_aSetIter != m_aSet.begin();
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::relative" );
>@@ -275,7 +254,6 @@ sal_Bool SAL_CALL OStaticSet::relative( sal_Int32 rows ) throw(SQLException, Run
>     sal_Int32 nCurPos = getRow();
>     return absolute(nCurPos+rows);
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::previous(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::previous" );
>@@ -286,30 +264,25 @@ sal_Bool SAL_CALL OStaticSet::previous(  ) throw(SQLException, RuntimeException)
> 
>     return m_aSetIter != m_aSet.begin();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OStaticSet::refreshRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::refreshRow" );
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::rowUpdated(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::rowUpdated" );
>     return m_bUpdated;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::rowInserted(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::rowInserted" );
>     return m_bInserted;
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL OStaticSet::rowDeleted(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::rowDeleted" );
>     return m_bDeleted;
> }
>-// -------------------------------------------------------------------------
> Sequence< sal_Int32 > SAL_CALL OStaticSet::deleteRows( const Sequence< Any >& rows,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::deleteRows" );
>@@ -323,7 +296,6 @@ Sequence< sal_Int32 > SAL_CALL OStaticSet::deleteRows( const Sequence< Any >& ro
>     }
>     return aRet;
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::insertRow" );
>@@ -336,13 +308,11 @@ void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connect
>         m_bEnd = sal_False;
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OStaticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::updateRow" );
>     OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable);
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::deleteRow" );
>@@ -355,20 +325,16 @@ void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connect
>         m_aSet.erase(aPos);
>     }
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OStaticSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::cancelRowUpdates" );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OStaticSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::moveToInsertRow" );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OStaticSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::moveToCurrentRow" );
> }
>-// -------------------------------------------------------------------------
> 
>diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
>index 9160046..1a05614 100644
>--- a/dbaccess/source/core/api/TableDeco.cxx
>+++ b/dbaccess/source/core/api/TableDeco.cxx
>@@ -70,7 +70,6 @@ using namespace ::cppu;
> //= ODBTableDecorator
> //==========================================================================
> DBG_NAME(ODBTableDecorator)
>-// -----------------------------------------------------------------------------
> ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnection, const Reference< XColumnsSupplier >& _rxNewTable,
>         const Reference< XNumberFormatsSupplier >& _rxNumberFormats, const Reference< XNameAccess >& _xColumnDefinitions ) throw(SQLException)
>     :OTableDescriptor_BASE(m_aMutex)
>@@ -87,7 +86,6 @@ ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnect
>     DBG_CTOR(ODBTableDecorator, NULL);
>     ODataSettings::registerPropertiesFor(this);
> }
>-// -------------------------------------------------------------------------
> ODBTableDecorator::~ODBTableDecorator()
> {
>     DBG_DTOR(ODBTableDecorator, NULL);
>@@ -95,7 +93,6 @@ ODBTableDecorator::~ODBTableDecorator()
>         delete m_pColumns;
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< sal_Int8 > ODBTableDecorator::getImplementationId() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getImplementationId" );
>@@ -113,7 +110,6 @@ Sequence< sal_Int8 > ODBTableDecorator::getImplementationId() throw (RuntimeExce
> }
> 
> // OComponentHelper
>-//------------------------------------------------------------------------------
> void SAL_CALL ODBTableDecorator::disposing()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::disposing" );
>@@ -130,7 +126,6 @@ void SAL_CALL ODBTableDecorator::disposing()
>         m_pColumns->disposing();
>     m_xColumnMediator = NULL;
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue(
>                             Any & rConvertedValue,
>                             Any & rOldValue,
>@@ -181,7 +176,6 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue(
>     }
>     return bRet;
> }
>-// -----------------------------------------------------------------------------
> void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::setFastPropertyValue_NoBroadcast" );
>@@ -249,7 +243,6 @@ void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, con
>             break;
>     }
> }
>-//------------------------------------------------------------------------------
> void ODBTableDecorator::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getFastPropertyValue" );
>@@ -330,7 +323,6 @@ void ODBTableDecorator::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) c
>             OSL_ENSURE(0,"Invalid Handle for table");
>     }
> }
>-// -------------------------------------------------------------------------
> void ODBTableDecorator::construct()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::construct" );
>@@ -345,7 +337,6 @@ void ODBTableDecorator::construct()
>         registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, PropertyAttribute::BOUND  | PropertyAttribute::READONLY,
>                         &m_nPrivileges, ::getCppuType(static_cast<sal_Int32*>(NULL)));
> }
>-// -----------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* ODBTableDecorator::createArrayHelper(sal_Int32 /*_nId*/) const
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::createArrayHelper" );
>@@ -375,7 +366,6 @@ void ODBTableDecorator::construct()
>     
>     return new ::cppu::OPropertyArrayHelper(aTableProps);			
> }
>-// -----------------------------------------------------------------------------																
> ::cppu::IPropertyArrayHelper & SAL_CALL ODBTableDecorator::getInfoHelper() 
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getInfoHelper" );
>@@ -394,10 +384,8 @@ void ODBTableDecorator::construct()
>     // property set infos: Depending on the table for which we act as decorator, different property
>     // sets might exist.
> }
>-// -------------------------------------------------------------------------
> // XServiceInfo
> IMPLEMENT_SERVICE_INFO1(ODBTableDecorator, "com.sun.star.sdb.dbaccess.ODBTableDecorator", SERVICE_SDBCX_TABLE)
>-// -------------------------------------------------------------------------
> Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) throw(RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::queryInterface" );
>@@ -415,7 +403,6 @@ Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) throw(Runti
> 
>     return aRet;
> }
>-// -------------------------------------------------------------------------
> Sequence< Type > SAL_CALL ODBTableDecorator::getTypes(  ) throw(RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getTypes" );
>@@ -424,9 +411,7 @@ Sequence< Type > SAL_CALL ODBTableDecorator::getTypes(  ) throw(RuntimeException
>     return xTypes->getTypes();
> }
> 
>-// -----------------------------------------------------------------------------
> // XRename,
>-//------------------------------------------------------------------------------
> void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::rename" );
>@@ -445,7 +430,6 @@ void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) thro
> }
> 
> // XAlterTable,
>-//------------------------------------------------------------------------------
> void SAL_CALL ODBTableDecorator::alterColumnByName( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::alterColumnByName" );
>@@ -462,7 +446,6 @@ void SAL_CALL ODBTableDecorator::alterColumnByName( const ::rtl::OUString& _rNam
>         m_pColumns->refresh();
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, IndexOutOfBoundsException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::alterColumnByIndex" );
>@@ -478,7 +461,6 @@ void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Re
>     else // not supported
>         throw SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_ALTER_BY_INDEX),*this,SQLSTATE_GENERAL,1000,Any() );
> }
>-// -----------------------------------------------------------------------------
> Reference< XNameAccess> ODBTableDecorator::getIndexes() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getIndexes" );
>@@ -486,7 +468,6 @@ Reference< XNameAccess> ODBTableDecorator::getIndexes() throw (RuntimeException)
>     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
>     return Reference< XIndexesSupplier>(m_xTable,UNO_QUERY)->getIndexes();
> }
>-// -------------------------------------------------------------------------
> Reference< XIndexAccess> ODBTableDecorator::getKeys() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getKeys" );
>@@ -494,7 +475,6 @@ Reference< XIndexAccess> ODBTableDecorator::getKeys() throw (RuntimeException)
>     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
>     return Reference< XKeysSupplier>(m_xTable,UNO_QUERY)->getKeys();
> }
>-// -------------------------------------------------------------------------
> Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getColumns" );
>@@ -506,7 +486,6 @@ Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException)
> 
>     return m_pColumns;
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getName" );
>@@ -516,7 +495,6 @@ Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException)
>     OSL_ENSURE(xName.is(),"Table should support the XNamed interface");
>     return xName->getName();
> }
>-// -----------------------------------------------------------------------------
> sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getSomething" );
>@@ -529,7 +507,6 @@ sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >&
>         nRet = xTunnel->getSomething(rId);
>     return nRet;
> }
>-// -----------------------------------------------------------------------------
> Sequence< sal_Int8 > ODBTableDecorator::getUnoTunnelImplementationId()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getUnoTunnelImplementationId" );
>@@ -545,7 +522,6 @@ Sequence< sal_Int8 > ODBTableDecorator::getUnoTunnelImplementationId()
>     }
>     return pId->getImplementationId();
> }
>-// -----------------------------------------------------------------------------
> void ODBTableDecorator::fillPrivileges() const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::fillPrivileges" );
>@@ -576,7 +552,6 @@ void ODBTableDecorator::fillPrivileges() const
>         DBG_ERROR("ODBTableDecorator::ODBTableDecorator : could not collect the privileges !");
>     }
> }
>-// -----------------------------------------------------------------------------
> Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::createDataDescriptor" );
>@@ -596,13 +571,11 @@ Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor(  ) t
>         NULL
>     );
> }
>-// -----------------------------------------------------------------------------
> Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODBTableDecorator::getPropertySetInfo(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getPropertySetInfo" );
>     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
> }
>-// -----------------------------------------------------------------------------
> void ODBTableDecorator::refreshColumns()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::refreshColumns" );
>@@ -640,7 +613,6 @@ void ODBTableDecorator::refreshColumns()
>     else
>         m_pColumns->reFill(aVector);
> }
>-// -----------------------------------------------------------------------------
> OColumn* ODBTableDecorator::createColumn(const ::rtl::OUString& _rName) const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::createColumn" );
>@@ -664,13 +636,11 @@ OColumn* ODBTableDecorator::createColumn(const ::rtl::OUString& _rName) const
>     }
>     return pReturn;
> }
>-// -----------------------------------------------------------------------------
> void ODBTableDecorator::columnAppended( const Reference< XPropertySet >& /*_rxSourceDescriptor*/ )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::columnAppended" );
>     // not interested in
> }
>-// -----------------------------------------------------------------------------
> void ODBTableDecorator::columnDropped(const ::rtl::OUString& _sName)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::columnDropped" );
>@@ -679,7 +649,6 @@ void ODBTableDecorator::columnDropped(const ::rtl::OUString& _sName)
>         xDrop->dropByName(_sName);
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XPropertySet > ODBTableDecorator::createColumnDescriptor()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::createColumnDescriptor" );
>@@ -691,24 +660,18 @@ Reference< XPropertySet > ODBTableDecorator::createColumnDescriptor()
>         xRet = new OTableColumnDescriptorWrapper( xNames->createDataDescriptor(), false, true );
>     return xRet;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODBTableDecorator::acquire() throw()
> {
>     OTableDescriptor_BASE::acquire();
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODBTableDecorator::release() throw()
> {
>     OTableDescriptor_BASE::release();
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODBTableDecorator::setName( const ::rtl::OUString& /*aName*/ ) throw (::com::sun::star::uno::RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::setName" );
>     throwFunctionNotSupportedException( "XNamed::setName", *this );
> }
> 
>-// -----------------------------------------------------------------------------
>-
>-
>diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx
>index 3644c4f..bef7fdc 100644
>--- a/dbaccess/source/core/api/View.cxx
>+++ b/dbaccess/source/core/api/View.cxx
>@@ -78,7 +78,6 @@ namespace dbaccess
>     //====================================================================
>     //= 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 )
>@@ -96,15 +95,12 @@ namespace dbaccess
>         }
>     }
> 
>-    //--------------------------------------------------------------------
>     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_xViewAccess.is() )
>@@ -114,7 +110,6 @@ namespace dbaccess
>             aReturn = View_IBASE::queryInterface( _rType );
>         return aReturn;
>     }
>-    // -------------------------------------------------------------------------
>     Sequence< Type > SAL_CALL View::getTypes(  ) throw(RuntimeException)
>     {
>         Type aAlterType = getCppuType( (Reference<XAlterView>*)0);
>@@ -135,14 +130,12 @@ namespace dbaccess
>         return Sequence< Type >(pTypes, aOwnTypes.size());
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL View::alterCommand( const ::rtl::OUString& _rNewCommand ) throw (SQLException, RuntimeException)
>     {
>         OSL_ENSURE(m_xViewAccess.is(),"Illegal call to AlterView!");
>         m_xViewAccess->alterCommand(this,_rNewCommand);
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL View::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
>     {
>         if ( _nHandle == m_nCommandHandle && m_xViewAccess.is() )
>@@ -155,7 +148,6 @@ namespace dbaccess
> 
>         View_Base::getFastPropertyValue( _rValue, _nHandle );
>     }
>-    // -----------------------------------------------------------------------------
> //........................................................................
> } // namespace dbaccess
> //........................................................................
>diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
>index 0b9c6b6..d9b8bb2 100644
>--- a/dbaccess/source/core/api/WrappedResultSet.cxx
>+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
>@@ -60,7 +60,6 @@ void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const
>     m_xRowLocate.set(_xDriverSet,UNO_QUERY_THROW);
>     m_xUpdRow.set(_xDriverSet,UNO_QUERY_THROW);
> }
>-// -----------------------------------------------------------------------------
> Any SAL_CALL WrappedResultSet::getBookmark() throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::getBookmark" );
>@@ -70,37 +69,31 @@ Any SAL_CALL WrappedResultSet::getBookmark() throw(SQLException, RuntimeExceptio
>     }
>     return makeAny(m_xDriverSet->getRow());
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL WrappedResultSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::moveToBookmark" );
>     return m_xRowLocate->moveToBookmark( bookmark );
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL WrappedResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::moveRelativeToBookmark" );
>     return m_xRowLocate->moveRelativeToBookmark( bookmark,rows );
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::compareBookmarks" );
>     return m_xRowLocate->compareBookmarks( _first,_second );
> }
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL WrappedResultSet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::hasOrderedBookmarks" );
>     return m_xRowLocate->hasOrderedBookmarks();
> }
>-// -------------------------------------------------------------------------
> sal_Int32 SAL_CALL WrappedResultSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::hashBookmark" );
>     return m_xRowLocate->hashBookmark(bookmark);
> }
>-// -------------------------------------------------------------------------
> // ::com::sun::star::sdbcx::XDeleteRows
> Sequence< sal_Int32 > SAL_CALL WrappedResultSet::deleteRows( const Sequence< Any >& rows ,const connectivity::OSQLTable& /*_xTable*/) throw(SQLException, RuntimeException)
> {
>@@ -112,7 +105,6 @@ Sequence< sal_Int32 > SAL_CALL WrappedResultSet::deleteRows( const Sequence< Any
>     }
>     return Sequence< sal_Int32 >();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::insertRow" );
>@@ -128,7 +120,6 @@ void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const c
>     m_xUpd->insertRow();
>     (*_rInsertRow->get().begin()) = getBookmark();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::updateRow" );
>@@ -142,37 +133,31 @@ void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const O
>     }
>     m_xUpd->updateRow();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::deleteRow" );
>     m_xUpd->deleteRow();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL WrappedResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::cancelRowUpdates" );
>     m_xUpd->cancelRowUpdates();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL WrappedResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::moveToInsertRow" );
>     m_xUpd->moveToInsertRow();
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL WrappedResultSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::moveToCurrentRow" );
>     m_xUpd->moveToCurrentRow();
> }
>-// -------------------------------------------------------------------------
> void WrappedResultSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::fillValueRow" );
>     OCacheSet::fillValueRow(_rRow,_nPosition);
> }
>-// -------------------------------------------------------------------------
> void WrappedResultSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParameter,const ORowSetValue& _rValue)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::updateColumn" );
>diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx
>index b55f25a..b56174d 100644
>--- a/dbaccess/source/core/api/callablestatement.cxx
>+++ b/dbaccess/source/core/api/callablestatement.cxx
>@@ -45,7 +45,6 @@ using namespace ::cppu;
> using namespace ::osl;
> 
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< Type > OCallableStatement::getTypes() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getTypes" );
>@@ -56,7 +55,6 @@ Sequence< Type > OCallableStatement::getTypes() throw (RuntimeException)
>     return aTypes.getTypes();
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< sal_Int8 > OCallableStatement::getImplementationId() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getImplementationId" );
>@@ -74,7 +72,6 @@ Sequence< sal_Int8 > OCallableStatement::getImplementationId() throw (RuntimeExc
> }
> 
> // com::sun::star::uno::XInterface
>-//--------------------------------------------------------------------------
> Any OCallableStatement::queryInterface( const Type & rType ) throw (RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::queryInterface" );
>@@ -87,27 +84,23 @@ Any OCallableStatement::queryInterface( const Type & rType ) throw (RuntimeExcep
>     return aIface;
> }
> 
>-//--------------------------------------------------------------------------
> void OCallableStatement::acquire() throw ()
> {
>     OPreparedStatement::acquire();
> }
> 
>-//--------------------------------------------------------------------------
> void OCallableStatement::release() throw ()
> {
>     OPreparedStatement::release();
> }
> 
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString OCallableStatement::getImplementationName(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getImplementationName" );
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.OCallableStatement");
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OCallableStatement::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getSupportedServiceNames" );
>@@ -118,7 +111,6 @@ Sequence< ::rtl::OUString > OCallableStatement::getSupportedServiceNames(  ) thr
> }
> 
> // XOutParameters
>-//------------------------------------------------------------------------------
> void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::registerOutParameter" );
>@@ -130,7 +122,6 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex
>     Reference< XOutParameters >(m_xAggregateAsSet, UNO_QUERY)->registerOutParameter( parameterIndex, sqlType, typeName );
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::registerNumericOutParameter" );
>@@ -141,7 +132,6 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet
> }
> 
> // XRow
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL OCallableStatement::wasNull(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::wasNull" );
>@@ -151,7 +141,6 @@ sal_Bool SAL_CALL OCallableStatement::wasNull(  ) throw(SQLException, RuntimeExc
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->wasNull();
> }
> 
>-//------------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getString" );
>@@ -161,7 +150,6 @@ sal_Bool SAL_CALL OCallableStatement::wasNull(  ) throw(SQLException, RuntimeExc
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getString( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getBoolean" );
>@@ -171,7 +159,6 @@ sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBoolean( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getByte" );
>@@ -181,7 +168,6 @@ sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQL
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getByte( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getShort" );
>@@ -190,7 +176,6 @@ sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(S
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getShort( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getInt" );
>@@ -199,7 +184,6 @@ sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQL
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getInt( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getLong" );
>@@ -208,7 +192,6 @@ sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQ
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getLong( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getFloat" );
>@@ -217,7 +200,6 @@ float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLEx
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getFloat( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getDouble" );
>@@ -226,7 +208,6 @@ double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQL
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getDouble( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getBytes" );
>@@ -235,7 +216,6 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBytes( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> ::com::sun::star::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getDate" );
>@@ -244,7 +224,6 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getDate( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> ::com::sun::star::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getTime" );
>@@ -253,7 +232,6 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getTime( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> ::com::sun::star::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getTimestamp" );
>@@ -263,7 +241,6 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getTimestamp( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getBinaryStream" );
>@@ -273,7 +250,6 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::get
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBinaryStream( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getCharacterStream" );
>@@ -283,7 +259,6 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::get
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getCharacterStream( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getObject" );
>@@ -293,7 +268,6 @@ Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Referen
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getObject( columnIndex, typeMap );
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getRef" );
>@@ -302,7 +276,6 @@ Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 columnIndex ) t
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getRef( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getBlob" );
>@@ -311,7 +284,6 @@ Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 columnIndex )
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBlob( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getClob" );
>@@ -320,7 +292,6 @@ Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 columnIndex )
>     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getClob( columnIndex );
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getArray" );
>diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
>index 43412bb..c931b63 100644
>--- a/dbaccess/source/core/api/column.cxx
>+++ b/dbaccess/source/core/api/column.cxx
>@@ -77,7 +77,6 @@ DBG_NAME(OColumn)
> //============================================================
> //= OColumn
> //============================================================
>-//--------------------------------------------------------------------------
> OColumn::OColumn( const bool _bNameIsReadOnly )
>         :OColumnBase( m_aMutex )
>         ,::comphelper::OPropertyContainer( OColumnBase::rBHelper )
>@@ -88,14 +87,12 @@ OColumn::OColumn( const bool _bNameIsReadOnly )
>         &m_sName, ::getCppuType( &m_sName ) );
> }
> 
>-//--------------------------------------------------------------------------
> OColumn::~OColumn()
> {
>     DBG_DTOR(OColumn, NULL);
> }
> 
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< Type > OColumn::getTypes() throw (RuntimeException)
> {
>     return ::comphelper::concatSequences(
>@@ -108,19 +105,16 @@ Sequence< Type > OColumn::getTypes() throw (RuntimeException)
> IMPLEMENT_FORWARD_XINTERFACE2( OColumn, OColumnBase, ::comphelper::OPropertyContainer )
> 
> // ::com::sun::star::lang::XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString OColumn::getImplementationName(  ) throw(RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.OColumn");
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OColumn::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OColumn::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSNS( 1 );
>@@ -129,49 +123,41 @@ Sequence< ::rtl::OUString > OColumn::getSupportedServiceNames(  ) throw (Runtime
> }
> 
> // OComponentHelper
>-//------------------------------------------------------------------------------
> void OColumn::disposing()
> {
>     OPropertyContainer::disposing();
> }
> 
> // com::sun::star::beans::XPropertySet
>-//------------------------------------------------------------------------------
> Reference< XPropertySetInfo > OColumn::getPropertySetInfo() throw (RuntimeException)
> {
>     return createPropertySetInfo( getInfoHelper() ) ;
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OColumn::getName(  ) throw(::com::sun::star::uno::RuntimeException)
> {
>     return m_sName;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OColumn::setName( const ::rtl::OUString& _rName ) throw(::com::sun::star::uno::RuntimeException)
> {
>     m_sName = _rName;
> }
> 
>-// -----------------------------------------------------------------------------
> void OColumn::fireValueChange(const ::connectivity::ORowSetValue& /*_rOldValue*/)
> {
>     DBG_ERROR( "OColumn::fireValueChange: not implemented!" );
> }
> 
>-//------------------------------------------------------------------------------
> void OColumn::registerProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType )
> {
>     ::comphelper::OPropertyContainer::registerProperty( _rName, _nHandle, _nAttributes, _pPointerToMember, _rMemberType );
> }
> 
>-//------------------------------------------------------------------------------
> void OColumn::registerMayBeVoidProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, Any* _pPointerToMember, const Type& _rExpectedType )
> {
>     ::comphelper::OPropertyContainer::registerMayBeVoidProperty( _rName, _nHandle, _nAttributes, _pPointerToMember, _rExpectedType );
> }
> 
>-//------------------------------------------------------------------------------
> void OColumn::registerPropertyNoMember( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Type& _rType, const void* _pInitialValue )
> {
>     ::comphelper::OPropertyContainer::registerPropertyNoMember( _rName, _nHandle, _nAttributes, _rType, _pInitialValue );
>@@ -182,7 +168,6 @@ void OColumn::registerPropertyNoMember( const ::rtl::OUString& _rName, sal_Int32
> //============================================================
> DBG_NAME(OColumns);
> 
>-//--------------------------------------------------------------------------
> OColumns::OColumns(::cppu::OWeakObject& _rParent,
>                    ::osl::Mutex& _rMutex,
>                    sal_Bool _bCaseSensitive,const ::std::vector< ::rtl::OUString> &_rVector,
>@@ -203,7 +188,6 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent,
>     DBG_CTOR(OColumns, NULL);
> }
> 
>-// -------------------------------------------------------------------------
> OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
>         const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxDrvColumns,
>         sal_Bool _bCaseSensitive,const ::std::vector< ::rtl::OUString> &_rVector,
>@@ -223,26 +207,22 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
> {
>     DBG_CTOR(OColumns, NULL);
> }
>-//--------------------------------------------------------------------------
> OColumns::~OColumns()
> {
>     DBG_DTOR(OColumns, NULL);
> }
> 
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString OColumns::getImplementationName(  ) throw(RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.OColumns");
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OColumns::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OColumns::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSNS( 1 );
>@@ -250,7 +230,6 @@ Sequence< ::rtl::OUString > OColumns::getSupportedServiceNames(  ) throw (Runtim
>     return aSNS;
> }
> 
>-//------------------------------------------------------------------
> void OColumns::append( const ::rtl::OUString& _rName, OColumn* _pColumn )
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -264,14 +243,12 @@ void OColumns::append( const ::rtl::OUString& _rName, OColumn* _pColumn )
>     insertElement( _rName, _pColumn );
> }
> 
>-//------------------------------------------------------------------
> void OColumns::clearColumns()
> {
>     MutexGuard aGuard(m_rMutex);
>     disposing();
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL OColumns::disposing(void)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -281,14 +258,12 @@ void SAL_CALL OColumns::disposing(void)
>     OColumns_BASE::disposing();
> }
> 
>-// -------------------------------------------------------------------------
> void OColumns::impl_refresh() throw(::com::sun::star::uno::RuntimeException)
> {
>     if (m_pRefreshColumns)
>         m_pRefreshColumns->refreshColumns();
> }
> 
>-// -------------------------------------------------------------------------
> connectivity::sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
> {
>     OSL_ENSURE(m_pColFactoryImpl, "OColumns::createObject: no column factory!");
>@@ -308,7 +283,6 @@ connectivity::sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _r
> 
>     return xRet;
> }
>-// -------------------------------------------------------------------------
> Reference< XPropertySet > OColumns::createDescriptor()
> {
>     if ( m_pColFactoryImpl )
>@@ -322,7 +296,6 @@ Reference< XPropertySet > OColumns::createDescriptor()
>     else
>         return Reference< XPropertySet >();
> }
>-// -------------------------------------------------------------------------
> Any SAL_CALL OColumns::queryInterface( const Type & rType ) throw(RuntimeException)
> {
>     Any aRet;
>@@ -348,7 +321,6 @@ Any SAL_CALL OColumns::queryInterface( const Type & rType ) throw(RuntimeExcepti
>         aRet = TXChild::queryInterface( rType);
>     return aRet;
> }
>-// -------------------------------------------------------------------------
> Sequence< Type > SAL_CALL OColumns::getTypes(  ) throw(RuntimeException)
> {
>     sal_Bool bAppendFound = sal_False,bDropFound = sal_False;
>@@ -399,7 +371,6 @@ Sequence< Type > SAL_CALL OColumns::getTypes(  ) throw(RuntimeException)
>     }
>     return aRet;
> }
>-// -------------------------------------------------------------------------
> // XAppend
> sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
> {
>@@ -437,7 +408,6 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, cons
> 
>     return xReturn;
> }
>-// -------------------------------------------------------------------------
> // XDrop
> void OColumns::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
> {
>@@ -465,17 +435,14 @@ void OColumns::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
> 
>     ::dbaccess::notifyDataSourceModified(m_xParent,sal_True);
> }
>-// -----------------------------------------------------------------------------
> 
> Reference< XInterface > SAL_CALL OColumns::getParent(  ) throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_rMutex);
>     return m_xParent;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OColumns::setParent( const Reference< XInterface >& _xParent ) throw (NoSupportException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_rMutex);
>     m_xParent = _xParent;
> }
>-// -----------------------------------------------------------------------------
>diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx
>index 58252b7..460b72f 100644
>--- a/dbaccess/source/core/api/columnsettings.cxx
>+++ b/dbaccess/source/core/api/columnsettings.cxx
>@@ -67,20 +67,17 @@ namespace dbaccess
>     //= OColumnSettings
>     //==============================================================================
>     DBG_NAME( OColumnSettings )
>-    //------------------------------------------------------------------------------
>     OColumnSettings::OColumnSettings()
>         :m_bHidden(sal_False)
>     {
>         DBG_CTOR( OColumnSettings, NULL );
>     }
> 
>-    //------------------------------------------------------------------------------
>     OColumnSettings::~OColumnSettings()
>     {
>         DBG_DTOR( OColumnSettings, NULL );
>     }
> 
>-    //------------------------------------------------------------------------------
>     void OColumnSettings::registerProperties( IPropertyContainer& _rPropertyContainer )
>     {
>         const sal_Int32 nBoundAttr = PropertyAttribute::BOUND;
>@@ -99,7 +96,6 @@ namespace dbaccess
>         _rPropertyContainer.registerProperty( PROPERTY_HIDDEN, PROPERTY_ID_HIDDEN, nBoundAttr, &m_bHidden, ::getCppuType( &m_bHidden ) );
>     }
> 
>-    //------------------------------------------------------------------------------
>     bool OColumnSettings::isColumnSettingProperty( const sal_Int32 _nPropertyHandle )
>     {
>         return  ( _nPropertyHandle == PROPERTY_ID_ALIGN )
>@@ -112,7 +108,6 @@ namespace dbaccess
>             ||  ( _nPropertyHandle == PROPERTY_ID_HIDDEN );
>     }
> 
>-    //------------------------------------------------------------------------------
>     bool OColumnSettings::isDefaulted( const sal_Int32 _nPropertyHandle, const Any& _rPropertyValue )
>     {
>         switch ( _nPropertyHandle )
>@@ -139,7 +134,6 @@ namespace dbaccess
>         return sal_False;
>     }
> 
>-    //------------------------------------------------------------------------------
>     bool OColumnSettings::hasDefaultSettings( const Reference< XPropertySet >& _rxColumn )
>     {
>         ENSURE_OR_THROW( _rxColumn.is(), "illegal column" );
>diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx
>index 791bd7c..8aa6cef 100644
>--- a/dbaccess/source/core/api/datacolumn.cxx
>+++ b/dbaccess/source/core/api/datacolumn.cxx
>@@ -49,7 +49,6 @@ using namespace ::comphelper;
> using namespace ::cppu;
> 
> DBG_NAME(ODataColumn)
>-//--------------------------------------------------------------------------
> ODataColumn::ODataColumn(
>                          const Reference < XResultSetMetaData >& _xMetaData,
>                          const Reference < XRow >& _xRow,
>@@ -62,14 +61,12 @@ ODataColumn::ODataColumn(
> {
>     DBG_CTOR(ODataColumn,NULL);
> }
>-// -----------------------------------------------------------------------------
> ODataColumn::~ODataColumn()
> {
>     DBG_DTOR(ODataColumn,NULL);
> }
> 
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< Type > ODataColumn::getTypes() throw (RuntimeException)
> {
>     OTypeCollection aTypes(::getCppuType( (const Reference< XColumn > *)0 ),
>@@ -78,7 +75,6 @@ Sequence< Type > ODataColumn::getTypes() throw (RuntimeException)
>     return aTypes.getTypes();
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< sal_Int8 > ODataColumn::getImplementationId() throw (RuntimeException)
> {
>     static OImplementationId * pId = 0;
>@@ -94,7 +90,6 @@ Sequence< sal_Int8 > ODataColumn::getImplementationId() throw (RuntimeException)
>     return pId->getImplementationId();
> }
> 
>-//------------------------------------------------------------------------------
> Any SAL_CALL ODataColumn::queryInterface( const Type & _rType ) throw (RuntimeException)
> {
>     Any aReturn = OResultColumn::queryInterface(_rType);
>@@ -107,13 +102,11 @@ Any SAL_CALL ODataColumn::queryInterface( const Type & _rType ) throw (RuntimeEx
> }
> 
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString ODataColumn::getImplementationName(  ) throw(RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.ODataColumn");
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > ODataColumn::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSNS( 3 );
>@@ -124,7 +117,6 @@ Sequence< ::rtl::OUString > ODataColumn::getSupportedServiceNames(  ) throw (Run
> }
> 
> // OComponentHelper
>-//------------------------------------------------------------------------------
> void ODataColumn::disposing()
> {
>     OResultColumn::disposing();
>@@ -134,7 +126,6 @@ void ODataColumn::disposing()
> }
> 
> // ::com::sun::star::sdb::XColumn
>-//------------------------------------------------------------------------------
> sal_Bool ODataColumn::wasNull(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -143,7 +134,6 @@ sal_Bool ODataColumn::wasNull(void) throw( SQLException, RuntimeException )
>     return m_xRow->wasNull();
> }
> 
>-//------------------------------------------------------------------------------
> rtl::OUString ODataColumn::getString(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -152,7 +142,6 @@ rtl::OUString ODataColumn::getString(void) throw( SQLException, RuntimeException
>     return m_xRow->getString(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool ODataColumn::getBoolean(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -161,7 +150,6 @@ sal_Bool ODataColumn::getBoolean(void) throw( SQLException, RuntimeException )
>     return m_xRow->getBoolean(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int8 ODataColumn::getByte(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -170,7 +158,6 @@ sal_Int8 ODataColumn::getByte(void) throw( SQLException, RuntimeException )
>     return m_xRow->getByte(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int16 ODataColumn::getShort(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -179,7 +166,6 @@ sal_Int16 ODataColumn::getShort(void) throw( SQLException, RuntimeException )
>     return m_xRow->getShort(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int32 ODataColumn::getInt(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -188,7 +174,6 @@ sal_Int32 ODataColumn::getInt(void) throw( SQLException, RuntimeException )
>     return m_xRow->getInt(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int64 ODataColumn::getLong(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -197,7 +182,6 @@ sal_Int64 ODataColumn::getLong(void) throw( SQLException, RuntimeException )
>     return m_xRow->getLong(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> float ODataColumn::getFloat(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -205,7 +189,6 @@ float ODataColumn::getFloat(void) throw( SQLException, RuntimeException )
> 
>     return m_xRow->getFloat(m_nPos);
> }
>-//------------------------------------------------------------------------------
> double ODataColumn::getDouble(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -214,7 +197,6 @@ double ODataColumn::getDouble(void) throw( SQLException, RuntimeException )
>     return m_xRow->getDouble(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< sal_Int8 > ODataColumn::getBytes(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -222,7 +204,6 @@ Sequence< sal_Int8 > ODataColumn::getBytes(void) throw( SQLException, RuntimeExc
> 
>     return m_xRow->getBytes(m_nPos);
> }
>-//------------------------------------------------------------------------------
> com::sun::star::util::Date ODataColumn::getDate(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -231,7 +212,6 @@ com::sun::star::util::Date ODataColumn::getDate(void) throw( SQLException, Runti
>     return m_xRow->getDate(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> com::sun::star::util::Time ODataColumn::getTime(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -239,7 +219,6 @@ com::sun::star::util::Time ODataColumn::getTime(void) throw( SQLException, Runti
> 
>     return m_xRow->getTime(m_nPos);
> }
>-//------------------------------------------------------------------------------
> com::sun::star::util::DateTime ODataColumn::getTimestamp(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -248,7 +227,6 @@ com::sun::star::util::DateTime ODataColumn::getTimestamp(void) throw( SQLExcepti
>     return m_xRow->getTimestamp(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream >  ODataColumn::getBinaryStream(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -257,7 +235,6 @@ Reference< ::com::sun::star::io::XInputStream >  ODataColumn::getBinaryStream(vo
>     return m_xRow->getBinaryStream(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream >  ODataColumn::getCharacterStream(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -266,7 +243,6 @@ Reference< ::com::sun::star::io::XInputStream >  ODataColumn::getCharacterStream
>     return m_xRow->getCharacterStream(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> Any ODataColumn::getObject(const Reference< ::com::sun::star::container::XNameAccess > & typeMap) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -275,7 +251,6 @@ Any ODataColumn::getObject(const Reference< ::com::sun::star::container::XNameAc
>     return m_xRow->getObject(m_nPos, typeMap);
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XRef >  ODataColumn::getRef(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -284,7 +259,6 @@ Reference< XRef >  ODataColumn::getRef(void) throw( SQLException, RuntimeExcepti
>     return m_xRow->getRef(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XBlob >  ODataColumn::getBlob(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -293,7 +267,6 @@ Reference< XBlob >  ODataColumn::getBlob(void) throw( SQLException, RuntimeExcep
>     return m_xRow->getBlob(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XClob >  ODataColumn::getClob(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -302,7 +275,6 @@ Reference< XClob >  ODataColumn::getClob(void) throw( SQLException, RuntimeExcep
>     return m_xRow->getClob(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XArray >  ODataColumn::getArray(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -312,7 +284,6 @@ Reference< XArray >  ODataColumn::getArray(void) throw( SQLException, RuntimeExc
> }
> 
> // ::com::sun::star::sdb::XColumnUpdate
>-//------------------------------------------------------------------------------
> void ODataColumn::updateNull(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -321,7 +292,6 @@ void ODataColumn::updateNull(void) throw( SQLException, RuntimeException )
>     m_xRowUpdate->updateNull(m_nPos);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateBoolean(sal_Bool x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -330,7 +300,6 @@ void ODataColumn::updateBoolean(sal_Bool x) throw( SQLException, RuntimeExceptio
>     m_xRowUpdate->updateBoolean(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateByte(sal_Int8 x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -339,7 +308,6 @@ void ODataColumn::updateByte(sal_Int8 x) throw( SQLException, RuntimeException )
>     m_xRowUpdate->updateByte(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateShort(sal_Int16 x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -348,7 +316,6 @@ void ODataColumn::updateShort(sal_Int16 x) throw( SQLException, RuntimeException
>     m_xRowUpdate->updateShort(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateInt(sal_Int32 x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -357,7 +324,6 @@ void ODataColumn::updateInt(sal_Int32 x) throw( SQLException, RuntimeException )
>     m_xRowUpdate->updateInt(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateLong(sal_Int64 x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -366,7 +332,6 @@ void ODataColumn::updateLong(sal_Int64 x) throw( SQLException, RuntimeException
>     m_xRowUpdate->updateLong(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateFloat(float x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -375,7 +340,6 @@ void ODataColumn::updateFloat(float x) throw( SQLException, RuntimeException )
>     m_xRowUpdate->updateFloat(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateDouble(double x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -384,7 +348,6 @@ void ODataColumn::updateDouble(double x) throw( SQLException, RuntimeException )
>     m_xRowUpdate->updateDouble(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateString(const rtl::OUString& x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -393,7 +356,6 @@ void ODataColumn::updateString(const rtl::OUString& x) throw( SQLException, Runt
>     m_xRowUpdate->updateString(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateBytes(const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -402,7 +364,6 @@ void ODataColumn::updateBytes(const Sequence< sal_Int8 >& x) throw( SQLException
>     m_xRowUpdate->updateBytes(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateDate(const com::sun::star::util::Date& x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -411,7 +372,6 @@ void ODataColumn::updateDate(const com::sun::star::util::Date& x) throw( SQLExce
>     m_xRowUpdate->updateDate(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateTime(const ::com::sun::star::util::Time& x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -420,7 +380,6 @@ void ODataColumn::updateTime(const ::com::sun::star::util::Time& x) throw( SQLEx
>     m_xRowUpdate->updateTime(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateTimestamp(const ::com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -429,7 +388,6 @@ void ODataColumn::updateTimestamp(const ::com::sun::star::util::DateTime& x) thr
>     m_xRowUpdate->updateTimestamp(m_nPos, x);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateCharacterStream(const Reference< ::com::sun::star::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -438,7 +396,6 @@ void ODataColumn::updateCharacterStream(const Reference< ::com::sun::star::io::X
>     m_xRowUpdate->updateCharacterStream(m_nPos, x, length);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateBinaryStream(const Reference< ::com::sun::star::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -447,7 +404,6 @@ void ODataColumn::updateBinaryStream(const Reference< ::com::sun::star::io::XInp
>     m_xRowUpdate->updateBinaryStream(m_nPos, x, length);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateNumericObject(const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>@@ -456,7 +412,6 @@ void ODataColumn::updateNumericObject(const Any& x, sal_Int32 scale) throw( SQLE
>     m_xRowUpdate->updateNumericObject(m_nPos, x, scale);
> }
> 
>-//------------------------------------------------------------------------------
> void ODataColumn::updateObject(const Any& x) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard( m_aMutex );
>diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx
>index 9bfd696..3e8532d 100644
>--- a/dbaccess/source/core/api/datasettings.cxx
>+++ b/dbaccess/source/core/api/datasettings.cxx
>@@ -56,7 +56,6 @@ namespace dbaccess
> //==========================================================================
> //= ODataSettings
> //==========================================================================
>-//--------------------------------------------------------------------------
> void ODataSettings::registerPropertiesFor(ODataSettings_Base* _pItem)
> {
>     if ( m_bQuery )
>@@ -112,7 +111,6 @@ void ODataSettings::registerPropertiesFor(ODataSettings_Base* _pItem)
>     registerProperty(PROPERTY_FONTTYPE,			PROPERTY_ID_FONTTYPE,		 PropertyAttribute::BOUND,&_pItem->m_aFont.Type,			::getCppuType(&_pItem->m_aFont.Type));
> }
> 
>-//--------------------------------------------------------------------------
> ODataSettings::ODataSettings(OBroadcastHelper& _rBHelper,sal_Bool _bQuery)
>     :OPropertyStateContainer(_rBHelper)
>     ,ODataSettings_Base()
>@@ -120,7 +118,6 @@ ODataSettings::ODataSettings(OBroadcastHelper& _rBHelper,sal_Bool _bQuery)
> {
> }
> 
>-//--------------------------------------------------------------------------
> ODataSettings_Base::ODataSettings_Base()
>     :m_bApplyFilter(sal_False)
>     ,m_aFont(::comphelper::getDefaultFont())
>@@ -129,7 +126,6 @@ ODataSettings_Base::ODataSettings_Base()
> {
> }
> 
>-//--------------------------------------------------------------------------
> ODataSettings_Base::ODataSettings_Base(const ODataSettings_Base& _rSource)
>     :m_sFilter( _rSource.m_sFilter )
>     ,m_sHavingClause( _rSource.m_sHavingClause )
>@@ -145,12 +141,10 @@ ODataSettings_Base::ODataSettings_Base(const ODataSettings_Base& _rSource)
> {
> }
> 
>-// -----------------------------------------------------------------------------
> ODataSettings_Base::~ODataSettings_Base()
> {
> }
> 
>-// -----------------------------------------------------------------------------
> void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) const
> {
>     static ::com::sun::star::awt::FontDescriptor aFD = ::comphelper::getDefaultFont();
>diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
>index 2a0f263..45cc269 100644
>--- a/dbaccess/source/core/api/definitioncolumn.cxx
>+++ b/dbaccess/source/core/api/definitioncolumn.cxx
>@@ -67,7 +67,6 @@ using namespace dbaccess;
> //============================================================
> IMPLEMENT_FORWARD_XINTERFACE2(OTableColumnDescriptor,OColumn,TXChild)
> 
>-//------------------------------------------------------------------------------
> void OTableColumnDescriptor::impl_registerProperties()
> {
>     sal_Int32 nDefaultAttr = m_bActAsDescriptor ? 0 : PropertyAttribute::READONLY;
>@@ -90,17 +89,14 @@ void OTableColumnDescriptor::impl_registerProperties()
>     OColumnSettings::registerProperties( *this );
> }
> 
>-//--------------------------------------------------------------------------
> IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptor )
> 
> // ::com::sun::star::lang::XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString OTableColumnDescriptor::getImplementationName(  ) throw (RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.OTableColumnDescriptor");
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OTableColumnDescriptor::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSNS( 2 );
>@@ -110,7 +106,6 @@ Sequence< ::rtl::OUString > OTableColumnDescriptor::getSupportedServiceNames(  )
> }
> 
> // comphelper::OPropertyArrayUsageHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* OTableColumnDescriptor::createArrayHelper( ) const
> {
>     Sequence< Property > aProps;
>@@ -119,26 +114,22 @@ Sequence< ::rtl::OUString > OTableColumnDescriptor::getSupportedServiceNames(  )
> }
> 
> // cppu::OPropertySetHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& OTableColumnDescriptor::getInfoHelper()
> {
>     return *static_cast< ::comphelper::OPropertyArrayUsageHelper< OTableColumnDescriptor >* >(this)->getArrayHelper();
> }
> 
>-//------------------------------------------------------------------------------
> void OTableColumnDescriptor::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
> {
>     OColumn::setFastPropertyValue_NoBroadcast( nHandle, rValue );
>     ::dbaccess::notifyDataSourceModified( m_xParent, sal_True );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL OTableColumnDescriptor::getParent(  ) throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>     return m_xParent;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >& _xParent ) throw (NoSupportException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>@@ -149,7 +140,6 @@ void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >&
> //============================================================
> DBG_NAME(OTableColumn);
> 
>-// -------------------------------------------------------------------------
> OTableColumn::OTableColumn( const ::rtl::OUString& _rName )
>     :OTableColumnDescriptor( false /* do not act as descriptor */ )
> {
>@@ -157,28 +147,23 @@ OTableColumn::OTableColumn( const ::rtl::OUString& _rName )
>     m_sName = _rName;
> }
> 
>-// -----------------------------------------------------------------------------
> OTableColumn::~OTableColumn()
> {
>     DBG_DTOR(OTableColumn,NULL);
> }
> 
>-//--------------------------------------------------------------------------
> IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn )
> 
>-//------------------------------------------------------------------------------
> rtl::OUString OTableColumn::getImplementationName(  ) throw (RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.OTableColumn");
> }
> 
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& SAL_CALL OTableColumn::getInfoHelper()
> {
>     return *OTableColumn_PBase::getArrayHelper();
> }
> 
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* OTableColumn::createArrayHelper( ) const
> {
>     return OTableColumnDescriptor::createArrayHelper();
>@@ -189,7 +174,6 @@ rtl::OUString OTableColumn::getImplementationName(  ) throw (RuntimeException)
> // =========================================================================
> DBG_NAME( OQueryColumn );
> 
>-// -------------------------------------------------------------------------
> OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection,const ::rtl::OUString i_sLabel )
>     :OTableColumnDescriptor( false /* do not act as descriptor */ )
>     ,m_sLabel(i_sLabel)
>@@ -245,13 +229,11 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co
>     osl_decrementInterlockedCount( &m_refCount );
> }
> 
>-//--------------------------------------------------------------------------
> OQueryColumn::~OQueryColumn()
> {
>     DBG_DTOR( OQueryColumn, NULL );
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const Reference< XConnection >& _rxConnection )
> {
>     OSL_PRECOND( _rxConnection.is(), "OQueryColumn::impl_determineOriginalTableColumn: illegal connection!" );
>@@ -296,28 +278,23 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const
>     return xOriginalTableColumn;
> }
> 
>-//--------------------------------------------------------------------------
> IMPLEMENT_GET_IMPLEMENTATION_ID( OQueryColumn )
> 
>-//--------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OQueryColumn::getImplementationName(  ) throw(RuntimeException)
> {
>     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.dbaccess.OQueryColumn" ) );
> }
> 
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& SAL_CALL OQueryColumn::getInfoHelper()
> {
>     return *OQueryColumn_PBase::getArrayHelper();
> }
> 
>-//--------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* OQueryColumn::createArrayHelper() const
> {
>     return OTableColumnDescriptor::createArrayHelper();
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OQueryColumn::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
> {
>     OTableColumnDescriptor::getFastPropertyValue( _rValue, _nHandle );
>@@ -354,7 +331,6 @@ void SAL_CALL OQueryColumn::getFastPropertyValue( Any& _rValue, sal_Int32 _nHand
> //= OColumnWrapper
> //==========================================================================
> DBG_NAME(OColumnWrapper);
>-//--------------------------------------------------------------------------
> OColumnWrapper::OColumnWrapper( const Reference< XPropertySet > & rCol, const bool _bNameIsReadOnly )
>     :OColumn( _bNameIsReadOnly )
>     ,m_xAggregate(rCol)
>@@ -375,13 +351,11 @@ OColumnWrapper::OColumnWrapper( const Reference< XPropertySet > & rCol, const bo
>         m_xAggregate->getPropertyValue(PROPERTY_NAME) >>= m_sName;
>     }
> }
>-// -----------------------------------------------------------------------------
> OColumnWrapper::~OColumnWrapper()
> {
>     DBG_DTOR(OColumnWrapper,NULL);
> }
> 
>-//------------------------------------------------------------------------------
> ::rtl::OUString OColumnWrapper::impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const
> {
>     ::rtl::OUString sPropName;
>@@ -391,7 +365,6 @@ OColumnWrapper::~OColumnWrapper()
>     return sPropName;
> }
> 
>-//------------------------------------------------------------------------------
> void OColumnWrapper::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
> {
>     // derived classes are free to either use the OPropertyContainer(Helper) mechanisms for properties,
>@@ -407,7 +380,6 @@ void OColumnWrapper::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
>     }
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OColumnWrapper::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle,
>             const Any& rValue ) throw (IllegalArgumentException)
> {
>@@ -428,7 +400,6 @@ sal_Bool OColumnWrapper::convertFastPropertyValue( Any & rConvertedValue, Any &
>     return bModified;
> }
> 
>-//------------------------------------------------------------------------------
> void OColumnWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
> {
>     if ( OColumn::isRegisteredProperty( nHandle ) )
>@@ -441,7 +412,6 @@ void OColumnWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Int64 SAL_CALL OColumnWrapper::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw(RuntimeException)
> {
>     Reference< XUnoTunnel > xTunnel( m_xAggregate, UNO_QUERY);
>@@ -453,7 +423,6 @@ sal_Int64 SAL_CALL OColumnWrapper::getSomething( const Sequence< sal_Int8 >& aId
> //============================================================
> //= OTableColumnDescriptorWrapper
> //============================================================
>-//--------------------------------------------------------------------------
> OTableColumnDescriptorWrapper::OTableColumnDescriptorWrapper( const Reference< XPropertySet >& _rCol, const bool _bPureWrap, const bool _bIsDescriptor )
>     :OColumnWrapper( _rCol, !_bIsDescriptor )
>     ,m_bPureWrap( _bPureWrap )
>@@ -464,17 +433,14 @@ OTableColumnDescriptorWrapper::OTableColumnDescriptorWrapper( const Reference< X
> }
> 
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptorWrapper )
> 
> // ::com::sun::star::lang::XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString OTableColumnDescriptorWrapper::getImplementationName(  ) throw (RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.OTableColumnDescriptorWrapper");
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSNS( 2 );
>@@ -484,7 +450,6 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa
> }
> 
> // comphelper::OPropertyArrayUsageHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* OTableColumnDescriptorWrapper::createArrayHelper( sal_Int32 nId ) const
> {
>     const sal_Int32 nHaveAlways = 7;
>@@ -552,13 +517,11 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa
> }
> 
> // cppu::OPropertySetHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& OTableColumnDescriptorWrapper::getInfoHelper()
> {
>     return *static_cast< OIdPropertyArrayUsageHelper< OTableColumnDescriptorWrapper >* >(this)->getArrayHelper(m_nColTypeID);
> }
> 
>-//------------------------------------------------------------------------------
> void OTableColumnDescriptorWrapper::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
> {
>     if ( m_bPureWrap )
>@@ -571,7 +534,6 @@ void OTableColumnDescriptorWrapper::getFastPropertyValue( Any& rValue, sal_Int32
>     }
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OTableColumnDescriptorWrapper::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException)
> {
>     sal_Bool bModified(sal_False);
>@@ -596,7 +558,6 @@ sal_Bool OTableColumnDescriptorWrapper::convertFastPropertyValue( Any & rConvert
>     return bModified;
> }
> 
>-//------------------------------------------------------------------------------
> void OTableColumnDescriptorWrapper::setFastPropertyValue_NoBroadcast(
>                                                 sal_Int32 nHandle,
>                                                 const Any& rValue
>@@ -616,7 +577,6 @@ void OTableColumnDescriptorWrapper::setFastPropertyValue_NoBroadcast(
> //============================================================
> //= OTableColumnWrapper
> //============================================================
>-//--------------------------------------------------------------------------
> OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >& rCol, const Reference< XPropertySet >& _xColDefintion,
>             const bool _bPureWrap )
>     :OTableColumnDescriptorWrapper( rCol, _bPureWrap, false )
>@@ -636,21 +596,17 @@ OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >& rCol,
>     osl_decrementInterlockedCount( &m_refCount );
> }
> 
>-//--------------------------------------------------------------------------
> OTableColumnWrapper::~OTableColumnWrapper()
> {
> }
> 
>-//--------------------------------------------------------------------------
> IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnWrapper )
> 
>-//------------------------------------------------------------------------------
> rtl::OUString OTableColumnWrapper::getImplementationName(  ) throw (RuntimeException)
> {
>     return rtl::OUString::createFromAscii( "com.sun.star.sdb.OTableColumnWrapper" );
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OTableColumnWrapper::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSNS( 2 );
>@@ -659,14 +615,12 @@ Sequence< ::rtl::OUString > OTableColumnWrapper::getSupportedServiceNames(  ) th
>     return aSNS;
> }
> 
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& OTableColumnWrapper::getInfoHelper()
> {
>     return *static_cast< OIdPropertyArrayUsageHelper< OTableColumnWrapper >* >(this)->getArrayHelper(m_nColTypeID);
> }
> 
> // comphelper::OPropertyArrayUsageHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* OTableColumnWrapper::createArrayHelper( sal_Int32 nId ) const
> {
>     return OTableColumnDescriptorWrapper::createArrayHelper( nId );
>diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx
>index 8237df8..b0b3246 100644
>--- a/dbaccess/source/core/api/preparedstatement.cxx
>+++ b/dbaccess/source/core/api/preparedstatement.cxx
>@@ -54,7 +54,6 @@ using namespace dbaccess;
> 
> DBG_NAME(OPreparedStatement)
> 
>-//--------------------------------------------------------------------------
> OPreparedStatement::OPreparedStatement(const Reference< XConnection > & _xConn,
>                                       const Reference< XInterface > & _xStatement)
>                    :OStatementBase(_xConn, _xStatement)
>@@ -66,7 +65,6 @@ OPreparedStatement::OPreparedStatement(const Reference< XConnection > & _xConn,
>     m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),::std::vector< ::rtl::OUString>(), NULL,NULL);
> }
> 
>-//--------------------------------------------------------------------------
> OPreparedStatement::~OPreparedStatement()
> {
>     m_pColumns->acquire();
>@@ -77,7 +75,6 @@ OPreparedStatement::~OPreparedStatement()
> }
> 
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< Type > OPreparedStatement::getTypes() throw (RuntimeException)
> {
>     OTypeCollection aTypes(::getCppuType( (const Reference< XServiceInfo > *)0 ),
>@@ -90,7 +87,6 @@ Sequence< Type > OPreparedStatement::getTypes() throw (RuntimeException)
>     return aTypes.getTypes();
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< sal_Int8 > OPreparedStatement::getImplementationId() throw (RuntimeException)
> {
>         static OImplementationId * pId = 0;
>@@ -107,7 +103,6 @@ Sequence< sal_Int8 > OPreparedStatement::getImplementationId() throw (RuntimeExc
> }
> 
> // com::sun::star::uno::XInterface
>-//--------------------------------------------------------------------------
> Any OPreparedStatement::queryInterface( const Type & rType ) throw (RuntimeException)
> {
>     Any aIface = OStatementBase::queryInterface( rType );
>@@ -124,32 +119,27 @@ Any OPreparedStatement::queryInterface( const Type & rType ) throw (RuntimeExcep
>     return aIface;
> }
> 
>-//--------------------------------------------------------------------------
> void OPreparedStatement::acquire() throw ()
> {
>     OStatementBase::acquire();
> }
> 
>-//--------------------------------------------------------------------------
> void OPreparedStatement::release() throw ()
> {
>     OStatementBase::release();
> }
> 
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString OPreparedStatement::getImplementationName(  ) throw(RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.OPreparedStatement");
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OPreparedStatement::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OPreparedStatement::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSNS( 2 );
>@@ -159,7 +149,6 @@ Sequence< ::rtl::OUString > OPreparedStatement::getSupportedServiceNames(  ) thr
> }
> 
> // OComponentHelper
>-//------------------------------------------------------------------------------
> void OPreparedStatement::disposing()
> {
>     {
>@@ -171,7 +160,6 @@ void OPreparedStatement::disposing()
> }
> 
> // ::com::sun::star::sdbcx::XColumnsSupplier
>-//------------------------------------------------------------------------------
> Reference< ::com::sun::star::container::XNameAccess > OPreparedStatement::getColumns(void) throw( RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -206,7 +194,6 @@ Reference< ::com::sun::star::container::XNameAccess > OPreparedStatement::getCol
> }
> 
> // XResultSetMetaDataSupplier
>-//------------------------------------------------------------------------------
> Reference< XResultSetMetaData > OPreparedStatement::getMetaData(void) throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -215,7 +202,6 @@ Reference< XResultSetMetaData > OPreparedStatement::getMetaData(void) throw( SQL
> }
> 
> // XPreparedStatement
>-//------------------------------------------------------------------------------
> Reference< XResultSet >  OPreparedStatement::executeQuery() throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -235,7 +221,6 @@ Reference< XResultSet >  OPreparedStatement::executeQuery() throw( SQLException,
>     return xResultSet;
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int32 OPreparedStatement::executeUpdate() throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -246,7 +231,6 @@ sal_Int32 OPreparedStatement::executeUpdate() throw( SQLException, RuntimeExcept
>     return Reference< XPreparedStatement >( m_xAggregateAsSet, UNO_QUERY_THROW )->executeUpdate();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OPreparedStatement::execute() throw( SQLException, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -257,14 +241,12 @@ sal_Bool OPreparedStatement::execute() throw( SQLException, RuntimeException )
>     return Reference< XPreparedStatement >( m_xAggregateAsSet, UNO_QUERY_THROW )->execute();
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XConnection > OPreparedStatement::getConnection(void) throw( SQLException, RuntimeException )
> {
>     return Reference< XConnection > (m_xParent, UNO_QUERY);
> }
> 
> // XParameters
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -273,7 +255,6 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s
>     m_xAggregateAsParameters->setNull(parameterIndex, sqlType);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -282,7 +263,6 @@ void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_I
>     m_xAggregateAsParameters->setObjectNull(parameterIndex, sqlType, typeName);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -291,7 +271,6 @@ void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool
>     m_xAggregateAsParameters->setBoolean(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -300,7 +279,6 @@ void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x
>     m_xAggregateAsParameters->setByte(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -309,7 +287,6 @@ void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16
>     m_xAggregateAsParameters->setShort(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -318,7 +295,6 @@ void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x
>     m_xAggregateAsParameters->setInt(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -327,7 +303,6 @@ void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x
>     m_xAggregateAsParameters->setLong(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -336,7 +311,6 @@ void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x )
>     m_xAggregateAsParameters->setFloat(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -345,7 +319,6 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x
>     m_xAggregateAsParameters->setDouble(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -354,7 +327,6 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::r
>     m_xAggregateAsParameters->setString(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -363,7 +335,6 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ
>     m_xAggregateAsParameters->setBytes(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -372,7 +343,6 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const ::com
>     m_xAggregateAsParameters->setDate(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -381,7 +351,6 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const ::com
>     m_xAggregateAsParameters->setTime(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -390,7 +359,6 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const
>     m_xAggregateAsParameters->setTimestamp(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -399,7 +367,6 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con
>     m_xAggregateAsParameters->setBinaryStream(parameterIndex, x, length);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -408,7 +375,6 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex,
>     m_xAggregateAsParameters->setCharacterStream(parameterIndex, x, length);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -417,7 +383,6 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
>     m_xAggregateAsParameters->setObject(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -426,7 +391,6 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
>     m_xAggregateAsParameters->setObjectWithInfo(parameterIndex, x, targetSqlType, scale);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -435,7 +399,6 @@ void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Refere
>     m_xAggregateAsParameters->setRef(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -444,7 +407,6 @@ void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Refer
>     m_xAggregateAsParameters->setBlob(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -453,7 +415,6 @@ void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Refer
>     m_xAggregateAsParameters->setClob(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -462,7 +423,6 @@ void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Refe
>     m_xAggregateAsParameters->setArray(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
>index 7bd27b0..785d69b 100644
>--- a/dbaccess/source/core/api/query.cxx
>+++ b/dbaccess/source/core/api/query.cxx
>@@ -83,7 +83,6 @@ namespace dbaccess
> //= OQuery
> //==========================================================================
> DBG_NAME(OQuery)
>-//--------------------------------------------------------------------------
> OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition
>                ,const Reference< XConnection >& _rxConn
>                ,const Reference< XMultiServiceFactory >& _xORB)
>@@ -122,16 +121,13 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition
>     osl_decrementInterlockedCount(&m_refCount);
> }
> 
>-//--------------------------------------------------------------------------
> OQuery::~OQuery()
> {
>     DBG_DTOR(OQuery, NULL);
> }
>-// -----------------------------------------------------------------------------
> IMPLEMENT_IMPLEMENTATION_ID(OQuery);
> IMPLEMENT_GETTYPES3(OQuery,OQueryDescriptor_Base,ODataSettings,OContentHelper);
> IMPLEMENT_FORWARD_XINTERFACE3( OQuery,OContentHelper,OQueryDescriptor_Base,ODataSettings)
>-//--------------------------------------------------------------------------
> void OQuery::rebuildColumns()
> {
>     OSL_PRECOND( getColumnCount() == 0, "OQuery::rebuildColumns: column container should be empty!" );
>@@ -231,11 +227,9 @@ void OQuery::rebuildColumns()
> }
> 
> // XServiceInfo
>-//--------------------------------------------------------------------------
> IMPLEMENT_SERVICE_INFO3(OQuery, "com.sun.star.sdb.dbaccess.OQuery", SERVICE_SDB_DATASETTINGS, SERVICE_SDB_QUERY, SERVICE_SDB_QUERYDEFINITION)
> 
> // ::com::sun::star::beans::XPropertyChangeListener
>-//--------------------------------------------------------------------------
> void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource ) throw(RuntimeException)
> {
>     sal_Int32 nOwnHandle = -1;
>@@ -268,7 +262,6 @@ void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource ) thro
>     fire(&nOwnHandle, &_rSource.NewValue, &_rSource.OldValue, 1, sal_False);
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OQuery::disposing( const EventObject& _rSource ) throw (RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -282,14 +275,12 @@ void SAL_CALL OQuery::disposing( const EventObject& _rSource ) throw (RuntimeExc
> }
> 
> // XDataDescriptorFactory
>-//--------------------------------------------------------------------------
> Reference< XPropertySet > SAL_CALL OQuery::createDataDescriptor(  ) throw(RuntimeException)
> {
>     return new OQueryDescriptor(*this);
> }
> 
> // pseudo-XComponent
>-//--------------------------------------------------------------------------
> void SAL_CALL OQuery::disposing()
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -303,7 +294,6 @@ void SAL_CALL OQuery::disposing()
>     m_pWarnings = NULL;
> }
> 
>-//--------------------------------------------------------------------------
> void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception)
> {
>     ODataSettings::setFastPropertyValue_NoBroadcast(_nHandle, _rValue);
>@@ -324,19 +314,16 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _r
>     }
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo(	) throw(RuntimeException)
> {
>     return createPropertySetInfo( getInfoHelper() ) ;
> }
> 
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& OQuery::getInfoHelper()
> {
>     return *getArrayHelper();
> }
> 
>-//--------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* OQuery::createArrayHelper( ) const
> {
>     Sequence< Property > aProps;
>@@ -344,12 +331,10 @@ Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo(	) throw(Runti
>     describeProperties(aProps);
>     return new ::cppu::OPropertyArrayHelper(aProps);
> }
>-// -----------------------------------------------------------------------------
> OColumn* OQuery::createColumn(const ::rtl::OUString& /*_rName*/) const
> {
>     return NULL;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OQuery::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -358,7 +343,6 @@ void SAL_CALL OQuery::rename( const ::rtl::OUString& newName ) throw (SQLExcepti
>     if(xRename.is())
>         xRename->rename(newName);
> }
>-// -----------------------------------------------------------------------------
> void OQuery::registerProperties()
> {
>     // the properties which OCommandBase supplies (it has no own registration, as it's not derived from
>@@ -385,13 +369,11 @@ void OQuery::registerProperties()
>                     &m_aLayoutInformation, ::getCppuType(&m_aLayoutInformation));
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OQuery::determineContentType() const
> {
>     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.org.openoffice.DatabaseQuery" ) );
> }
> 
>-// -----------------------------------------------------------------------------
> //........................................................................
> }	// namespace dbaccess
> //........................................................................
>diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx
>index 449e2db..5df868a 100644
>--- a/dbaccess/source/core/api/query.hxx
>+++ b/dbaccess/source/core/api/query.hxx
>@@ -84,7 +84,6 @@ protected:
>     enum AGGREGATE_ACTION { NONE, SETTING_PROPERTIES, FLUSHING };
>     AGGREGATE_ACTION	m_eDoingCurrently;
> 
>-    // ------------------------------------------------------------------------
>     /** a class which automatically resets m_eDoingCurrently in it's destructor
>     */
>     class OAutoActionReset;	// just for the following friend declaration
>diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
>index 144142c..699a7d2 100644
>--- a/dbaccess/source/core/api/querycomposer.cxx
>+++ b/dbaccess/source/core/api/querycomposer.cxx
>@@ -74,7 +74,6 @@ using namespace ::utl;
> 
> 
> DBG_NAME(OQueryComposer)
>-// -------------------------------------------------------------------------
> OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection)
>  : OSubComponent(m_aMutex,_xConnection)
> {
>@@ -86,26 +85,22 @@ OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection)
>     m_xComposer.set( xFac->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY_THROW );
>     m_xComposerHelper.set( xFac->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY_THROW );
> }
>-// -------------------------------------------------------------------------
> OQueryComposer::~OQueryComposer()
> {
>     DBG_DTOR(OQueryComposer,NULL);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OQueryComposer::disposing()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::disposing" );
>     ::comphelper::disposeComponent(m_xComposerHelper);
>     ::comphelper::disposeComponent(m_xComposer);
> }
>-// -------------------------------------------------------------------------
> // ::com::sun::star::lang::XTypeProvider
> Sequence< Type > SAL_CALL OQueryComposer::getTypes() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getTypes" );
>     return ::comphelper::concatSequences(OSubComponent::getTypes(),OQueryComposer_BASE::getTypes());
> }
>-// -------------------------------------------------------------------------
> Sequence< sal_Int8 > SAL_CALL OQueryComposer::getImplementationId() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getImplementationId" );
>@@ -121,7 +116,6 @@ Sequence< sal_Int8 > SAL_CALL OQueryComposer::getImplementationId() throw (Runti
>     }
>     return pId->getImplementationId();
> }
>-// -------------------------------------------------------------------------
> // com::sun::star::lang::XUnoTunnel
> sal_Int64 SAL_CALL OQueryComposer::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
> {
>@@ -131,7 +125,6 @@ sal_Int64 SAL_CALL OQueryComposer::getSomething( const Sequence< sal_Int8 >& rId
> 
>     return 0;
> }
>-// -------------------------------------------------------------------------
> Any SAL_CALL OQueryComposer::queryInterface( const Type & rType ) throw(RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::queryInterface" );
>@@ -140,21 +133,17 @@ Any SAL_CALL OQueryComposer::queryInterface( const Type & rType ) throw(RuntimeE
>         aRet = OQueryComposer_BASE::queryInterface(rType);
>     return aRet;
> }
>-// -------------------------------------------------------------------------
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString OQueryComposer::getImplementationName(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getImplementationName" );
>     return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.dbaccess.OQueryComposer"));
> }
>-//------------------------------------------------------------------------------
> sal_Bool OQueryComposer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::supportsService" );
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OQueryComposer::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getSupportedServiceNames" );
>@@ -162,7 +151,6 @@ Sequence< ::rtl::OUString > OQueryComposer::getSupportedServiceNames(  ) throw (
>     aSNS[0] = SERVICE_SDB_SQLQUERYCOMPOSER;
>     return aSNS;
> }
>-// -------------------------------------------------------------------------
> // XSQLQueryComposer
> ::rtl::OUString SAL_CALL OQueryComposer::getQuery(  ) throw(RuntimeException)
> {
>@@ -176,7 +164,6 @@ Sequence< ::rtl::OUString > OQueryComposer::getSupportedServiceNames(  ) throw (
>         xProp->getPropertyValue(PROPERTY_ORIGINAL) >>= sQuery;
>     return sQuery;
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setQuery" );
>@@ -188,7 +175,6 @@ void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(S
>     m_sOrgFilter = m_xComposer->getFilter();
>     m_sOrgOrder = m_xComposer->getOrder();
> }
>-// -------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OQueryComposer::getComposedQuery(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getComposedQuery" );
>@@ -198,7 +184,6 @@ void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(S
> 
>     return m_xComposer->getQuery();
> }
>-// -------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OQueryComposer::getFilter(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getFilter" );
>@@ -208,7 +193,6 @@ void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(S
>     aFilterCreator = ::std::for_each(m_aFilters.begin(),m_aFilters.end(),aFilterCreator);
>     return aFilterCreator.getComposedAndClear();
> }
>-// -------------------------------------------------------------------------
> Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilter(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getStructuredFilter" );
>@@ -217,7 +201,6 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilt
>     MutexGuard aGuard(m_aMutex);
>     return m_xComposer->getStructuredFilter();
> }
>-// -------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OQueryComposer::getOrder(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getOrder" );
>@@ -228,7 +211,6 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilt
>     aOrderCreator = ::std::for_each(m_aOrders.begin(),m_aOrders.end(),aOrderCreator);
>     return aOrderCreator.getComposedAndClear();
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::appendFilterByColumn" );
>@@ -261,7 +243,6 @@ void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySe
> 
>     setFilter( aFilterCreator.getComposedAndClear() );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::appendOrderByColumn" );
>@@ -278,7 +259,6 @@ void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet
> 
>     setOrder(aOrderCreator.getComposedAndClear());
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OQueryComposer::setFilter( const ::rtl::OUString& filter ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setFilter" );
>@@ -295,7 +275,6 @@ void SAL_CALL OQueryComposer::setFilter( const ::rtl::OUString& filter ) throw(S
> 
>     m_xComposer->setFilter( aFilterCreator.getComposedAndClear() );
> }
>-// -------------------------------------------------------------------------
> void SAL_CALL OQueryComposer::setOrder( const ::rtl::OUString& order ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setOrder" );
>@@ -313,7 +292,6 @@ void SAL_CALL OQueryComposer::setOrder( const ::rtl::OUString& order ) throw(SQL
> 
>     m_xComposer->setOrder(aOrderCreator.getComposedAndClear());
> }
>-// -------------------------------------------------------------------------
> // XTablesSupplier
> Reference< XNameAccess > SAL_CALL OQueryComposer::getTables(  ) throw(RuntimeException)
> {
>@@ -323,7 +301,6 @@ Reference< XNameAccess > SAL_CALL OQueryComposer::getTables(  ) throw(RuntimeExc
>     ::osl::MutexGuard aGuard( m_aMutex );
>     return Reference<XTablesSupplier>(m_xComposer,UNO_QUERY)->getTables();
> }
>-// -------------------------------------------------------------------------
> // XColumnsSupplier
> Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns(  ) throw(RuntimeException)
> {
>@@ -333,7 +310,6 @@ Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns(  ) throw(RuntimeEx
>     ::osl::MutexGuard aGuard( m_aMutex );
>     return Reference<XColumnsSupplier>(m_xComposer,UNO_QUERY)->getColumns();
> }
>-// -------------------------------------------------------------------------
> Reference< XIndexAccess > SAL_CALL OQueryComposer::getParameters(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getParameters" );
>@@ -342,17 +318,14 @@ Reference< XIndexAccess > SAL_CALL OQueryComposer::getParameters(  ) throw(Runti
>     ::osl::MutexGuard aGuard( m_aMutex );
>     return Reference<XParametersSupplier>(m_xComposer,UNO_QUERY)->getParameters();
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OQueryComposer::acquire() throw()
> {
>     OSubComponent::acquire();
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OQueryComposer::release() throw()
> {
>     OSubComponent::release();
> }
>-// -----------------------------------------------------------------------------
> 
> 
> 
>diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
>index f8d5224..99584f4 100644
>--- a/dbaccess/source/core/api/querycontainer.cxx
>+++ b/dbaccess/source/core/api/querycontainer.cxx
>@@ -75,7 +75,6 @@ namespace dbaccess
> //= OQueryContainer
> //==========================================================================
> DBG_NAME(OQueryContainer)
>-//------------------------------------------------------------------------------
> OQueryContainer::OQueryContainer(
>                   const Reference< XNameContainer >& _rxCommandDefinitions
>                 , const Reference< XConnection >& _rxConn
>@@ -115,20 +114,16 @@ OQueryContainer::OQueryContainer(
>     setElementApproval( PContainerApprove( new ObjectNameApproval( _rxConn, ObjectNameApproval::TypeQuery ) ) );
> }
> 
>-//------------------------------------------------------------------------------
> OQueryContainer::~OQueryContainer()
> {
>     DBG_DTOR(OQueryContainer, NULL);
>     //	dispose();
>         //	maybe we're already disposed, but this should be uncritical
> }
>-// -----------------------------------------------------------------------------
> IMPLEMENT_FORWARD_XINTERFACE2( OQueryContainer,ODefinitionContainer,OQueryContainer_Base)
> 
>-//------------------------------------------------------------------------------
> IMPLEMENT_FORWARD_XTYPEPROVIDER2( OQueryContainer,ODefinitionContainer,OQueryContainer_Base)
> 
>-//------------------------------------------------------------------------------
> void OQueryContainer::disposing()
> {
>     ODefinitionContainer::disposing();
>@@ -154,18 +149,15 @@ void OQueryContainer::disposing()
> }
> 
> // XServiceInfo
>-//------------------------------------------------------------------------------
> IMPLEMENT_SERVICE_INFO2(OQueryContainer, "com.sun.star.sdb.dbaccess.OQueryContainer", SERVICE_SDBCX_CONTAINER, SERVICE_SDB_QUERIES)
> 
> // XDataDescriptorFactory
>-//--------------------------------------------------------------------------
> Reference< XPropertySet > SAL_CALL OQueryContainer::createDataDescriptor(  ) throw(RuntimeException)
> {
>     return new OQueryDescriptor();
> }
> 
> // XAppend
>-//------------------------------------------------------------------------------
> void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet >& _rxDesc ) throw(SQLException, ElementExistException, RuntimeException)
> {
>     ResettableMutexGuard aGuard(m_aMutex);
>@@ -206,7 +198,6 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet
> }
> 
> // XDrop
>-//------------------------------------------------------------------------------
> void SAL_CALL OQueryContainer::dropByName( const ::rtl::OUString& _rName ) throw(SQLException, NoSuchElementException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -221,7 +212,6 @@ void SAL_CALL OQueryContainer::dropByName( const ::rtl::OUString& _rName ) throw
>     m_xCommandDefinitions->removeByName(_rName);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLException, IndexOutOfBoundsException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -238,7 +228,6 @@ void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLExcepti
> 
>     dropByName(sName);
> }
>-//------------------------------------------------------------------------------
> void SAL_CALL OQueryContainer::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException)
> {
>     Reference< XContent > xNewElement;
>@@ -261,7 +250,6 @@ void SAL_CALL OQueryContainer::elementInserted( const ::com::sun::star::containe
>     insertByName(sElementName,makeAny(xNewElement));
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OQueryContainer::elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException)
> {
>     ::rtl::OUString sAccessor;
>@@ -275,7 +263,6 @@ void SAL_CALL OQueryContainer::elementRemoved( const ::com::sun::star::container
>     removeByName(sAccessor);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OQueryContainer::elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException)
> {
>     Reference< XPropertySet > xReplacedElement;
>@@ -296,7 +283,6 @@ void SAL_CALL OQueryContainer::elementReplaced( const ::com::sun::star::containe
>     replaceByName(sAccessor,makeAny(xNewElement));
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const ContainerEvent& Event ) throw (WrappedTargetException, RuntimeException)
> {
>     ::rtl::OUString sName;
>@@ -315,19 +301,16 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const Contain
>     return xReturn;
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XVeto > SAL_CALL OQueryContainer::approveReplaceElement( const ContainerEvent& /*Event*/ ) throw (WrappedTargetException, RuntimeException)
> {
>     return NULL;
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XVeto > SAL_CALL OQueryContainer::approveRemoveElement( const ContainerEvent& /*Event*/ ) throw (WrappedTargetException, RuntimeException)
> {
>     return NULL;
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw(::com::sun::star::uno::RuntimeException)
> {
>     if (_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinitions, UNO_QUERY).get())
>@@ -353,20 +336,17 @@ void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObj
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OQueryContainer::determineContentType() const
> {
>     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.org.openoffice.DatabaseQueryContainer" ) );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XContent > OQueryContainer::implCreateWrapper(const ::rtl::OUString& _rName)
> {
>     Reference< XContent > xObject(m_xCommandDefinitions->getByName(_rName),UNO_QUERY);
>     return implCreateWrapper(xObject);
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XContent > OQueryContainer::implCreateWrapper(const Reference< XContent >& _rxCommandDesc)
> {
>     Reference<XNameContainer> xContainer(_rxCommandDesc,UNO_QUERY);
>@@ -388,12 +368,10 @@ Reference< XContent > OQueryContainer::implCreateWrapper(const Reference< XConte
> 
>     return xReturn;
> }
>-//--------------------------------------------------------------------------
> Reference< XContent > OQueryContainer::createObject( const ::rtl::OUString& _rName)
> {
>     return implCreateWrapper(_rName);
> }
>-// -----------------------------------------------------------------------------
> sal_Bool OQueryContainer::checkExistence(const ::rtl::OUString& _rName)
> {
>     sal_Bool bRet = sal_False;
>@@ -413,19 +391,16 @@ sal_Bool OQueryContainer::checkExistence(const ::rtl::OUString& _rName)
>     }
>     return bRet;
> }
>-//--------------------------------------------------------------------------
> sal_Bool SAL_CALL OQueryContainer::hasElements( ) throw (RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>     return m_xCommandDefinitions->hasElements();
> }
>-// -----------------------------------------------------------------------------
> sal_Int32 SAL_CALL OQueryContainer::getCount(  ) throw(RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>     return Reference<XIndexAccess>(m_xCommandDefinitions,UNO_QUERY)->getCount();
> }
>-// -----------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL OQueryContainer::getElementNames(  ) throw(RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
>index cacf354..f37c628 100644
>--- a/dbaccess/source/core/api/querydescriptor.cxx
>+++ b/dbaccess/source/core/api/querydescriptor.cxx
>@@ -57,7 +57,6 @@ namespace dbaccess
> //= OQueryDescriptor
> //==========================================================================
> DBG_NAME(OQueryDescriptor)
>-//--------------------------------------------------------------------------
> OQueryDescriptor::OQueryDescriptor() 
>     :OQueryDescriptor_Base(m_aMutex,*this)
>     ,ODataSettings(m_aBHelper,sal_True)
>@@ -67,7 +66,6 @@ OQueryDescriptor::OQueryDescriptor()
>     ODataSettings::registerPropertiesFor(this);
> }
> 
>-//--------------------------------------------------------------------------
> OQueryDescriptor::OQueryDescriptor(const OQueryDescriptor_Base& _rSource)
>     :OQueryDescriptor_Base(_rSource,*this)
>     ,ODataSettings(m_aBHelper,sal_True)
>@@ -76,15 +74,12 @@ OQueryDescriptor::OQueryDescriptor(const OQueryDescriptor_Base& _rSource)
>     registerProperties();
>     ODataSettings::registerPropertiesFor(this);
> }
>-// -----------------------------------------------------------------------------
> OQueryDescriptor::~OQueryDescriptor()
> {
>     DBG_DTOR(OQueryDescriptor,NULL);
> }
>-// -----------------------------------------------------------------------------
> IMPLEMENT_TYPEPROVIDER2(OQueryDescriptor,OQueryDescriptor_Base,ODataSettings);
> IMPLEMENT_FORWARD_XINTERFACE3( OQueryDescriptor,OWeakObject,OQueryDescriptor_Base,ODataSettings)
>-//--------------------------------------------------------------------------
> void OQueryDescriptor::registerProperties()
> {
>     // the properties which OCommandBase supplies (it has no own registration, as it's not derived from
>@@ -110,19 +105,15 @@ void OQueryDescriptor::registerProperties()
>     registerProperty(PROPERTY_LAYOUTINFORMATION, PROPERTY_ID_LAYOUTINFORMATION, PropertyAttribute::BOUND,
>                     &m_aLayoutInformation, ::getCppuType(&m_aLayoutInformation));
> }
>-// -----------------------------------------------------------------------------
>-//--------------------------------------------------------------------------
> Reference< XPropertySetInfo > SAL_CALL OQueryDescriptor::getPropertySetInfo(  ) throw(RuntimeException)
> {
>     return createPropertySetInfo( getInfoHelper() ) ;
> }
> 
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& OQueryDescriptor::getInfoHelper()
> {
>     return *getArrayHelper();
> }
>-//--------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* OQueryDescriptor::createArrayHelper( ) const
> {
>     Sequence< Property > aProps;
>@@ -130,9 +121,7 @@ Reference< XPropertySetInfo > SAL_CALL OQueryDescriptor::getPropertySetInfo(  )
>     return new ::cppu::OPropertyArrayHelper(aProps);
> }
> 
>-// -----------------------------------------------------------------------------
> DBG_NAME(OQueryDescriptor_Base);
>-//--------------------------------------------------------------------------
> OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex&	_rMutex,::cppu::OWeakObject& _rMySelf)
>     :m_bColumnsOutOfDate(sal_True)
>     ,m_rMutex(_rMutex)
>@@ -140,7 +129,6 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex&	_rMutex,::cppu::OWeak
>     DBG_CTOR(OQueryDescriptor_Base,NULL);
>     m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< ::rtl::OUString>(), this,this);
> }
>-//--------------------------------------------------------------------------
> OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSource,::cppu::OWeakObject& _rMySelf)
>     :m_bColumnsOutOfDate(sal_True)
>     ,m_rMutex(_rSource.m_rMutex)
>@@ -156,7 +144,6 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSour
>     m_aLayoutInformation = _rSource.m_aLayoutInformation;
> }
> 
>-//--------------------------------------------------------------------------
> OQueryDescriptor_Base::~OQueryDescriptor_Base()
> {
>     m_pColumns->acquire();
>@@ -165,7 +152,6 @@ OQueryDescriptor_Base::~OQueryDescriptor_Base()
> 
>     DBG_DTOR(OQueryDescriptor_Base,NULL);
> }
>-// -----------------------------------------------------------------------------
> sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException)
> {
>     if (_rIdentifier.getLength() != 16)
>@@ -176,9 +162,7 @@ sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8
> 
>     return 0;
> }
>-//--------------------------------------------------------------------------
> IMPLEMENT_IMPLEMENTATION_ID(OQueryDescriptor_Base)
>-//--------------------------------------------------------------------------
> void OQueryDescriptor_Base::setColumnsOutOfDate( sal_Bool _bOutOfDate )
> {
>     m_bColumnsOutOfDate = _bOutOfDate;
>@@ -186,13 +170,11 @@ void OQueryDescriptor_Base::setColumnsOutOfDate( sal_Bool _bOutOfDate )
>         m_pColumns->setInitialized();
> }
> 
>-//--------------------------------------------------------------------------
> void OQueryDescriptor_Base::implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn )
> {
>     m_pColumns->append( _rName, _pColumn );
> }
> 
>-//--------------------------------------------------------------------------
> void OQueryDescriptor_Base::clearColumns( )
> {
>     m_pColumns->clearColumns();
>@@ -200,7 +182,6 @@ void OQueryDescriptor_Base::clearColumns( )
>     setColumnsOutOfDate();
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) throw (RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -231,19 +212,16 @@ Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) throw (Ru
>     return m_pColumns;
> }
> 
>-//--------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OQueryDescriptor_Base::getImplementationName(  ) throw(RuntimeException)
> {
>     return ::rtl::OUString::createFromAscii("com.sun.star.sdb.OQueryDescriptor");
> }
> 
>-//--------------------------------------------------------------------------
> sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
> {
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames(  ) throw(RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSupported(2);
>@@ -251,37 +229,31 @@ Sequence< ::rtl::OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceN
>     aSupported.getArray()[1] = SERVICE_SDB_QUERYDESCRIPTOR;
>     return aSupported;
> }
>-//--------------------------------------------------------------------------
> void OQueryDescriptor_Base::disposeColumns()
> {
>     m_pColumns->disposing();
> }
> 
>-// -----------------------------------------------------------------------------
> void OQueryDescriptor_Base::columnAppended( const Reference< XPropertySet >& /*_rxSourceDescriptor*/ )
> {
>     // not interested in
> }
> 
>-// -----------------------------------------------------------------------------
> void OQueryDescriptor_Base::columnDropped(const ::rtl::OUString& /*_sName*/)
> {
>     // not interested in
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XPropertySet > OQueryDescriptor_Base::createColumnDescriptor()
> {
>     OSL_ENSURE( false, "OQueryDescriptor_Base::createColumnDescriptor: called why?" );
>     return NULL;
> }
> 
>-// -----------------------------------------------------------------------------
> void OQueryDescriptor_Base::rebuildColumns( )
> {
> }
> 
>-// -----------------------------------------------------------------------------
> // IRefreshableColumns
> void OQueryDescriptor_Base::refreshColumns()
> {
>@@ -291,13 +263,11 @@ void OQueryDescriptor_Base::refreshColumns()
>     rebuildColumns();
> }
> 
>-//------------------------------------------------------------------------------
> OColumn* OQueryDescriptor_Base::createColumn( const ::rtl::OUString& /*_rName*/ ) const
> {
>     // creating a column/descriptor for a query/descriptor does not make sense at all
>     return NULL;
> }
>-// -----------------------------------------------------------------------------
> //........................................................................
> }	// namespace dbaccess
> //........................................................................
>diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx
>index 76dd933..2f34216 100644
>--- a/dbaccess/source/core/api/resultcolumn.cxx
>+++ b/dbaccess/source/core/api/resultcolumn.cxx
>@@ -52,7 +52,6 @@ using namespace ::cppu;
> using namespace dbaccess;
> 
> DBG_NAME(OResultColumn)
>-//--------------------------------------------------------------------------
> OResultColumn::OResultColumn( const Reference < XResultSetMetaData >& _xMetaData, sal_Int32 _nPos,
>         const Reference< XDatabaseMetaData >& _rxDBMeta )
>     :OColumn( true )
>@@ -62,7 +61,6 @@ OResultColumn::OResultColumn( const Reference < XResultSetMetaData >& _xMetaData
> {
>     DBG_CTOR(OResultColumn,NULL);
> }
>-// -----------------------------------------------------------------------------
> void OResultColumn::impl_determineIsRowVersion_nothrow()
> {
>     if ( m_aIsRowVersion.hasValue() )
>@@ -107,13 +105,11 @@ void OResultColumn::impl_determineIsRowVersion_nothrow()
>         DBG_UNHANDLED_EXCEPTION();
>     }
> }
>-// -----------------------------------------------------------------------------
> OResultColumn::~OResultColumn()
> {
>     DBG_DTOR(OResultColumn,NULL);
> }
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< sal_Int8 > OResultColumn::getImplementationId() throw (RuntimeException)
> {
>     static OImplementationId * pId = 0;
>@@ -130,13 +126,11 @@ Sequence< sal_Int8 > OResultColumn::getImplementationId() throw (RuntimeExceptio
> }
> 
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString OResultColumn::getImplementationName(  ) throw(RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.OResultColumn");
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OResultColumn::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSNS( 2 );
>@@ -146,7 +140,6 @@ Sequence< ::rtl::OUString > OResultColumn::getSupportedServiceNames(  ) throw (R
> }
> 
> // OComponentHelper
>-//------------------------------------------------------------------------------
> void OResultColumn::disposing()
> {
>     OColumn::disposing();
>@@ -156,7 +149,6 @@ void OResultColumn::disposing()
> }
> 
> // comphelper::OPropertyArrayUsageHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* OResultColumn::createArrayHelper( ) const
> {
>     BEGIN_PROPERTY_HELPER(21)
>@@ -185,13 +177,11 @@ void OResultColumn::disposing()
> }
> 
> // cppu::OPropertySetHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& OResultColumn::getInfoHelper()
> {
>     return *static_cast< ::comphelper::OPropertyArrayUsageHelper< OResultColumn >* >(this)->getArrayHelper();
> }
> 
>-//------------------------------------------------------------------------------
> namespace
> {
>     template< typename TYPE >
>@@ -203,7 +193,6 @@ namespace
>     }
> }
> 
>-//------------------------------------------------------------------------------
> void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
> {
>     try
>diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
>index 219b657..301341c 100644
>--- a/dbaccess/source/core/api/resultset.cxx
>+++ b/dbaccess/source/core/api/resultset.cxx
>@@ -61,7 +61,6 @@ using namespace dbtools;
> 
> DBG_NAME(OResultSet)
> 
>-//--------------------------------------------------------------------------
> OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xResultSet,
>                        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xStatement,
>                        sal_Bool _bCaseSensitive)
>@@ -105,7 +104,6 @@ OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star:
>     }
> }
> 
>-//--------------------------------------------------------------------------
> OResultSet::~OResultSet()
> {
>     m_pColumns->acquire();
>@@ -116,7 +114,6 @@ OResultSet::~OResultSet()
> }
> 
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< Type > OResultSet::getTypes() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getTypes" );
>@@ -126,7 +123,6 @@ Sequence< Type > OResultSet::getTypes() throw (RuntimeException)
>     return aTypes.getTypes();
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< sal_Int8 > OResultSet::getImplementationId() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getImplementationId" );
>@@ -144,7 +140,6 @@ Sequence< sal_Int8 > OResultSet::getImplementationId() throw (RuntimeException)
> }
> 
> // com::sun::star::uno::XInterface
>-//--------------------------------------------------------------------------
> Any OResultSet::queryInterface( const Type & rType ) throw (RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::queryInterface" );
>@@ -157,13 +152,11 @@ Any OResultSet::queryInterface( const Type & rType ) throw (RuntimeException)
>     return aIface;
> }
> 
>-//--------------------------------------------------------------------------
> void OResultSet::acquire() throw ()
> {
>     OResultSetBase::acquire();
> }
> 
>-//--------------------------------------------------------------------------
> void OResultSet::release() throw ()
> {
>     OResultSetBase::release();
>@@ -171,7 +164,6 @@ void OResultSet::release() throw ()
> 
> 
> // OResultSetBase
>-//------------------------------------------------------------------------------
> void OResultSet::disposing()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::disposing" );
>@@ -193,7 +185,6 @@ void OResultSet::disposing()
> }
> 
> // XCloseable
>-//------------------------------------------------------------------------------
> void OResultSet::close(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::close" );
>@@ -205,21 +196,18 @@ void OResultSet::close(void) throw( SQLException, RuntimeException )
> }
> 
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString OResultSet::getImplementationName(  ) throw(RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getImplementationName" );
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.OResultSet");
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::supportsService" );
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OResultSet::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getSupportedServiceNames" );
>@@ -230,7 +218,6 @@ Sequence< ::rtl::OUString > OResultSet::getSupportedServiceNames(  ) throw (Runt
> }
> 
> // com::sun::star::beans::XPropertySet
>-//------------------------------------------------------------------------------
> Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getPropertySetInfo" );
>@@ -238,7 +225,6 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc
> }
> 
> // comphelper::OPropertyArrayUsageHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::createArrayHelper" );
>@@ -253,14 +239,12 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc
> }
> 
> // cppu::OPropertySetHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& OResultSet::getInfoHelper()
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getInfoHelper" );
>     return *getArrayHelper();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException  )
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::convertFastPropertyValue" );
>@@ -270,7 +254,6 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldV
>     return sal_True;
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::setFastPropertyValue_NoBroadcast" );
>@@ -289,7 +272,6 @@ void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any&
>     }
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getFastPropertyValue" );
>@@ -316,7 +298,6 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
> }
> 
> // XWarningsSupplier
>-//------------------------------------------------------------------------------
> Any OResultSet::getWarnings(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getWarnings" );
>@@ -325,7 +306,6 @@ Any OResultSet::getWarnings(void) throw( SQLException, RuntimeException )
>     return m_aWarnings.getWarnings();
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::clearWarnings(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::clearWarnings" );
>@@ -335,7 +315,6 @@ void OResultSet::clearWarnings(void) throw( SQLException, RuntimeException )
> }
> 
> // ::com::sun::star::sdbc::XResultSetMetaDataSupplier
>-//------------------------------------------------------------------------------
> Reference< XResultSetMetaData > OResultSet::getMetaData(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getMetaData" );
>@@ -346,7 +325,6 @@ Reference< XResultSetMetaData > OResultSet::getMetaData(void) throw( SQLExceptio
> }
> 
> // ::com::sun::star::sdbc::XColumnLocate
>-//------------------------------------------------------------------------------
> sal_Int32 OResultSet::findColumn(const rtl::OUString& columnName) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::findColumn" );
>@@ -356,7 +334,6 @@ sal_Int32 OResultSet::findColumn(const rtl::OUString& columnName) throw( SQLExce
>     return Reference< XColumnLocate >(m_xDelegatorResultSet, UNO_QUERY)->findColumn(columnName);
> }
> 
>-//------------------------------------------------------------------------------
> namespace
> {
>     static Reference< XDatabaseMetaData > lcl_getDBMetaDataFromStatement_nothrow( const Reference< XInterface >& _rxStatement )
>@@ -382,7 +359,6 @@ namespace
>     }
> }
> // ::com::sun::star::sdbcx::XColumnsSupplier
>-//------------------------------------------------------------------------------
> Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(void) throw( RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getColumns" );
>@@ -454,7 +430,6 @@ Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(voi
> }
> 
> // ::com::sun::star::sdbc::XRow
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::wasNull(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::wasNull" );
>@@ -463,7 +438,6 @@ sal_Bool OResultSet::wasNull(void) throw( SQLException, RuntimeException )
> 
>     return m_xDelegatorRow->wasNull();
> }
>-//------------------------------------------------------------------------------
> rtl::OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getString" );
>@@ -472,7 +446,6 @@ rtl::OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException,
> 
>     return m_xDelegatorRow->getString(columnIndex);
> }
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getBoolean" );
>@@ -481,7 +454,6 @@ sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) throw( SQLException, Runt
> 
>     return m_xDelegatorRow->getBoolean(columnIndex);
> }
>-//------------------------------------------------------------------------------
> sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getByte" );
>@@ -490,7 +462,6 @@ sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) throw( SQLException, Runtime
> 
>     return m_xDelegatorRow->getByte(columnIndex);
> }
>-//------------------------------------------------------------------------------
> sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getShort" );
>@@ -499,7 +470,6 @@ sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) throw( SQLException, Runti
> 
>     return m_xDelegatorRow->getShort(columnIndex);
> }
>-//------------------------------------------------------------------------------
> sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getInt" );
>@@ -508,7 +478,6 @@ sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) throw( SQLException, Runtime
> 
>     return m_xDelegatorRow->getInt(columnIndex);
> }
>-//------------------------------------------------------------------------------
> sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getLong" );
>@@ -517,7 +486,6 @@ sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) throw( SQLException, Runtim
> 
>     return m_xDelegatorRow->getLong(columnIndex);
> }
>-//------------------------------------------------------------------------------
> float OResultSet::getFloat(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getFloat" );
>@@ -526,7 +494,6 @@ float OResultSet::getFloat(sal_Int32 columnIndex) throw( SQLException, RuntimeEx
> 
>     return m_xDelegatorRow->getFloat(columnIndex);
> }
>-//------------------------------------------------------------------------------
> double OResultSet::getDouble(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getDouble" );
>@@ -535,7 +502,6 @@ double OResultSet::getDouble(sal_Int32 columnIndex) throw( SQLException, Runtime
> 
>     return m_xDelegatorRow->getDouble(columnIndex);
> }
>-//------------------------------------------------------------------------------
> Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getBytes" );
>@@ -544,7 +510,6 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep
> 
>     return m_xDelegatorRow->getBytes(columnIndex);
> }
>-//------------------------------------------------------------------------------
> ::com::sun::star::util::Date OResultSet::getDate(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getDate" );
>@@ -553,7 +518,6 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep
> 
>     return m_xDelegatorRow->getDate(columnIndex);
> }
>-//------------------------------------------------------------------------------
> ::com::sun::star::util::Time OResultSet::getTime(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getTime" );
>@@ -562,7 +526,6 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep
> 
>     return m_xDelegatorRow->getTime(columnIndex);
> }
>-//------------------------------------------------------------------------------
> ::com::sun::star::util::DateTime OResultSet::getTimestamp(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getTimestamp" );
>@@ -571,7 +534,6 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep
> 
>     return m_xDelegatorRow->getTimestamp(columnIndex);
> }
>-//------------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream >  OResultSet::getBinaryStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getBinaryStream" );
>@@ -580,7 +542,6 @@ Reference< ::com::sun::star::io::XInputStream >  OResultSet::getBinaryStream(sal
> 
>     return m_xDelegatorRow->getBinaryStream(columnIndex);
> }
>-//------------------------------------------------------------------------------
> Reference< ::com::sun::star::io::XInputStream >  OResultSet::getCharacterStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getCharacterStream" );
>@@ -589,7 +550,6 @@ Reference< ::com::sun::star::io::XInputStream >  OResultSet::getCharacterStream(
> 
>     return m_xDelegatorRow->getCharacterStream(columnIndex);
> }
>-//------------------------------------------------------------------------------
> Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess > & typeMap) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getObject" );
>@@ -598,7 +558,6 @@ Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< ::com::sun::st
> 
>     return m_xDelegatorRow->getObject(columnIndex, typeMap);
> }
>-//------------------------------------------------------------------------------
> Reference< XRef >  OResultSet::getRef(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getRef" );
>@@ -607,7 +566,6 @@ Reference< XRef >  OResultSet::getRef(sal_Int32 columnIndex) throw( SQLException
> 
>     return m_xDelegatorRow->getRef(columnIndex);
> }
>-//------------------------------------------------------------------------------
> Reference< XBlob >  OResultSet::getBlob(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getBlob" );
>@@ -616,7 +574,6 @@ Reference< XBlob >  OResultSet::getBlob(sal_Int32 columnIndex) throw( SQLExcepti
> 
>     return m_xDelegatorRow->getBlob(columnIndex);
> }
>-//------------------------------------------------------------------------------
> Reference< XClob >  OResultSet::getClob(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getClob" );
>@@ -625,7 +582,6 @@ Reference< XClob >  OResultSet::getClob(sal_Int32 columnIndex) throw( SQLExcepti
> 
>     return m_xDelegatorRow->getClob(columnIndex);
> }
>-//------------------------------------------------------------------------------
> Reference< XArray >  OResultSet::getArray(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getArray" );
>@@ -636,7 +592,6 @@ Reference< XArray >  OResultSet::getArray(sal_Int32 columnIndex) throw( SQLExcep
> }
> 
> // ::com::sun::star::sdbc::XRowUpdate
>-//------------------------------------------------------------------------------
> void OResultSet::updateNull(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateNull" );
>@@ -648,7 +603,6 @@ void OResultSet::updateNull(sal_Int32 columnIndex) throw( SQLException, RuntimeE
>     m_xDelegatorRowUpdate->updateNull(columnIndex);
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateBoolean" );
>@@ -659,7 +613,6 @@ void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( SQLExce
> 
>     m_xDelegatorRowUpdate->updateBoolean(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateByte" );
>@@ -670,7 +623,6 @@ void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLExcepti
> 
>     m_xDelegatorRowUpdate->updateByte(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateShort" );
>@@ -681,7 +633,6 @@ void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLExcep
> 
>     m_xDelegatorRowUpdate->updateShort(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateInt" );
>@@ -692,7 +643,6 @@ void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLExcepti
> 
>     m_xDelegatorRowUpdate->updateInt(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateLong" );
>@@ -703,7 +653,6 @@ void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLExcept
> 
>     m_xDelegatorRowUpdate->updateLong(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateFloat" );
>@@ -714,7 +663,6 @@ void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException
> 
>     m_xDelegatorRowUpdate->updateFloat(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateDouble" );
>@@ -725,7 +673,6 @@ void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLExcepti
> 
>     m_xDelegatorRowUpdate->updateDouble(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateString(sal_Int32 columnIndex, const rtl::OUString& x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateString" );
>@@ -736,7 +683,6 @@ void OResultSet::updateString(sal_Int32 columnIndex, const rtl::OUString& x) thr
> 
>     m_xDelegatorRowUpdate->updateString(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateBytes" );
>@@ -747,7 +693,6 @@ void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >&
> 
>     m_xDelegatorRowUpdate->updateBytes(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateDate(sal_Int32 columnIndex, const ::com::sun::star::util::Date& x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateDate" );
>@@ -758,7 +703,6 @@ void OResultSet::updateDate(sal_Int32 columnIndex, const ::com::sun::star::util:
> 
>     m_xDelegatorRowUpdate->updateDate(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateTime(sal_Int32 columnIndex, const ::com::sun::star::util::Time& x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateTime" );
>@@ -769,7 +713,6 @@ void OResultSet::updateTime(sal_Int32 columnIndex, const ::com::sun::star::util:
> 
>     m_xDelegatorRowUpdate->updateTime(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateTimestamp(sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateTimestamp" );
>@@ -780,7 +723,6 @@ void OResultSet::updateTimestamp(sal_Int32 columnIndex, const ::com::sun::star::
> 
>     m_xDelegatorRowUpdate->updateTimestamp(columnIndex, x);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateBinaryStream" );
>@@ -791,7 +733,6 @@ void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< ::co
> 
>     m_xDelegatorRowUpdate->updateBinaryStream(columnIndex, x, length);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateCharacterStream" );
>@@ -802,7 +743,6 @@ void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< :
> 
>     m_xDelegatorRowUpdate->updateCharacterStream(columnIndex, x, length);
> }
>-//------------------------------------------------------------------------------
> void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateNumericObject" );
>@@ -814,7 +754,6 @@ void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_In
>     m_xDelegatorRowUpdate->updateNumericObject(columnIndex, x, scale);
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateObject" );
>@@ -827,7 +766,6 @@ void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) throw( SQLExc
> }
> 
> // ::com::sun::star::sdbc::XResultSet
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::next(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::next" );
>@@ -837,7 +775,6 @@ sal_Bool OResultSet::next(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->next();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::isBeforeFirst(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::isBeforeFirst" );
>@@ -847,7 +784,6 @@ sal_Bool OResultSet::isBeforeFirst(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->isBeforeFirst();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::isAfterLast(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::isAfterLast" );
>@@ -857,7 +793,6 @@ sal_Bool OResultSet::isAfterLast(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->isAfterLast();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::isFirst(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::isFirst" );
>@@ -867,7 +802,6 @@ sal_Bool OResultSet::isFirst(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->isFirst();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::isLast(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::isLast" );
>@@ -877,7 +811,6 @@ sal_Bool OResultSet::isLast(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->isLast();
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::beforeFirst(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::beforeFirst" );
>@@ -887,7 +820,6 @@ void OResultSet::beforeFirst(void) throw( SQLException, RuntimeException )
>     m_xDelegatorResultSet->beforeFirst();
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::afterLast(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::afterLast" );
>@@ -897,7 +829,6 @@ void OResultSet::afterLast(void) throw( SQLException, RuntimeException )
>     m_xDelegatorResultSet->afterLast();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::first(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::first" );
>@@ -907,7 +838,6 @@ sal_Bool OResultSet::first(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->first();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::last(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::last" );
>@@ -917,7 +847,6 @@ sal_Bool OResultSet::last(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->last();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int32 OResultSet::getRow(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getRow" );
>@@ -927,7 +856,6 @@ sal_Int32 OResultSet::getRow(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->getRow();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::absolute(sal_Int32 row) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::absolute" );
>@@ -937,7 +865,6 @@ sal_Bool OResultSet::absolute(sal_Int32 row) throw( SQLException, RuntimeExcepti
>     return m_xDelegatorResultSet->absolute(row);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::relative(sal_Int32 rows) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::relative" );
>@@ -947,7 +874,6 @@ sal_Bool OResultSet::relative(sal_Int32 rows) throw( SQLException, RuntimeExcept
>     return m_xDelegatorResultSet->relative(rows);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::previous(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::previous" );
>@@ -957,7 +883,6 @@ sal_Bool OResultSet::previous(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->previous();
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::refreshRow(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::refreshRow" );
>@@ -967,7 +892,6 @@ void OResultSet::refreshRow(void) throw( SQLException, RuntimeException )
>     m_xDelegatorResultSet->refreshRow();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::rowUpdated(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::rowUpdated" );
>@@ -977,7 +901,6 @@ sal_Bool OResultSet::rowUpdated(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->rowUpdated();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::rowInserted(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::rowInserted" );
>@@ -987,7 +910,6 @@ sal_Bool OResultSet::rowInserted(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->rowInserted();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::rowDeleted(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::rowDeleted" );
>@@ -997,7 +919,6 @@ sal_Bool OResultSet::rowDeleted(void) throw( SQLException, RuntimeException )
>     return m_xDelegatorResultSet->rowDeleted();
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XInterface > OResultSet::getStatement(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getStatement" );
>@@ -1008,7 +929,6 @@ Reference< XInterface > OResultSet::getStatement(void) throw( SQLException, Runt
> }
> 
> // ::com::sun::star::sdbcx::XRowLocate
>-//------------------------------------------------------------------------------
> Any OResultSet::getBookmark(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getBookmark" );
>@@ -1020,7 +940,6 @@ Any OResultSet::getBookmark(void) throw( SQLException, RuntimeException )
>     return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->getBookmark();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::moveToBookmark" );
>@@ -1032,7 +951,6 @@ sal_Bool OResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, Ru
>     return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->moveToBookmark(bookmark);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::moveRelativeToBookmark" );
>@@ -1044,7 +962,6 @@ sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows)
>     return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->moveRelativeToBookmark(bookmark, rows);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::compareBookmarks" );
>@@ -1056,7 +973,6 @@ sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) th
>     return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->compareBookmarks(_first, _second);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OResultSet::hasOrderedBookmarks(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::hasOrderedBookmarks" );
>@@ -1068,7 +984,6 @@ sal_Bool OResultSet::hasOrderedBookmarks(void) throw( SQLException, RuntimeExcep
>     return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->hasOrderedBookmarks();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::hashBookmark" );
>@@ -1081,7 +996,6 @@ sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, Run
> }
> 
> // ::com::sun::star::sdbc::XResultSetUpdate
>-//------------------------------------------------------------------------------
> void OResultSet::insertRow(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::insertRow" );
>@@ -1093,7 +1007,6 @@ void OResultSet::insertRow(void) throw( SQLException, RuntimeException )
>     m_xDelegatorResultSetUpdate->insertRow();
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::updateRow(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateRow" );
>@@ -1105,7 +1018,6 @@ void OResultSet::updateRow(void) throw( SQLException, RuntimeException )
>     m_xDelegatorResultSetUpdate->updateRow();
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::deleteRow(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::deleteRow" );
>@@ -1117,7 +1029,6 @@ void OResultSet::deleteRow(void) throw( SQLException, RuntimeException )
>     m_xDelegatorResultSetUpdate->deleteRow();
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::cancelRowUpdates(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::cancelRowUpdates" );
>@@ -1129,7 +1040,6 @@ void OResultSet::cancelRowUpdates(void) throw( SQLException, RuntimeException )
>     m_xDelegatorResultSetUpdate->cancelRowUpdates();
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::moveToInsertRow(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::moveToInsertRow" );
>@@ -1141,7 +1051,6 @@ void OResultSet::moveToInsertRow(void) throw( SQLException, RuntimeException )
>     m_xDelegatorResultSetUpdate->moveToInsertRow();
> }
> 
>-//------------------------------------------------------------------------------
> void OResultSet::moveToCurrentRow(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::moveToCurrentRow" );
>@@ -1153,7 +1062,6 @@ void OResultSet::moveToCurrentRow(void) throw( SQLException, RuntimeException )
>     m_xDelegatorResultSetUpdate->moveToCurrentRow();
> }
> 
>-// -----------------------------------------------------------------------------
> void OResultSet::checkReadOnly() const
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::checkReadOnly" );
>@@ -1163,12 +1071,10 @@ void OResultSet::checkReadOnly() const
>         throwSQLException( "The result set is read-only.", SQL_GENERAL_ERROR, *const_cast< OResultSet* >( this ) );
> }
> 
>-// -----------------------------------------------------------------------------
> void OResultSet::checkBookmarkable() const
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::checkBookmarkable" );
>     if ( !m_bIsBookmarkable )
>         throwSQLException( "The result set does not have bookmark support.", SQL_GENERAL_ERROR, *const_cast< OResultSet* >( this ) );
> }
>-// -----------------------------------------------------------------------------
> 
>diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
>index 0ec8e9d..be79ae7 100644
>--- a/dbaccess/source/core/api/statement.cxx
>+++ b/dbaccess/source/core/api/statement.cxx
>@@ -53,7 +53,6 @@ using namespace dbtools;
> 
> DBG_NAME(OStatementBase)
> 
>-//--------------------------------------------------------------------------
> OStatementBase::OStatementBase(const Reference< XConnection > & _xConn,
>                                const Reference< XInterface > & _xStatement)
>     :OSubComponent(m_aMutex, _xConn)
>@@ -69,14 +68,12 @@ OStatementBase::OStatementBase(const Reference< XConnection > & _xConn,
>     m_xAggregateAsCancellable = Reference< ::com::sun::star::util::XCancellable > (m_xAggregateAsSet, UNO_QUERY);
> }
> 
>-//--------------------------------------------------------------------------
> OStatementBase::~OStatementBase()
> {
>     DBG_DTOR(OStatementBase, NULL);
> }
> 
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< Type > OStatementBase::getTypes() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getTypes" );
>@@ -97,7 +94,6 @@ Sequence< Type > OStatementBase::getTypes() throw (RuntimeException)
> }
> 
> // com::sun::star::uno::XInterface
>-//--------------------------------------------------------------------------
> Any OStatementBase::queryInterface( const Type & rType ) throw (RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::queryInterface" );
>@@ -127,19 +123,16 @@ Any OStatementBase::queryInterface( const Type & rType ) throw (RuntimeException
>     return aIface;
> }
> 
>-//--------------------------------------------------------------------------
> void OStatementBase::acquire() throw ()
> {
>     OSubComponent::acquire();
> }
> 
>-//--------------------------------------------------------------------------
> void OStatementBase::release() throw ()
> {
>     OSubComponent::release();
> }
> 
>-//------------------------------------------------------------------------------
> void OStatementBase::disposeResultSet()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::disposeResultSet" );
>@@ -151,7 +144,6 @@ void OStatementBase::disposeResultSet()
> }
> 
> // OComponentHelper
>-//------------------------------------------------------------------------------
> void OStatementBase::disposing()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::disposing" );
>@@ -185,7 +177,6 @@ void OStatementBase::disposing()
> }
> 
> // XCloseable
>-//------------------------------------------------------------------------------
> void OStatementBase::close(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::close" );
>@@ -197,7 +188,6 @@ void OStatementBase::close(void) throw( SQLException, RuntimeException )
> }
> 
> // OPropertySetHelper
>-//------------------------------------------------------------------------------
> Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getPropertySetInfo" );
>@@ -205,7 +195,6 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim
> }
> 
> // comphelper::OPropertyArrayUsageHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* OStatementBase::createArrayHelper( ) const
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::createArrayHelper" );
>@@ -224,14 +213,12 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim
> }
> 
> // cppu::OPropertySetHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& OStatementBase::getInfoHelper()
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getInfoHelper" );
>     return *getArrayHelper();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OStatementBase::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException  )
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::convertFastPropertyValue" );
>@@ -267,7 +254,6 @@ sal_Bool OStatementBase::convertFastPropertyValue( Any & rConvertedValue, Any &
>     return bModified;
> }
> 
>-//------------------------------------------------------------------------------
> void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::setFastPropertyValue_NoBroadcast" );
>@@ -298,7 +284,6 @@ void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
>     }
> }
> 
>-//------------------------------------------------------------------------------
> void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getFastPropertyValue" );
>@@ -326,7 +311,6 @@ void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
> }
> 
> // XWarningsSupplier
>-//------------------------------------------------------------------------------
> Any OStatementBase::getWarnings(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getWarnings" );
>@@ -336,7 +320,6 @@ Any OStatementBase::getWarnings(void) throw( SQLException, RuntimeException )
>     return Reference< XWarningsSupplier >(m_xAggregateAsSet, UNO_QUERY)->getWarnings();
> }
> 
>-//------------------------------------------------------------------------------
> void OStatementBase::clearWarnings(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::clearWarnings" );
>@@ -347,7 +330,6 @@ void OStatementBase::clearWarnings(void) throw( SQLException, RuntimeException )
> }
> 
> // ::com::sun::star::util::XCancellable
>-//------------------------------------------------------------------------------
> void OStatementBase::cancel(void) throw( RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::cancel" );
>@@ -359,7 +341,6 @@ void OStatementBase::cancel(void) throw( RuntimeException )
> }
> 
> // XMultipleResults
>-//------------------------------------------------------------------------------
> Reference< XResultSet > SAL_CALL OStatementBase::getResultSet(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getResultSet" );
>@@ -374,7 +355,6 @@ Reference< XResultSet > SAL_CALL OStatementBase::getResultSet(  ) throw(SQLExcep
>     return Reference< XMultipleResults >(m_xAggregateAsSet, UNO_QUERY)->getResultSet();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int32 SAL_CALL OStatementBase::getUpdateCount(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getUpdateCount" );
>@@ -389,7 +369,6 @@ sal_Int32 SAL_CALL OStatementBase::getUpdateCount(  ) throw(SQLException, Runtim
>     return Reference< XMultipleResults >(m_xAggregateAsSet, UNO_QUERY)->getUpdateCount();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL OStatementBase::getMoreResults(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getMoreResults" );
>@@ -409,7 +388,6 @@ sal_Bool SAL_CALL OStatementBase::getMoreResults(  ) throw(SQLException, Runtime
> }
> 
> // XPreparedBatchExecution
>-//------------------------------------------------------------------------------
> void SAL_CALL OStatementBase::addBatch(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::addBatch" );
>@@ -424,7 +402,6 @@ void SAL_CALL OStatementBase::addBatch(  ) throw(SQLException, RuntimeException)
>     Reference< XPreparedBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->addBatch();
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL OStatementBase::clearBatch(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::clearBatch" );
>@@ -439,7 +416,6 @@ void SAL_CALL OStatementBase::clearBatch(  ) throw(SQLException, RuntimeExceptio
>     Reference< XPreparedBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->clearBatch();
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::executeBatch" );
>@@ -456,7 +432,6 @@ Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch(  ) throw(SQLExcepti
> 
>     return Reference< XPreparedBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->executeBatch();
> }
>-// -----------------------------------------------------------------------------
> Reference< XResultSet > SAL_CALL OStatementBase::getGeneratedValues(  ) throw (SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getGeneratedValues" );
>@@ -472,7 +447,6 @@ Reference< XResultSet > SAL_CALL OStatementBase::getGeneratedValues(  ) throw (S
> //************************************************************
> //  OStatement
> //************************************************************
>-//------------------------------------------------------------------------------
> OStatement::OStatement( const Reference< XConnection >& _xConn, const Reference< XInterface > & _xStatement )
>     :OStatementBase( _xConn, _xStatement )
>     ,m_bAttemptedComposerCreation( false )
>@@ -481,26 +455,22 @@ OStatement::OStatement( const Reference< XConnection >& _xConn, const Reference<
>     m_xAggregateStatement.set( _xStatement, UNO_QUERY_THROW );
> }
> 
>-//------------------------------------------------------------------------------
> IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OStatementBase, OStatement_IFACE );
> IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OStatementBase, OStatement_IFACE );
> 
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString OStatement::getImplementationName(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getImplementationName" );
>     return rtl::OUString::createFromAscii("com.sun.star.sdb.OStatement");
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OStatement::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::supportsService" );
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OStatement::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getSupportedServiceNames" );
>@@ -510,7 +480,6 @@ Sequence< ::rtl::OUString > OStatement::getSupportedServiceNames(  ) throw (Runt
> }
> 
> // XStatement
>-//------------------------------------------------------------------------------
> Reference< XResultSet > OStatement::executeQuery( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::executeQuery" );
>@@ -538,7 +507,6 @@ Reference< XResultSet > OStatement::executeQuery( const rtl::OUString& _rSQL ) t
>     return xResultSet;
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int32 OStatement::executeUpdate( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::executeUpdate" );
>@@ -551,7 +519,6 @@ sal_Int32 OStatement::executeUpdate( const rtl::OUString& _rSQL ) throw( SQLExce
>     return m_xAggregateStatement->executeUpdate( sSQL );
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OStatement::execute( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" );
>@@ -563,7 +530,6 @@ sal_Bool OStatement::execute( const rtl::OUString& _rSQL ) throw( SQLException,
>     ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) );
>     return m_xAggregateStatement->execute( sSQL );
> }
>-//------------------------------------------------------------------------------
> void OStatement::addBatch( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" );
>@@ -578,7 +544,6 @@ void OStatement::addBatch( const rtl::OUString& _rSQL ) throw( SQLException, Run
>     ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) );
>     Reference< XBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->addBatch( sSQL );
> }
>-//------------------------------------------------------------------------------
> void OStatement::clearBatch( ) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" );
>@@ -591,7 +556,6 @@ void OStatement::clearBatch( ) throw( SQLException, RuntimeException )
> 
>     Reference< XBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->clearBatch();
> }
>-//------------------------------------------------------------------------------
> Sequence< sal_Int32 > OStatement::executeBatch( ) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" );
>@@ -604,14 +568,12 @@ Sequence< sal_Int32 > OStatement::executeBatch( ) throw( SQLException, RuntimeEx
>     return Reference< XBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->executeBatch( );
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XConnection > OStatement::getConnection(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getConnection" );
>     return Reference< XConnection >( m_xParent, UNO_QUERY );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL OStatement::disposing()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::disposing" );
>@@ -620,7 +582,6 @@ void SAL_CALL OStatement::disposing()
>     m_xAggregateStatement.clear();
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OStatement::impl_doEscapeProcessing_nothrow( const ::rtl::OUString& _rSQL ) const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::impl_doEscapeProcessing_nothrow" );
>@@ -650,7 +611,6 @@ void SAL_CALL OStatement::disposing()
>     return _rSQL;
> }
> 
>-// -----------------------------------------------------------------------------
> bool OStatement::impl_ensureComposer_nothrow() const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::impl_ensureComposer_nothrow" );
>diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
>index 62ca29b..cd5240a 100644
>--- a/dbaccess/source/core/api/table.cxx
>+++ b/dbaccess/source/core/api/table.cxx
>@@ -75,7 +75,6 @@ typedef ::std::map <sal_Int32, OTableColumn*, std::less <sal_Int32> > OColMap;
> //= ODBTable
> //==========================================================================
> DBG_NAME(ODBTable)
>-//--------------------------------------------------------------------------
> ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
>         ,const Reference< XConnection >& _rxConn
>         ,const ::rtl::OUString& _rCatalog
>@@ -97,7 +96,6 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
>     // ODBC driver does not allow more than one statement per connection, and in getFastPropertyValue it's more
>     // likely that it's already used up than it's here.)
> }
>-// -----------------------------------------------------------------------------
> ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
>                    ,const Reference< XConnection >& _rxConn)
>                 throw(SQLException) 
>@@ -107,15 +105,12 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
>     DBG_CTOR(ODBTable, NULL);
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::ODBTable" );
> }
>-// -------------------------------------------------------------------------
> ODBTable::~ODBTable()
> {
>     DBG_DTOR(ODBTable, NULL);
> }
>-// -----------------------------------------------------------------------------
> IMPLEMENT_FORWARD_REFCOUNT(ODBTable,OTable_Base)
> 
>-//--------------------------------------------------------------------------
> OColumn* ODBTable::createColumn(const ::rtl::OUString& _rName) const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createColumn" );
>@@ -139,13 +134,11 @@ OColumn* ODBTable::createColumn(const ::rtl::OUString& _rName) const
> 
>     return pReturn;
> }
>-// -----------------------------------------------------------------------------
> void ODBTable::columnAppended( const Reference< XPropertySet >& /*_rxSourceDescriptor*/ )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::columnAppended" );
>     // not interested in
> }
>-// -----------------------------------------------------------------------------
> void ODBTable::columnDropped(const ::rtl::OUString& _sName)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::columnDropped" );
>@@ -155,7 +148,6 @@ void ODBTable::columnDropped(const ::rtl::OUString& _sName)
>         xDrop->dropByName(_sName);
>     }
> }
>-//--------------------------------------------------------------------------
> Sequence< sal_Int8 > ODBTable::getImplementationId() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getImplementationId" );
>@@ -173,7 +165,6 @@ Sequence< sal_Int8 > ODBTable::getImplementationId() throw (RuntimeException)
> }
> 
> // OComponentHelper
>-//------------------------------------------------------------------------------
> void SAL_CALL ODBTable::disposing()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::disposing" );
>@@ -184,7 +175,6 @@ void SAL_CALL ODBTable::disposing()
>     m_pColumnMediator = NULL;
> }
> 
>-//------------------------------------------------------------------------------
> void ODBTable::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getFastPropertyValue" );
>@@ -195,7 +185,6 @@ void ODBTable::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
> 
>     OTable_Base::getFastPropertyValue(_rValue, _nHandle);
> }
>-// -------------------------------------------------------------------------
> void ODBTable::construct()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::construct" );
>@@ -256,7 +245,6 @@ void ODBTable::construct()
> 
>     refreshColumns();
> }
>-// -----------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* ODBTable::createArrayHelper( sal_Int32 _nId) const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createArrayHelper" );
>@@ -281,15 +269,12 @@ void ODBTable::construct()
>     
>     return new ::cppu::OPropertyArrayHelper(aProps);			
> }
>-// -----------------------------------------------------------------------------																
> ::cppu::IPropertyArrayHelper & SAL_CALL ODBTable::getInfoHelper() 
> {																
>     return *ODBTable_PROP::getArrayHelper(isNew() ? 1 : 0);
> }
>-// -------------------------------------------------------------------------
> // XServiceInfo
> IMPLEMENT_SERVICE_INFO1(ODBTable, "com.sun.star.sdb.dbaccess.ODBTable", SERVICE_SDBCX_TABLE)
>-// -------------------------------------------------------------------------
> Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getInfoHelper" );
>@@ -299,7 +284,6 @@ Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeExcepti
>         return Any();
>     return OTable_Base::queryInterface( rType);
> }
>-// -------------------------------------------------------------------------
> Sequence< Type > SAL_CALL ODBTable::getTypes(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getTypes" );
>@@ -322,7 +306,6 @@ Sequence< Type > SAL_CALL ODBTable::getTypes(  ) throw(RuntimeException)
>     return Sequence< Type >(pTypes, aOwnTypes.size());
> }
> // XRename,
>-//------------------------------------------------------------------------------
> 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" );
>@@ -337,7 +320,6 @@ void SAL_CALL ODBTable::rename( const ::rtl::OUString& _rNewName ) throw(SQLExce
> }
> 
> // XAlterTable,
>-//------------------------------------------------------------------------------
> void SAL_CALL ODBTable::alterColumnByName( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::alterColumnByName" );
>@@ -353,7 +335,6 @@ void SAL_CALL ODBTable::alterColumnByName( const ::rtl::OUString& _rName, const
>     getAlterService()->alterColumnByName(xTable,_rName,_rxDescriptor);
>     m_pColumns->refresh();
> }
>-// -----------------------------------------------------------------------------
> sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getSomething" );
>@@ -365,7 +346,6 @@ sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) thr
> 
>     return nRet;
> }
>-// -----------------------------------------------------------------------------
> Sequence< sal_Int8 > ODBTable::getUnoTunnelImplementationId()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getUnoTunnelImplementationId" );
>@@ -381,13 +361,11 @@ Sequence< sal_Int8 > ODBTable::getUnoTunnelImplementationId()
>     }
>     return pId->getImplementationId();
> }
>-// -----------------------------------------------------------------------------
> Reference< XPropertySet > ODBTable::createColumnDescriptor()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createColumnDescriptor" );
>     return new OTableColumnDescriptor( true );
> }
>-// -----------------------------------------------------------------------------
> sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createColumns" );
>@@ -401,16 +379,13 @@ sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames)
>     pCol->setMediator( m_pColumnMediator.get() );
>     return pCol;
> }
>-// -----------------------------------------------------------------------------
> sdbcx::OCollection* ODBTable::createKeys(const TStringVector& _rNames)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createKeys" );
>     return new connectivity::OKeysHelper(this,m_aMutex,_rNames);
> }
>-// -----------------------------------------------------------------------------
> sdbcx::OCollection* ODBTable::createIndexes(const TStringVector& _rNames)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createIndexes" );
>     return new OIndexes(this,m_aMutex,_rNames,NULL);
> }
>-// -----------------------------------------------------------------------------
>diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
>index ab63265..e6301ed 100644
>--- a/dbaccess/source/core/api/tablecontainer.cxx
>+++ b/dbaccess/source/core/api/tablecontainer.cxx
>@@ -109,7 +109,6 @@ namespace
> //= OTableContainer
> //==========================================================================
> DBG_NAME(OTableContainer)
>-//------------------------------------------------------------------------------
> OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent, 
>                                  ::osl::Mutex& _rMutex,
>                                  const Reference< XConnection >& _xCon,
>@@ -126,7 +125,6 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent,
>     DBG_CTOR(OTableContainer, NULL);
> }
> 
>-//------------------------------------------------------------------------------
> OTableContainer::~OTableContainer()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::OTableContainer" );
>@@ -134,7 +132,6 @@ OTableContainer::~OTableContainer()
>     DBG_DTOR(OTableContainer, NULL);
> }
> 
>-// -----------------------------------------------------------------------------
> void OTableContainer::removeMasterContainerListener()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::removeMasterContainerListener" );
>@@ -149,19 +146,15 @@ void OTableContainer::removeMasterContainerListener()
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OTableContainer::getTableTypeRestriction() const
> {
>     // no restriction at all (other than the ones provided externally)
>     return ::rtl::OUString();
> }
> 
>-// -----------------------------------------------------------------------------
> // XServiceInfo
>-//------------------------------------------------------------------------------
> IMPLEMENT_SERVICE_INFO2(OTableContainer, "com.sun.star.sdb.dbaccess.OTableContainer", SERVICE_SDBCX_CONTAINER, SERVICE_SDBCX_TABLES)
> 
>-// -----------------------------------------------------------------------------
> namespace
> {
> void lcl_createDefintionObject(const ::rtl::OUString& _rName
>@@ -191,9 +184,7 @@ void lcl_createDefintionObject(const ::rtl::OUString& _rName
>             _xColumnDefinitions = xColumnsSupplier->getColumns();		
>     }
> }
>-// -------------------------------------------------------------------------
> }
>-// -------------------------------------------------------------------------
> connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUString& _rName)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::createObject" );
>@@ -265,7 +256,6 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUStr
>     
>     return xRet;
> }
>-// -----------------------------------------------------------------------------
> Reference< XPropertySet > OTableContainer::createDescriptor()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::createDescriptor" );
>@@ -290,7 +280,6 @@ Reference< XPropertySet > OTableContainer::createDescriptor()
>     }
>     return xRet;
> }
>-// -----------------------------------------------------------------------------
> // XAppend
> ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
> {
>@@ -378,7 +367,6 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons
> 
>     return createObject( _rForName );
> }
>-// -------------------------------------------------------------------------
> // XDrop
> void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
> {
>@@ -443,7 +431,6 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElement
>     }
>     m_bInDrop = sal_False;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::elementInserted" );
>@@ -462,12 +449,10 @@ void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) th
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OTableContainer::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::elementRemoved" );
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::elementReplaced" );
>@@ -480,7 +465,6 @@ void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) th
>         renameObject(sOldComposedName,sNewComposedName);
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OTableContainer::disposing()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::disposing" );
>@@ -489,13 +473,11 @@ void SAL_CALL OTableContainer::disposing()
>     m_xTableDefinitions	= NULL;
>     m_pTableMediator = NULL;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OTableContainer::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::disposing" );
> }
> 
>-// -----------------------------------------------------------------------------
> void OTableContainer::addMasterContainerListener()
> {
>     try
>diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
>index 42412aa..3eb343a 100644
>--- a/dbaccess/source/core/api/viewcontainer.cxx
>+++ b/dbaccess/source/core/api/viewcontainer.cxx
>@@ -72,7 +72,6 @@ using namespace ::connectivity::sdbcx;
> //= OViewContainer
> //==========================================================================
> DBG_NAME(OViewContainer)
>-//------------------------------------------------------------------------------
> OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent
>                                  ,::osl::Mutex& _rMutex
>                                  ,const Reference< XConnection >& _xCon
>@@ -86,17 +85,13 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent
>     DBG_CTOR(OViewContainer, NULL);
> }
> 
>-//------------------------------------------------------------------------------
> OViewContainer::~OViewContainer()
> {
>     //	dispose();
>     DBG_DTOR(OViewContainer, NULL);
> }
>-//------------------------------------------------------------------------------
> // XServiceInfo
>-//------------------------------------------------------------------------------
> IMPLEMENT_SERVICE_INFO2(OViewContainer, "com.sun.star.sdb.dbaccess.OViewContainer", SERVICE_SDBCX_CONTAINER, SERVICE_SDBCX_TABLES)
>-// -----------------------------------------------------------------------------
> ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName)
> {
>     ObjectType xProp;
>@@ -122,7 +117,6 @@ ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName)
> 
>     return xProp;
> }
>-// -----------------------------------------------------------------------------
> Reference< XPropertySet > OViewContainer::createDescriptor()
> {
>     Reference< XPropertySet > xRet;
>@@ -137,7 +131,6 @@ Reference< XPropertySet > OViewContainer::createDescriptor()
> 
>     return xRet;
> }
>-// -----------------------------------------------------------------------------
> // XAppend
> ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
> {
>@@ -181,7 +174,6 @@ ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const
> 
>     return createObject( _rForName );
> }
>-// -------------------------------------------------------------------------
> // XDrop
> void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
> {
>@@ -221,7 +213,6 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_rMutex);
>@@ -238,7 +229,6 @@ void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) thr
>             insertElement(sName,createObject(sName));
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_rMutex);
>@@ -258,15 +248,12 @@ void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event ) thro
>         m_bInElementRemoved = false;
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OViewContainer::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (RuntimeException)
> {
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OViewContainer::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException)
> {
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OViewContainer::getTableTypeRestriction() const
> {
>     // no restriction at all (other than the ones provided externally)
>diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
>index 611e6c0..ca94847 100644
>--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
>+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
>@@ -90,7 +90,6 @@ OComponentDefinition_Impl::OComponentDefinition_Impl()
> {
>     DBG_CTOR(OComponentDefinition_Impl,NULL);
> }
>-// -----------------------------------------------------------------------------
> OComponentDefinition_Impl::~OComponentDefinition_Impl()
> {
>     DBG_DTOR(OComponentDefinition_Impl,NULL);    
>@@ -98,9 +97,7 @@ OComponentDefinition_Impl::~OComponentDefinition_Impl()
> //==========================================================================
> //= OComponentDefinition
> //==========================================================================
>-//--------------------------------------------------------------------------
> DBG_NAME(OComponentDefinition)
>-//--------------------------------------------------------------------------
> void OComponentDefinition::registerProperties()
> {
>     m_xColumnPropertyListener = ::comphelper::ImplementationReference<OColumnPropertyListener,XPropertyChangeListener>(new OColumnPropertyListener(this));
>@@ -120,7 +117,6 @@ void OComponentDefinition::registerProperties()
>     }
> }
> 
>-//--------------------------------------------------------------------------
> OComponentDefinition::OComponentDefinition(const Reference< XMultiServiceFactory >& _xORB
>                                            ,const Reference< XInterface >&	_xParentContainer
>                                            ,const TContentPtr& _pImpl
>@@ -132,13 +128,11 @@ OComponentDefinition::OComponentDefinition(const Reference< XMultiServiceFactory
>     DBG_CTOR(OComponentDefinition, NULL);
>     registerProperties();
> }
>-//--------------------------------------------------------------------------
> OComponentDefinition::~OComponentDefinition()
> {
>     DBG_DTOR(OComponentDefinition, NULL);
> }
> 
>-//--------------------------------------------------------------------------
> OComponentDefinition::OComponentDefinition(	const Reference< XInterface >& _rxContainer
>                                        ,const ::rtl::OUString& _rElementName
>                                        ,const Reference< XMultiServiceFactory >& _xORB
>@@ -155,23 +149,19 @@ OComponentDefinition::OComponentDefinition(	const Reference< XInterface >& _rxCo
>     DBG_ASSERT(m_pImpl->m_aProps.aTitle.getLength() != 0, "OComponentDefinition::OComponentDefinition : invalid name !");
> }
> 
>-//--------------------------------------------------------------------------
> IMPLEMENT_IMPLEMENTATION_ID(OComponentDefinition);
> IMPLEMENT_GETTYPES3(OComponentDefinition,ODataSettings,OContentHelper,OComponentDefinition_BASE);
> IMPLEMENT_FORWARD_XINTERFACE3( OComponentDefinition,OContentHelper,ODataSettings,OComponentDefinition_BASE)
>-//--------------------------------------------------------------------------
> ::rtl::OUString OComponentDefinition::getImplementationName_static(  ) throw(RuntimeException)
> {
>     return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.OComponentDefinition"));
> }
> 
>-//--------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OComponentDefinition::getImplementationName(  ) throw(RuntimeException)
> {
>     return getImplementationName_static();
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OComponentDefinition::getSupportedServiceNames_static(  ) throw(RuntimeException)
> {
>     Sequence< ::rtl::OUString > aServices(2);
>@@ -181,18 +171,15 @@ Sequence< ::rtl::OUString > OComponentDefinition::getSupportedServiceNames_stati
>     return aServices;
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames(  ) throw(RuntimeException)
> {
>     return getSupportedServiceNames_static();
> }
>-//------------------------------------------------------------------------------
> Reference< XInterface > OComponentDefinition::Create( const Reference< XComponentContext >& _rxContext )
> {
>     ::comphelper::ComponentContext aContext( _rxContext );
>     return *(new OComponentDefinition( aContext.getLegacyServiceFactory(), NULL, TContentPtr( new OComponentDefinition_Impl ) ) );
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OComponentDefinition::disposing()
> {
>     OContentHelper::disposing();
>@@ -201,26 +188,22 @@ void SAL_CALL OComponentDefinition::disposing()
>     m_xColumnPropertyListener->clear();
>     m_xColumnPropertyListener.dispose();
> }
>-// -----------------------------------------------------------------------------
> IPropertyArrayHelper& OComponentDefinition::getInfoHelper()
> {
>     return *getArrayHelper();
> }
>-//--------------------------------------------------------------------------
> IPropertyArrayHelper* OComponentDefinition::createArrayHelper( ) const
> {
>     Sequence< Property > aProps;
>     describeProperties(aProps);
>     return new OPropertyArrayHelper(aProps);
> }
>-//--------------------------------------------------------------------------
> Reference< XPropertySetInfo > SAL_CALL OComponentDefinition::getPropertySetInfo(  ) throw(RuntimeException)
> {
>     Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
>     return xInfo;
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OComponentDefinition::determineContentType() const
> {
>     return m_bTable
>@@ -228,7 +211,6 @@ Reference< XPropertySetInfo > SAL_CALL OComponentDefinition::getPropertySetInfo(
>         :   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.org.openoffice.DatabaseCommandDefinition" ) );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>@@ -251,7 +233,6 @@ Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeExcepti
>     }
>     return m_pColumns.get();
> }
>-// -----------------------------------------------------------------------------
> OColumn* OComponentDefinition::createColumn(const ::rtl::OUString& _rName) const
> {
>     const OComponentDefinition_Impl& rDefinition( getDefinition() );
>@@ -265,24 +246,20 @@ OColumn* OComponentDefinition::createColumn(const ::rtl::OUString& _rName) const
>         // This here is the last place creating a OTableColumn, and somehow /me thinks it is not needed ...
>     return new OTableColumn( _rName );
> }
>-// -----------------------------------------------------------------------------
> Reference< XPropertySet > OComponentDefinition::createColumnDescriptor()
> {
>     return new OTableColumnDescriptor( true );
> }
>-// -----------------------------------------------------------------------------
> void OComponentDefinition::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
> {
>     ODataSettings::setFastPropertyValue_NoBroadcast(nHandle,rValue);
>     notifyDataSourceModified();
> }
>-// -----------------------------------------------------------------------------
> void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName) 
> {
>     getDefinition().erase( _sName );
>     notifyDataSourceModified();
> }
>-// -----------------------------------------------------------------------------
> void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxSourceDescriptor )
> {
>     ::rtl::OUString sName;
>diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
>index 0968f76..73b585a 100644
>--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
>+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
>@@ -59,18 +59,15 @@ using namespace ::com::sun::star::container;
> using namespace ::comphelper;
> using namespace ::cppu;
> 
>-// -----------------------------------------------------------------------------
> DBG_NAME(OContentHelper_Impl)
> OContentHelper_Impl::OContentHelper_Impl()
> {
>     DBG_CTOR(OContentHelper_Impl,NULL);	
> }
>-// -----------------------------------------------------------------------------
> OContentHelper_Impl::~OContentHelper_Impl()
> {
>     DBG_DTOR(OContentHelper_Impl,NULL);	
> }
>-// -----------------------------------------------------------------------------
> 
> OContentHelper::OContentHelper(const Reference< XMultiServiceFactory >& _xORB
>                                ,const Reference< XInterface >&	_xParentContainer
>@@ -85,7 +82,6 @@ OContentHelper::OContentHelper(const Reference< XMultiServiceFactory >& _xORB
>     ,m_nCommandId(0)
> {
> }
>-//--------------------------------------------------------------------------
> void SAL_CALL OContentHelper::disposing()
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>@@ -96,10 +92,8 @@ void SAL_CALL OContentHelper::disposing()
> 
>     m_xParentContainer = NULL;
> }
>-// -----------------------------------------------------------------------------
> IMPLEMENT_SERVICE_INFO1(OContentHelper,"com.sun.star.comp.sdb.Content","com.sun.star.ucb.Content");
> IMPLEMENT_IMPLEMENTATION_ID(OContentHelper)
>-// -----------------------------------------------------------------------------
> // XContent
> Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier(  ) throw (RuntimeException)
> {
>@@ -109,7 +103,6 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier(  ) throw
>     aIdentifier.append( impl_getHierarchicalName( true ) );
>     return new ::ucbhelper::ContentIdentifier( m_aContext.getLegacyServiceFactory(), aIdentifier.makeStringAndClear() );
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OContentHelper::impl_getHierarchicalName( bool _includingRootContainer ) const
> {
>     ::rtl::OUStringBuffer aHierarchicalName( m_pImpl->m_aProps.aTitle );
>@@ -136,7 +129,6 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier(  ) throw
>     return sHierarchicalName;
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>@@ -148,21 +140,18 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier(  ) throw
> 
>     return *m_pImpl->m_aProps.aContentType;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OContentHelper::addContentEventListener( const Reference< XContentEventListener >& _rxListener ) throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>     if ( _rxListener.is() )
>         m_aContentListeners.addInterface(_rxListener);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OContentHelper::removeContentEventListener( const Reference< XContentEventListener >& _rxListener ) throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>     if (_rxListener.is())
>         m_aContentListeners.removeInterface(_rxListener);
> }
>-// -----------------------------------------------------------------------------
> 
> // XCommandProcessor
> sal_Int32 SAL_CALL OContentHelper::createCommandIdentifier(  ) throw (RuntimeException)
>@@ -171,7 +160,6 @@ sal_Int32 SAL_CALL OContentHelper::createCommandIdentifier(  ) throw (RuntimeExc
>     // Just increase counter on every call to generate an identifier.
>     return ++m_nCommandId;
> }
>-// -----------------------------------------------------------------------------
> Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*CommandId*/, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException)
> {
>     Any aRet;
>@@ -257,11 +245,9 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
> 
>     return aRet;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OContentHelper::abort( sal_Int32 /*CommandId*/ ) throw (RuntimeException)
> {
> }
>-// -----------------------------------------------------------------------------
> 
> // XPropertiesChangeNotifier
> void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< ::rtl::OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException)
>@@ -285,7 +271,6 @@ void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< ::rtl
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< ::rtl::OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>@@ -307,19 +292,16 @@ void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< ::
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> 
> // XPropertyContainer
> void SAL_CALL OContentHelper::addProperty( const ::rtl::OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) 
> {
>     DBG_ERROR( "OContentHelper::addProperty: not implemented!" );
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OContentHelper::removeProperty( const ::rtl::OUString& /*Name*/ ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
> {
>     DBG_ERROR( "OContentHelper::removeProperty: not implemented!" );
> }
>-// -----------------------------------------------------------------------------
> // XInitialization
> void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) throw(Exception, RuntimeException)
> {
>@@ -343,7 +325,6 @@ void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) t
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue >& rValues,const Reference< XCommandEnvironment >& /*xEnv*/ )
> {
>     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
>@@ -455,7 +436,6 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
> 
>     return aRet;
> }
>-// -----------------------------------------------------------------------------
> //=========================================================================
> // static
> Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >& rProperties)
>@@ -538,8 +518,6 @@ Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >&
> 
>     return Reference< XRow >( xRow.get() );
> }
>-// -----------------------------------------------------------------------------
>-// -----------------------------------------------------------------------------
> void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent >& evt ) const
> {
> 
>@@ -617,9 +595,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> // com::sun::star::lang::XUnoTunnel
>-//------------------------------------------------------------------
> sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
> {
>     if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
>@@ -628,7 +604,6 @@ sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId ) throw
>     return 0;
> }
> 
>-// -----------------------------------------------------------------------------
> OContentHelper* OContentHelper::getImplementation( const Reference< XInterface >& _rxComponent )
> {
>     OContentHelper* pContent( NULL );
>@@ -640,20 +615,17 @@ OContentHelper* OContentHelper::getImplementation( const Reference< XInterface >
>     return pContent;
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL OContentHelper::getParent(  ) throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>     return m_xParentContainer;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OContentHelper::setParent( const Reference< XInterface >& _xParent ) throw (NoSupportException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>     m_xParentContainer = _xParent;
> }
> 
>-// -----------------------------------------------------------------------------
> void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify )
> {
>     osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex);
>@@ -682,7 +654,6 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN
>         throw ElementExistException(_sNewName,*this);
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OContentHelper::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException)
> {
>     
>@@ -719,7 +690,6 @@ void SAL_CALL OContentHelper::rename( const ::rtl::OUString& newName ) throw (SQ
>     //	m_pImpl->m_aProps.aTitle = newName;
>     
> }
>-// -----------------------------------------------------------------------------
> void OContentHelper::notifyDataSourceModified()
> {
>     ::dbaccess::notifyDataSourceModified(m_xParentContainer,sal_True);
>diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
>index 9416539..8a319f3 100644
>--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
>+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
>@@ -102,25 +102,21 @@ namespace dbaccess
> //============================================================
> //= VosMutexFacade
> //============================================================
>-//------------------------------------------------------------------------
> VosMutexFacade::VosMutexFacade( ::osl::Mutex& _rMutex )
>     :m_rMutex( _rMutex )
> {
> }
> 
>-//------------------------------------------------------------------------
> void SAL_CALL VosMutexFacade::acquire()
> {
>     m_rMutex.acquire();
> }
> 
>-//------------------------------------------------------------------------
> sal_Bool SAL_CALL VosMutexFacade::tryToAcquire()
> {
>     return m_rMutex.tryToAcquire();
> }
> 
>-//------------------------------------------------------------------------
> void SAL_CALL VosMutexFacade::release()
> {
>     m_rMutex.release();
>@@ -200,7 +196,6 @@ private:
> 
> };
> 
>-//--------------------------------------------------------------------------
> void DocumentStorageAccess::dispose()
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -227,7 +222,6 @@ void DocumentStorageAccess::dispose()
>     m_pModelImplementation = NULL;
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XStorage > DocumentStorageAccess::impl_openSubStorage_nothrow( const ::rtl::OUString& _rStorageName, sal_Int32 _nDesiredMode )
> {
>     OSL_ENSURE( _rStorageName.getLength(),"ODatabaseModelImpl::impl_openSubStorage_nothrow: Invalid storage name!" );
>@@ -261,7 +255,6 @@ Reference< XStorage > DocumentStorageAccess::impl_openSubStorage_nothrow( const
>     return xStorage;
> }
> 
>-//--------------------------------------------------------------------------
> void DocumentStorageAccess::disposeStorages()
> {
>     m_bDisposingSubStorages = true;
>@@ -286,7 +279,6 @@ void DocumentStorageAccess::disposeStorages()
>     m_bDisposingSubStorages = false;
> }
> 
>-//--------------------------------------------------------------------------
> void DocumentStorageAccess::commitStorages() SAL_THROW(( IOException, RuntimeException ))
> {
>     try
>@@ -306,7 +298,6 @@ void DocumentStorageAccess::commitStorages() SAL_THROW(( IOException, RuntimeExc
>     }
> }
> 
>-//--------------------------------------------------------------------------
> bool DocumentStorageAccess::commitEmbeddedStorage( bool _bPreventRootCommits )
> {
>     if ( _bPreventRootCommits )
>@@ -331,7 +322,6 @@ bool DocumentStorageAccess::commitEmbeddedStorage( bool _bPreventRootCommits )
> 
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const ::rtl::OUString& aStorageName, ::sal_Int32 _nDesiredMode ) throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -345,7 +335,6 @@ Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( con
>     return pos->second;
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames(  ) throw (IOException, RuntimeException)
> {
>     Reference< XStorage > xRootStor( m_pModelImplementation->getRootStorage() );
>@@ -366,13 +355,11 @@ Sequence< ::rtl::OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStorag
>         :  Sequence< ::rtl::OUString >( &aNames[0], aNames.size() );
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException)
> {
>     // not interested in
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL DocumentStorageAccess::commited( const css::lang::EventObject& aEvent ) throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -396,19 +383,16 @@ void SAL_CALL DocumentStorageAccess::commited( const css::lang::EventObject& aEv
>     }
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL DocumentStorageAccess::preRevert( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException)
> {
>     // not interested in
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL DocumentStorageAccess::reverted( const css::lang::EventObject& /*aEvent*/ ) throw (RuntimeException)
> {
>     // not interested in
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& Source ) throw ( RuntimeException )
> {
>     OSL_ENSURE( Reference< XStorage >( Source.Source, UNO_QUERY ).is(), "DocumentStorageAccess::disposing: No storage? What's this?" );
>@@ -431,7 +415,6 @@ void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& So
> //= ODatabaseModelImpl
> //============================================================
> DBG_NAME(ODatabaseModelImpl)
>-//--------------------------------------------------------------------------
> ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XMultiServiceFactory >& _rxFactory, ODatabaseContext& _rDBContext )
>             :m_xModel()
>             ,m_xDataSource()
>@@ -464,7 +447,6 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XMultiServiceFactory >&
>     impl_construct_nothrow();
> }
> 
>-//--------------------------------------------------------------------------
> ODatabaseModelImpl::ODatabaseModelImpl(
>                     const ::rtl::OUString& _rRegistrationName,
>                     const Reference< XMultiServiceFactory >& _rxFactory,
>@@ -498,13 +480,11 @@ ODatabaseModelImpl::ODatabaseModelImpl(
>     impl_construct_nothrow();
> }
> 
>-//--------------------------------------------------------------------------
> ODatabaseModelImpl::~ODatabaseModelImpl()
> {
>     DBG_DTOR(ODatabaseModelImpl,NULL);
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::impl_construct_nothrow()
> {
>     // create the property bag to hold the settings (also known as "Info" property)
>@@ -565,7 +545,6 @@ void ODatabaseModelImpl::impl_construct_nothrow()
>     m_pDBContext->appendAtTerminateListener(*this);
> }
> 
>-// -----------------------------------------------------------------------------
> namespace
> {
>     // .........................................................................
>@@ -647,7 +626,6 @@ namespace
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContainerStorage, const ::rtl::OUString& _rPersistentName )
> {
>     OSL_PRECOND( _rxContainerStorage.is(), "ODatabaseModelImpl::objectHasMacros: this will crash!" );
>@@ -670,7 +648,6 @@ bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContai
>     return bHasMacros;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::reset()
> {
>     m_bReadOnly = sal_False;
>@@ -684,7 +661,6 @@ void ODatabaseModelImpl::reset()
>         m_pStorageAccess = NULL;
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseModelImpl::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException)
> {
>     Reference<XConnection> xCon(Source.Source,UNO_QUERY);
>@@ -710,7 +686,6 @@ void SAL_CALL ODatabaseModelImpl::disposing( const ::com::sun::star::lang::Event
>         OSL_ENSURE( false, "ODatabaseModelImpl::disposing: where does this come from?" );
>     }
> }
>-//------------------------------------------------------------------------------
> void ODatabaseModelImpl::clearConnections()
> {
>     OWeakConnectionArray aConnections;
>@@ -737,7 +712,6 @@ void ODatabaseModelImpl::clearConnections()
>     m_pSharedConnectionManager = NULL;
>     m_xSharedConnectionManager = NULL;
> }
>-//------------------------------------------------------------------------------
> void ODatabaseModelImpl::dispose()
> {
>     // dispose the data source and the model
>@@ -792,7 +766,6 @@ void ODatabaseModelImpl::dispose()
>         m_pStorageAccess = NULL;
>     }
> }
>-// -----------------------------------------------------------------------------
> const Reference< XNumberFormatsSupplier > & ODatabaseModelImpl::getNumberFormatsSupplier()
> {
>     if (!m_xNumberFormatsSupplier.is())
>@@ -809,14 +782,12 @@ const Reference< XNumberFormatsSupplier > & ODatabaseModelImpl::getNumberFormats
>     return m_xNumberFormatsSupplier;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::setDocFileLocation( const ::rtl::OUString& i_rLoadedFrom )
> {
>     ENSURE_OR_THROW( i_rLoadedFrom.getLength(), "invalid URL" );
>     m_sDocFileLocation = i_rLoadedFrom;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, const Sequence< PropertyValue >& _rArgs )
> {
>     ENSURE_OR_THROW( i_rDocumentURL.getLength(), "invalid URL" );
>@@ -841,7 +812,6 @@ void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, con
>     impl_switchToLogicalURL( i_rDocumentURL );
> }
> 
>-// -----------------------------------------------------------------------------
> ::comphelper::NamedValueCollection ODatabaseModelImpl::stripLoadArguments( const ::comphelper::NamedValueCollection& _rArguments )
> {
>     OSL_ENSURE( !_rArguments.has( "Model" ), "ODatabaseModelImpl::stripLoadArguments: this is suspicious (1)!" );
>@@ -853,18 +823,15 @@ void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, con
>     return aMutableArgs;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::disposeStorages() SAL_THROW(())
> {
>     getDocumentStorageAccess()->disposeStorages();
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XSingleServiceFactory > ODatabaseModelImpl::createStorageFactory() const
> {
>     return Reference< XSingleServiceFactory >( m_aContext.createComponent( "com.sun.star.embed.StorageFactory" ), UNO_QUERY_THROW );
> }
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::commitRootStorage()
> {
>     Reference< XStorage > xStorage( getOrCreateRootStorage() );
>@@ -875,7 +842,6 @@ void ODatabaseModelImpl::commitRootStorage()
>     OSL_ENSURE( bSuccess || !xStorage.is(),
>         "ODatabaseModelImpl::commitRootStorage: could commit the storage!" );
> }
>-// -----------------------------------------------------------------------------
> Reference< XStorage > ODatabaseModelImpl::getOrCreateRootStorage()
> {
>     if ( !m_xDocumentStorage.is() )
>@@ -924,7 +890,6 @@ Reference< XStorage > ODatabaseModelImpl::getOrCreateRootStorage()
>     }
>     return m_xDocumentStorage.getTyped();
> }
>-// -----------------------------------------------------------------------------
> DocumentStorageAccess* ODatabaseModelImpl::getDocumentStorageAccess()
> {
>     if ( !m_pStorageAccess )
>@@ -935,7 +900,6 @@ DocumentStorageAccess* ODatabaseModelImpl::getDocumentStorageAccess()
>     return m_pStorageAccess;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::modelIsDisposing( const bool _wasInitialized, ResetModelAccess )
> {
>     m_xModel = Reference< XModel >();
>@@ -949,19 +913,16 @@ void ODatabaseModelImpl::modelIsDisposing( const bool _wasInitialized, ResetMode
>     m_bDocumentInitialized = _wasInitialized;
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XDocumentSubStorageSupplier > ODatabaseModelImpl::getDocumentSubStorageSupplier()
> {
>     return getDocumentStorageAccess();
> }
> 
>-// -----------------------------------------------------------------------------
> bool ODatabaseModelImpl::commitEmbeddedStorage( bool _bPreventRootCommits )
> {
>     return getDocumentStorageAccess()->commitEmbeddedStorage( _bPreventRootCommits );
> }
> 
>-// -----------------------------------------------------------------------------
> bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference< XStorage >& _rxStorage ) SAL_THROW(())
> {
>     bool bSuccess = false;
>@@ -975,7 +936,6 @@ bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
>     }
>     return bSuccess;
> }
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::setModified( sal_Bool _bModified )
> {
>     if ( isModifyLocked() )
>@@ -995,7 +955,6 @@ void ODatabaseModelImpl::setModified( sal_Bool _bModified )
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> Reference<XDataSource> ODatabaseModelImpl::getOrCreateDataSource()
> {
>     Reference<XDataSource> xDs = m_xDataSource;
>@@ -1006,12 +965,10 @@ Reference<XDataSource> ODatabaseModelImpl::getOrCreateDataSource()
>     }
>     return xDs;
> }
>-// -----------------------------------------------------------------------------
> Reference< XModel> ODatabaseModelImpl::getModel_noCreate() const
> {
>     return m_xModel;
> }
>-// -----------------------------------------------------------------------------
> Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership( bool _bInitialize )
> {
>     Reference< XModel > xModel( m_xModel );
>@@ -1061,12 +1018,10 @@ Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership( bool _b
>     }
>     return xModel;
> }
>-// -----------------------------------------------------------------------------
> oslInterlockedCount SAL_CALL ODatabaseModelImpl::acquire()
> {
>     return osl_incrementInterlockedCount(&m_refCount);
> }
>-// -----------------------------------------------------------------------------
> oslInterlockedCount SAL_CALL ODatabaseModelImpl::release()
> {
>     if ( osl_decrementInterlockedCount(&m_refCount) == 0 )
>@@ -1081,19 +1036,16 @@ oslInterlockedCount SAL_CALL ODatabaseModelImpl::release()
>     }
>     return m_refCount;
> }
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::commitStorages() SAL_THROW(( IOException, RuntimeException ))
> {
>     getDocumentStorageAccess()->commitStorages();
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XStorage > ODatabaseModelImpl::getStorage( const ObjectType _eType, const sal_Int32 _nDesiredMode )
> {
>     return getDocumentStorageAccess()->getDocumentSubStorage( getObjectContainerStorageName( _eType ), _nDesiredMode );
> }
> 
>-// -----------------------------------------------------------------------------
> const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings()
> {
>     static const AsciiPropertyValue aKnownSettings[] =
>@@ -1173,7 +1125,6 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings()
>     return aKnownSettings;
> }
> 
>-// -----------------------------------------------------------------------------
> TContentPtr& ODatabaseModelImpl::getObjectContainer( ObjectType _eType )
> {
>     OSL_PRECOND( _eType >= E_FORM && _eType <= E_TABLE, "ODatabaseModelImpl::getObjectContainer: illegal index!" );
>@@ -1188,20 +1139,17 @@ TContentPtr& ODatabaseModelImpl::getObjectContainer( ObjectType _eType )
>     return rContentPtr;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::revokeDataSource() const
> {
>     if ( m_pDBContext && m_sDocumentURL.getLength() )
>         m_pDBContext->revokeDatabaseDocument( *this );
> }
> 
>-// -----------------------------------------------------------------------------
> bool ODatabaseModelImpl::adjustMacroMode_AutoReject()
> {
>     return m_aMacroMode.adjustMacroMode( NULL );
> }
> 
>-// -----------------------------------------------------------------------------
> bool ODatabaseModelImpl::checkMacrosOnLoading()
> {
>     Reference< XInteractionHandler > xInteraction;
>@@ -1209,13 +1157,11 @@ bool ODatabaseModelImpl::checkMacrosOnLoading()
>     return m_aMacroMode.checkMacrosOnLoading( xInteraction );
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::resetMacroExecutionMode()
> {
>     m_aMacroMode = ::sfx2::DocumentMacroMode( *this );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XStorageBasedLibraryContainer > ODatabaseModelImpl::getLibraryContainer( bool _bScript )
> {
>     Reference< XStorageBasedLibraryContainer >& rxContainer( _bScript ? m_xBasicLibraries : m_xDialogLibraries );
>@@ -1251,7 +1197,6 @@ Reference< XStorageBasedLibraryContainer > ODatabaseModelImpl::getLibraryContain
>     return rxContainer;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::storeLibraryContainersTo( const Reference< XStorage >& _rxToRootStorage )
> {
>     if ( m_xBasicLibraries.is() )
>@@ -1261,7 +1206,6 @@ void ODatabaseModelImpl::storeLibraryContainersTo( const Reference< XStorage >&
>         m_xDialogLibraries->storeLibrariesToStorage( _rxToRootStorage );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XStorage > ODatabaseModelImpl::switchToStorage( const Reference< XStorage >& _rxNewRootStorage )
> {
>     if ( !_rxNewRootStorage.is() )
>@@ -1270,7 +1214,6 @@ Reference< XStorage > ODatabaseModelImpl::switchToStorage( const Reference< XSto
>     return impl_switchToStorage_throw( _rxNewRootStorage );
> }
> 
>-// -----------------------------------------------------------------------------
> namespace
> {
>     void lcl_modifyListening( ::sfx2::IModifiableDocument& _rDocument,
>@@ -1299,7 +1242,6 @@ namespace
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> namespace
> {
>     static void lcl_rebaseScriptStorage_throw( const Reference< XStorageBasedLibraryContainer >& _rxContainer,
>@@ -1315,7 +1257,6 @@ namespace
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XStorage > ODatabaseModelImpl::impl_switchToStorage_throw( const Reference< XStorage >& _rxNewRootStorage )
> {
>     // stop listening for modifications at the old storage
>@@ -1337,7 +1278,6 @@ Reference< XStorage > ODatabaseModelImpl::impl_switchToStorage_throw( const Refe
>     return m_xDocumentStorage.getTyped();
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::impl_switchToLogicalURL( const ::rtl::OUString& i_rDocumentURL )
> {
>     if ( i_rDocumentURL == m_sDocumentURL )
>@@ -1374,13 +1314,11 @@ void ODatabaseModelImpl::impl_switchToLogicalURL( const ::rtl::OUString& i_rDocu
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString ODatabaseModelImpl::getObjectContainerStorageName( const ObjectType _eType )
> {
>     return lcl_getContainerStorageName_throw( _eType );
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Int16 ODatabaseModelImpl::getCurrentMacroExecMode() const
> {
>     sal_Int16 nCurrentMode = MacroExecMode::NEVER_EXECUTE;
>@@ -1395,14 +1333,12 @@ sal_Int16 ODatabaseModelImpl::getCurrentMacroExecMode() const
>     return nCurrentMode;
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ODatabaseModelImpl::setCurrentMacroExecMode( sal_uInt16 nMacroMode )
> {
>     m_aMediaDescriptor.put( "MacroExecutionMode", nMacroMode );
>     return sal_True;
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString ODatabaseModelImpl::getDocumentLocation() const
> {
>     return getURL();
>@@ -1414,7 +1350,6 @@ sal_Bool ODatabaseModelImpl::setCurrentMacroExecMode( sal_uInt16 nMacroMode )
>     // this folder is considered to be secure. So, the document URL needs to be used to decide about the security.
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XStorage > ODatabaseModelImpl::getZipStorageToSign()
> {
>     // we do not support signing the scripting storages, so we're allowed to
>@@ -1422,7 +1357,6 @@ Reference< XStorage > ODatabaseModelImpl::getZipStorageToSign()
>     return Reference< XStorage >();
> }
> 
>-// -----------------------------------------------------------------------------
> ODatabaseModelImpl::EmbeddedMacros ODatabaseModelImpl::determineEmbeddedMacros()
> {
>     if ( !m_aEmbeddedMacros )
>@@ -1445,53 +1379,45 @@ ODatabaseModelImpl::EmbeddedMacros ODatabaseModelImpl::determineEmbeddedMacros()
>     return *m_aEmbeddedMacros;
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ODatabaseModelImpl::documentStorageHasMacros() const
> {
>     const_cast< ODatabaseModelImpl* >( this )->determineEmbeddedMacros();
>     return ( *m_aEmbeddedMacros != eNoMacros );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XEmbeddedScripts > ODatabaseModelImpl::getEmbeddedDocumentScripts() const
> {
>     return Reference< XEmbeddedScripts >( getModel_noCreate(), UNO_QUERY );
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Int16 ODatabaseModelImpl::getScriptingSignatureState()
> {
>     // no support for signatures at the moment
>     return SIGNATURESTATE_NOSIGNATURES;
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ODatabaseModelImpl::hasTrustedScriptingSignature( sal_Bool /*bAllowUIToAddAuthor*/ )
> {
>     // no support for signatures at the moment
>     return sal_False;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::showBrokenSignatureWarning( const Reference< XInteractionHandler >& /*_rxInteraction*/ ) const
> {
>     OSL_ENSURE( false, "ODatabaseModelImpl::showBrokenSignatureWarning: signatures can't be broken - we do not support them!" );
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseModelImpl::storageIsModified()
> {
>     setModified( sal_True );
> }
> 
>-// -----------------------------------------------------------------------------
> ModelDependentComponent::ModelDependentComponent( const ::rtl::Reference< ODatabaseModelImpl >& _model )
>     :m_pImpl( _model )
>     ,m_aMutex( _model->getSharedMutex() )
> {
> }
> 
>-// -----------------------------------------------------------------------------
> ModelDependentComponent::~ModelDependentComponent()
> {
> }
>diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx
>index ad83cdc..c529cc1 100644
>--- a/dbaccess/source/core/dataaccess/SharedConnection.cxx
>+++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx
>@@ -47,18 +47,15 @@ OSharedConnection::OSharedConnection(Reference< XAggregation >& _rxProxyConnecti
>     DBG_CTOR(OSharedConnection,NULL);	
>     setDelegation(_rxProxyConnection,m_refCount);
> }
>-// -----------------------------------------------------------------------------
> OSharedConnection::~OSharedConnection()
> {
>     DBG_DTOR(OSharedConnection,NULL);	
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OSharedConnection::disposing(void)
> {
>     OSharedConnection_BASE::disposing();
>     OConnectionWrapper::disposing();
> }
>-// -----------------------------------------------------------------------------
> Reference< XStatement > SAL_CALL OSharedConnection::createStatement(  ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -67,7 +64,6 @@ Reference< XStatement > SAL_CALL OSharedConnection::createStatement(  ) throw(SQ
> 
>     return m_xConnection->createStatement();
> }
>-// --------------------------------------------------------------------------------
> Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -76,7 +72,6 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( co
> 
>     return m_xConnection->prepareStatement(sql);
> }
>-// --------------------------------------------------------------------------------
> Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -85,7 +80,6 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const :
> 
>     return m_xConnection->prepareCall(sql);
> }
>-// --------------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OSharedConnection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -94,7 +88,6 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const :
> 
>     return m_xConnection->nativeSQL(sql);
> }
>-// --------------------------------------------------------------------------------
> sal_Bool SAL_CALL OSharedConnection::getAutoCommit(  ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -103,7 +96,6 @@ sal_Bool SAL_CALL OSharedConnection::getAutoCommit(  ) throw(SQLException, Runti
> 
>     return m_xConnection->getAutoCommit();
> }
>-// --------------------------------------------------------------------------------
> void SAL_CALL OSharedConnection::commit(  ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -112,7 +104,6 @@ void SAL_CALL OSharedConnection::commit(  ) throw(SQLException, RuntimeException
> 
>     m_xConnection->commit();
> }
>-// --------------------------------------------------------------------------------
> void SAL_CALL OSharedConnection::rollback(  ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -121,14 +112,12 @@ void SAL_CALL OSharedConnection::rollback(  ) throw(SQLException, RuntimeExcepti
> 
>     m_xConnection->rollback();
> }
>-// --------------------------------------------------------------------------------
> sal_Bool SAL_CALL OSharedConnection::isClosed(  ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>     
>     return m_xConnection->isClosed();
> }
>-// --------------------------------------------------------------------------------
> Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData(  ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -137,7 +126,6 @@ Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData(  ) throw
> 
>     return m_xConnection->getMetaData();
> }
>-// --------------------------------------------------------------------------------
> sal_Bool SAL_CALL OSharedConnection::isReadOnly(  ) throw(SQLException, RuntimeException)
> {	
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -146,7 +134,6 @@ sal_Bool SAL_CALL OSharedConnection::isReadOnly(  ) throw(SQLException, RuntimeE
> 
>     return m_xConnection->isReadOnly();
> }
>-// --------------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OSharedConnection::getCatalog(  ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -155,7 +142,6 @@ sal_Bool SAL_CALL OSharedConnection::isReadOnly(  ) throw(SQLException, RuntimeE
> 
>     return m_xConnection->getCatalog();
> }
>-// --------------------------------------------------------------------------------
> sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -164,7 +150,6 @@ sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation(  ) throw(SQLExcep
> 
>     return m_xConnection->getTransactionIsolation();
> }
>-// --------------------------------------------------------------------------------
> Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OSharedConnection::getTypeMap(  ) throw(SQLException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -173,7 +158,6 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OSharedConnection
> 
>     return m_xConnection->getTypeMap();
> }
>-// -----------------------------------------------------------------------------
> 
> //........................................................................
> }	// namespace dbaccess
>diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx
>index 8f7ca35..d8d4177 100644
>--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
>+++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx
>@@ -84,7 +84,6 @@ namespace dbaccess
>                 aReturn = OSharedConnection_BASE2::queryInterface(_rType);
>             return aReturn;
>         }
>-        // --------------------------------------------------------------------------------
>         // XCloseable
>         virtual void SAL_CALL close(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
>         {
>diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
>index 7d14456..dd577c3 100644
>--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
>+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
>@@ -58,7 +58,6 @@ namespace dbaccess
> //= OBookmarkContainer
> //==========================================================================
> DBG_NAME(OBookmarkContainer)
>-//--------------------------------------------------------------------------
> OBookmarkContainer::OBookmarkContainer(OWeakObject& _rParent, Mutex& _rMutex)
>     :m_rParent(_rParent)
>     ,m_aContainerListeners(_rMutex)
>@@ -67,7 +66,6 @@ OBookmarkContainer::OBookmarkContainer(OWeakObject& _rParent, Mutex& _rMutex)
>     DBG_CTOR(OBookmarkContainer, NULL);
> }
> 
>-//--------------------------------------------------------------------------
> void OBookmarkContainer::dispose()
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -81,32 +79,27 @@ void OBookmarkContainer::dispose()
>     m_aBookmarks.clear();
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OBookmarkContainer::acquire(  ) throw()
> {
>     m_rParent.acquire();
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OBookmarkContainer::release(  ) throw()
> {
>     m_rParent.release();
> }
> 
>-//--------------------------------------------------------------------------
> OBookmarkContainer::~OBookmarkContainer()
> {
>     DBG_DTOR(OBookmarkContainer, NULL);
> }
> 
> // XServiceInfo
>-//--------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OBookmarkContainer::getImplementationName(  ) throw(RuntimeException)
> {
>     return ::rtl::OUString::createFromAscii("com.sun.star.comp.dba.OBookmarkContainer");
> }
> 
>-//--------------------------------------------------------------------------
> sal_Bool SAL_CALL OBookmarkContainer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -114,7 +107,6 @@ sal_Bool SAL_CALL OBookmarkContainer::supportsService( const ::rtl::OUString& _r
>     return findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getSupportedServiceNames(  ) throw(RuntimeException)
> {
>     Sequence< ::rtl::OUString > aReturn(1);
>@@ -123,7 +115,6 @@ Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getSupportedServiceName
> }
> 
> // XNameContainer
>-//--------------------------------------------------------------------------
> void SAL_CALL OBookmarkContainer::insertByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -153,7 +144,6 @@ void SAL_CALL OBookmarkContainer::insertByName( const ::rtl::OUString& _rName, c
>     }
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OBookmarkContainer::removeByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
> {
>     ::rtl::OUString sOldBookmark;
>@@ -186,7 +176,6 @@ void SAL_CALL OBookmarkContainer::removeByName( const ::rtl::OUString& _rName )
> }
> 
> // XNameReplace
>-//--------------------------------------------------------------------------
> void SAL_CALL OBookmarkContainer::replaceByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
> {
>     ClearableMutexGuard aGuard(m_rMutex);
>@@ -222,7 +211,6 @@ void SAL_CALL OBookmarkContainer::replaceByName( const ::rtl::OUString& _rName,
>     }
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OBookmarkContainer::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -230,7 +218,6 @@ void SAL_CALL OBookmarkContainer::addContainerListener( const Reference< XContai
>         m_aContainerListeners.addInterface(_rxListener);
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OBookmarkContainer::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -239,7 +226,6 @@ void SAL_CALL OBookmarkContainer::removeContainerListener( const Reference< XCon
> }
> 
> // XElementAccess
>-//--------------------------------------------------------------------------
> Type SAL_CALL OBookmarkContainer::getElementType( ) throw (RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -247,7 +233,6 @@ Type SAL_CALL OBookmarkContainer::getElementType( ) throw (RuntimeException)
>     return ::getCppuType( static_cast< ::rtl::OUString* >(NULL) );
> }
> 
>-//--------------------------------------------------------------------------
> sal_Bool SAL_CALL OBookmarkContainer::hasElements( ) throw (RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -256,7 +241,6 @@ sal_Bool SAL_CALL OBookmarkContainer::hasElements( ) throw (RuntimeException)
> }
> 
> // XEnumerationAccess
>-//--------------------------------------------------------------------------
> Reference< XEnumeration > SAL_CALL OBookmarkContainer::createEnumeration(  ) throw(RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -264,7 +248,6 @@ Reference< XEnumeration > SAL_CALL OBookmarkContainer::createEnumeration(  ) thr
>     return new ::comphelper::OEnumerationByIndex(static_cast<XIndexAccess*>(this));
> }
> 
>-//--------------------------------------------------------------------------
> // XIndexAccess
> sal_Int32 SAL_CALL OBookmarkContainer::getCount(  ) throw(RuntimeException)
> {
>@@ -273,7 +256,6 @@ sal_Int32 SAL_CALL OBookmarkContainer::getCount(  ) throw(RuntimeException)
>     return m_aBookmarks.size();
> }
> 
>-//--------------------------------------------------------------------------
> Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -285,7 +267,6 @@ Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutO
>     return makeAny(m_aBookmarksIndexed[_nIndex]->second);
> }
> 
>-//--------------------------------------------------------------------------
> Any SAL_CALL OBookmarkContainer::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -297,7 +278,6 @@ Any SAL_CALL OBookmarkContainer::getByName( const ::rtl::OUString& _rName ) thro
>     return makeAny(m_aBookmarks[_rName]);
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames(  ) throw(RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -317,7 +297,6 @@ Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames(  ) thr
>     return aNames;
> }
> 
>-//--------------------------------------------------------------------------
> sal_Bool SAL_CALL OBookmarkContainer::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -326,7 +305,6 @@ sal_Bool SAL_CALL OBookmarkContainer::hasByName( const ::rtl::OUString& _rName )
>     return checkExistence(_rName);
> }
> 
>-//--------------------------------------------------------------------------
> void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -359,7 +337,6 @@ void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName)
>     m_aBookmarks.erase(aMapPos);
> }
> 
>-//--------------------------------------------------------------------------
> void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl::OUString& _rDocumentLocation)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -368,7 +345,6 @@ void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl::
>     m_aBookmarksIndexed.push_back(m_aBookmarks.insert(	MapString2String::value_type(_rName,_rDocumentLocation)).first);
> }
> 
>-//--------------------------------------------------------------------------
> void OBookmarkContainer::implReplace(const ::rtl::OUString& _rName, const ::rtl::OUString& _rNewLink)
> {
>     MutexGuard aGuard(m_rMutex);
>@@ -377,18 +353,15 @@ void OBookmarkContainer::implReplace(const ::rtl::OUString& _rName, const ::rtl:
>     m_aBookmarks[_rName] = _rNewLink;
> }
> 
>-//--------------------------------------------------------------------------
> void OBookmarkContainer::checkValid(sal_Bool /*_bIntendWriteAccess*/) const throw (RuntimeException, DisposedException)
> {
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL OBookmarkContainer::getParent(  ) throw (RuntimeException)
> {
>     return m_rParent;
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Parent*/ ) throw (NoSupportException, RuntimeException)
> {
>     throw NoSupportException();
>diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
>index 69a9bff..cf0bfc4 100644
>--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
>+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
>@@ -168,7 +168,6 @@ protected:
> 
> };
> 
>-//--------------------------------------------------------------------------
> inline	sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName)
> {
>     return m_aBookmarks.find(_rName) != m_aBookmarks.end();
>diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx
>index 4d09038..3744b0b 100644
>--- a/dbaccess/source/core/dataaccess/commandcontainer.cxx
>+++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx
>@@ -52,7 +52,6 @@ namespace dbaccess
> //= OCommandContainer
> //==========================================================================
> DBG_NAME(OCommandContainer)
>-//--------------------------------------------------------------------------
> OCommandContainer::OCommandContainer( const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB
>                                      ,const Reference< XInterface >&	_xParentContainer
>                                      ,const TContentPtr& _pImpl
>@@ -63,15 +62,12 @@ OCommandContainer::OCommandContainer( const Reference< ::com::sun::star::lang::X
> {
>     DBG_CTOR(OCommandContainer, NULL);
> }
>-//--------------------------------------------------------------------------
> OCommandContainer::~OCommandContainer()
> {
>     DBG_DTOR(OCommandContainer, NULL);
> }
>-// -----------------------------------------------------------------------------
> IMPLEMENT_FORWARD_XINTERFACE2( OCommandContainer,ODefinitionContainer,OCommandContainer_BASE)
> IMPLEMENT_TYPEPROVIDER2(OCommandContainer,ODefinitionContainer,OCommandContainer_BASE);
>-//--------------------------------------------------------------------------
> Reference< XContent > OCommandContainer::createObject( const ::rtl::OUString& _rName)
> {
>     const ODefinitionContainer_Impl& rDefinitions( getDefinitions() );
>@@ -83,19 +79,16 @@ Reference< XContent > OCommandContainer::createObject( const ::rtl::OUString& _r
>     return new OCommandDefinition( *this, _rName, m_aContext.getLegacyServiceFactory(), pElementContent );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL OCommandContainer::createInstanceWithArguments(const Sequence< Any >& /*aArguments*/ ) throw (Exception, RuntimeException)
> {
>     return createInstance( );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) throw (Exception, RuntimeException)
> {
>     return m_aContext.createComponent( (::rtl::OUString)( m_bTables ? SERVICE_SDB_TABLEDEFINITION : SERVICE_SDB_COMMAND_DEFINITION ) );
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString OCommandContainer::determineContentType() const
> {
>     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.org.openoffice.DatabaseCommandDefinitionContainer" ) );
>diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
>index ec3729c..f95b470 100644
>--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
>+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
>@@ -62,9 +62,7 @@ extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition()
>     static ::dba::OAutoRegistration< OCommandDefinition > aAutoRegistration;
> }
> 
>-//--------------------------------------------------------------------------
> DBG_NAME(OCommandDefinition)
>-//--------------------------------------------------------------------------
> void OCommandDefinition::registerProperties()
> {
>     OCommandDefinition_Impl& rCommandDefinition( getCommandDefinition() );
>@@ -86,7 +84,6 @@ void OCommandDefinition::registerProperties()
>                     &rCommandDefinition.m_aLayoutInformation, ::getCppuType(&rCommandDefinition.m_aLayoutInformation));
> }
> 
>-//--------------------------------------------------------------------------
> OCommandDefinition::OCommandDefinition(const Reference< XMultiServiceFactory >& _xORB
>                                        ,const Reference< XInterface >& _rxContainer
>                                        ,const TContentPtr& _pImpl) 
>@@ -95,13 +92,11 @@ OCommandDefinition::OCommandDefinition(const Reference< XMultiServiceFactory >&
>     DBG_CTOR(OCommandDefinition, NULL);
>     registerProperties();
> }
>-//--------------------------------------------------------------------------
> OCommandDefinition::~OCommandDefinition()
> {
>     DBG_DTOR(OCommandDefinition, NULL);
> }
> 
>-//--------------------------------------------------------------------------
> OCommandDefinition::OCommandDefinition(	const Reference< XInterface >& _rxContainer
>                                        ,const ::rtl::OUString& _rElementName
>                                        ,const Reference< XMultiServiceFactory >& _xORB
>@@ -112,24 +107,20 @@ OCommandDefinition::OCommandDefinition(	const Reference< XInterface >& _rxContai
>     registerProperties();
> }
> 
>-//--------------------------------------------------------------------------
> IMPLEMENT_IMPLEMENTATION_ID(OCommandDefinition);
> IMPLEMENT_GETTYPES2(OCommandDefinition,OCommandDefinition_Base,OComponentDefinition);
> IMPLEMENT_FORWARD_XINTERFACE2( OCommandDefinition,OComponentDefinition,OCommandDefinition_Base)
> IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2(OCommandDefinition,OCommandDefinition_PROP)
>-//--------------------------------------------------------------------------
> ::rtl::OUString OCommandDefinition::getImplementationName_static(  ) throw(RuntimeException)
> {
>     return ::rtl::OUString::createFromAscii("com.sun.star.comp.dba.OCommandDefinition");
> }
> 
>-//--------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL OCommandDefinition::getImplementationName(  ) throw(RuntimeException)
> {
>     return getImplementationName_static();
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OCommandDefinition::getSupportedServiceNames_static(  ) throw(RuntimeException)
> {
>     Sequence< ::rtl::OUString > aServices(3);
>@@ -139,20 +130,17 @@ Sequence< ::rtl::OUString > OCommandDefinition::getSupportedServiceNames_static(
>     return aServices;
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL OCommandDefinition::getSupportedServiceNames(  ) throw(RuntimeException)
> {
>     return getSupportedServiceNames_static();
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XInterface > OCommandDefinition::Create(const Reference< XComponentContext >& _rxContext)
> {
>     ::comphelper::ComponentContext aContext( _rxContext );
>     return *(new OCommandDefinition( aContext.getLegacyServiceFactory(), NULL, TContentPtr( new OCommandDefinition_Impl ) ) );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL OCommandDefinition::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException)
> {
>     try
>@@ -172,7 +160,6 @@ void SAL_CALL OCommandDefinition::rename( const ::rtl::OUString& newName ) throw
>         throw ElementExistException(newName,*this);
>     }
> }
>-// -----------------------------------------------------------------------------
> //........................................................................
> }	// namespace dbaccess
> //........................................................................
>diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
>index 00df5b9..4000bd1 100644
>--- a/dbaccess/source/core/dataaccess/connection.cxx
>+++ b/dbaccess/source/core/dataaccess/connection.cxx
>@@ -86,20 +86,17 @@ namespace dbaccess
> 
> //==========================================================================
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString OConnection::getImplementationName(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getImplementationName" );
>     return rtl::OUString::createFromAscii("com.sun.star.comp.dbaccess.Connection");
> }
>-//------------------------------------------------------------------------------
> sal_Bool OConnection::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::supportsService" );
>     return findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > OConnection::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getSupportedServiceNames" );
>@@ -116,7 +113,6 @@ Sequence< ::rtl::OUString > OConnection::getSupportedServiceNames(  ) throw (Run
> }
> 
> // XCloseable
>-//------------------------------------------------------------------------------
> void OConnection::close(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::close" );
>@@ -124,7 +120,6 @@ void OConnection::close(void) throw( SQLException, RuntimeException )
>     dispose();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OConnection::isClosed(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::isClosed" );
>@@ -133,7 +128,6 @@ sal_Bool OConnection::isClosed(void) throw( SQLException, RuntimeException )
> }
> 
> // XConnection
>-//------------------------------------------------------------------------------
> Reference< XStatement >  OConnection::createStatement(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createStatement" );
>@@ -149,7 +143,6 @@ Reference< XStatement >  OConnection::createStatement(void) throw( SQLException,
>     }
>     return xStatement;
> }
>-//------------------------------------------------------------------------------
> Reference< XPreparedStatement >  OConnection::prepareStatement(const rtl::OUString& sql) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::prepareStatement" );
>@@ -167,7 +160,6 @@ Reference< XPreparedStatement >  OConnection::prepareStatement(const rtl::OUStri
>     return xStatement;
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XPreparedStatement >  OConnection::prepareCall(const rtl::OUString& sql) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::prepareCall" );
>@@ -184,7 +176,6 @@ Reference< XPreparedStatement >  OConnection::prepareCall(const rtl::OUString& s
>     return xStatement;
> }
> 
>-//------------------------------------------------------------------------------
> rtl::OUString OConnection::nativeSQL(const rtl::OUString& sql) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::nativeSQL" );
>@@ -193,7 +184,6 @@ rtl::OUString OConnection::nativeSQL(const rtl::OUString& sql) throw( SQLExcepti
>     return m_xMasterConnection->nativeSQL(sql);
> }
> 
>-//------------------------------------------------------------------------------
> void OConnection::setAutoCommit(sal_Bool autoCommit) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setAutoCommit" );
>@@ -202,7 +192,6 @@ void OConnection::setAutoCommit(sal_Bool autoCommit) throw( SQLException, Runtim
>     m_xMasterConnection->setAutoCommit(autoCommit);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OConnection::getAutoCommit(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getAutoCommit" );
>@@ -211,7 +200,6 @@ sal_Bool OConnection::getAutoCommit(void) throw( SQLException, RuntimeException
>     return m_xMasterConnection->getAutoCommit();
> }
> 
>-//------------------------------------------------------------------------------
> void OConnection::commit(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::commit" );
>@@ -220,7 +208,6 @@ void OConnection::commit(void) throw( SQLException, RuntimeException )
>     m_xMasterConnection->commit();
> }
> 
>-//------------------------------------------------------------------------------
> void OConnection::rollback(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::rollback" );
>@@ -229,7 +216,6 @@ void OConnection::rollback(void) throw( SQLException, RuntimeException )
>     m_xMasterConnection->rollback();
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XDatabaseMetaData >  OConnection::getMetaData(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getMetaData" );
>@@ -238,7 +224,6 @@ Reference< XDatabaseMetaData >  OConnection::getMetaData(void) throw( SQLExcepti
>     return m_xMasterConnection->getMetaData();
> }
> 
>-//------------------------------------------------------------------------------
> void OConnection::setReadOnly(sal_Bool readOnly) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setReadOnly" );
>@@ -247,7 +232,6 @@ void OConnection::setReadOnly(sal_Bool readOnly) throw( SQLException, RuntimeExc
>     m_xMasterConnection->setReadOnly(readOnly);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool OConnection::isReadOnly(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::isReadOnly" );
>@@ -256,7 +240,6 @@ sal_Bool OConnection::isReadOnly(void) throw( SQLException, RuntimeException )
>     return m_xMasterConnection->isReadOnly();
> }
> 
>-//------------------------------------------------------------------------------
> void OConnection::setCatalog(const rtl::OUString& catalog) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setCatalog" );
>@@ -265,7 +248,6 @@ void OConnection::setCatalog(const rtl::OUString& catalog) throw( SQLException,
>     m_xMasterConnection->setCatalog(catalog);
> }
> 
>-//------------------------------------------------------------------------------
> rtl::OUString OConnection::getCatalog(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getCatalog" );
>@@ -274,7 +256,6 @@ rtl::OUString OConnection::getCatalog(void) throw( SQLException, RuntimeExceptio
>     return m_xMasterConnection->getCatalog();
> }
> 
>-//------------------------------------------------------------------------------
> void OConnection::setTransactionIsolation(sal_Int32 level) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setTransactionIsolation" );
>@@ -283,7 +264,6 @@ void OConnection::setTransactionIsolation(sal_Int32 level) throw( SQLException,
>     m_xMasterConnection->setTransactionIsolation(level);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int32 OConnection::getTransactionIsolation(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTransactionIsolation" );
>@@ -292,7 +272,6 @@ sal_Int32 OConnection::getTransactionIsolation(void) throw( SQLException, Runtim
>     return m_xMasterConnection->getTransactionIsolation();
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XNameAccess >  OConnection::getTypeMap(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTypeMap" );
>@@ -301,7 +280,6 @@ Reference< XNameAccess >  OConnection::getTypeMap(void) throw( SQLException, Run
>     return m_xMasterConnection->getTypeMap();
> }
> 
>-//------------------------------------------------------------------------------
> void OConnection::setTypeMap(const Reference< XNameAccess > & typeMap) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setTypeMap" );
>@@ -313,7 +291,6 @@ void OConnection::setTypeMap(const Reference< XNameAccess > & typeMap) throw( SQ
> //= OConnection
> //==========================================================================
> DBG_NAME(OConnection)
>-//--------------------------------------------------------------------------
> OConnection::OConnection(ODatabaseSource& _rDB
>                          , Reference< XConnection >& _rxMaster
>                          , const Reference< XMultiServiceFactory >& _rxORB)
>@@ -414,7 +391,6 @@ OConnection::OConnection(ODatabaseSource& _rDB
>     osl_decrementInterlockedCount( &m_refCount );
> }
> 
>-//--------------------------------------------------------------------------
> OConnection::~OConnection()
> {
>     delete m_pTables;
>@@ -424,7 +400,6 @@ OConnection::~OConnection()
> 
> 
> // XWarningsSupplier
>-//--------------------------------------------------------------------------
> Any SAL_CALL OConnection::getWarnings() throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getWarnings" );
>@@ -433,7 +408,6 @@ Any SAL_CALL OConnection::getWarnings() throw(SQLException, RuntimeException)
>     return m_aWarnings.getWarnings();
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::clearWarnings" );
>@@ -442,7 +416,6 @@ void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeExceptio
>     m_aWarnings.clearWarnings();
> }
> 
>-//--------------------------------------------------------------------------
> namespace
> {
>     struct CompareTypeByName : public ::std::binary_function< Type, Type, bool >
>@@ -461,7 +434,6 @@ namespace
>     }
> }
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< Type > OConnection::getTypes() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTypes" );
>@@ -483,7 +455,6 @@ Sequence< Type > OConnection::getTypes() throw (RuntimeException)
>     return aSupportedTypes;
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< sal_Int8 > OConnection::getImplementationId() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getImplementationId" );
>@@ -491,7 +462,6 @@ Sequence< sal_Int8 > OConnection::getImplementationId() throw (RuntimeException)
> }
> 
> // com::sun::star::uno::XInterface
>-//--------------------------------------------------------------------------
> Any OConnection::queryInterface( const Type & rType ) throw (RuntimeException)
> {
>     if ( !m_bSupportsViews && rType.equals( XViewsSupplier::static_type() ) )
>@@ -510,7 +480,6 @@ Any OConnection::queryInterface( const Type & rType ) throw (RuntimeException)
>     return aReturn;
> }
> 
>-//--------------------------------------------------------------------------
> void OConnection::acquire() throw ()
> {
>     // include this one when you want to see who calls it (call graph)
>@@ -518,7 +487,6 @@ void OConnection::acquire() throw ()
>     OSubComponent::acquire();
> }
> 
>-//--------------------------------------------------------------------------
> void OConnection::release() throw ()
> {
>     // include this one when you want to see who calls it (call graph)
>@@ -527,7 +495,6 @@ void OConnection::release() throw ()
> }
> 
> // OSubComponent
>-//------------------------------------------------------------------------------
> void OConnection::disposing()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::disposing" );
>@@ -573,7 +540,6 @@ void OConnection::disposing()
> }
> 
> // XChild
>-//------------------------------------------------------------------------------
> Reference< XInterface >  OConnection::getParent(void) throw( RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getParent" );
>@@ -582,7 +548,6 @@ Reference< XInterface >  OConnection::getParent(void) throw( RuntimeException )
>     return m_xParent;
> }
> 
>-//------------------------------------------------------------------------------
> void OConnection::setParent(const Reference< XInterface > & /*Parent*/) throw( NoSupportException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setParent" );
>@@ -590,7 +555,6 @@ void OConnection::setParent(const Reference< XInterface > & /*Parent*/) throw( N
> }
> 
> // XSQLQueryComposerFactory
>-//------------------------------------------------------------------------------
> Reference< XSQLQueryComposer >  OConnection::createQueryComposer(void) throw( RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createQueryComposer" );
>@@ -602,7 +566,6 @@ Reference< XSQLQueryComposer >  OConnection::createQueryComposer(void) throw( Ru
>     m_aComposers.push_back(WeakReferenceHelper(xComposer));
>     return xComposer;
> }
>-// -----------------------------------------------------------------------------
> void OConnection::impl_fillTableFilter()
> {
>     Reference<XPropertySet> xProp(getParent(),UNO_QUERY);
>@@ -613,7 +576,6 @@ void OConnection::impl_fillTableFilter()
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::refresh" );
>@@ -650,10 +612,8 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> 
> // XTablesSupplier
>-//------------------------------------------------------------------------------
> Reference< XNameAccess >  OConnection::getTables() throw( RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTables" );
>@@ -664,7 +624,6 @@ Reference< XNameAccess >  OConnection::getTables() throw( RuntimeException )
> 
>     return m_pTables;
> }
>-// -----------------------------------------------------------------------------
> Reference< XNameAccess > SAL_CALL OConnection::getViews(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getViews" );
>@@ -676,7 +635,6 @@ Reference< XNameAccess > SAL_CALL OConnection::getViews(  ) throw(RuntimeExcepti
>     return m_pViews;
> }
> // XQueriesSupplier
>-//------------------------------------------------------------------------------
> Reference< XNameAccess >  OConnection::getQueries(void) throw( RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getQueries" );
>@@ -687,7 +645,6 @@ Reference< XNameAccess >  OConnection::getQueries(void) throw( RuntimeException
> }
> 
> // ::com::sun::star::sdb::XCommandPreparation
>-//------------------------------------------------------------------------------
> Reference< XPreparedStatement >  SAL_CALL OConnection::prepareCommand( const ::rtl::OUString& command, sal_Int32 commandType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::prepareCommand" );
>@@ -719,7 +676,6 @@ Reference< XPreparedStatement >  SAL_CALL OConnection::prepareCommand( const ::r
>     // TODO EscapeProcessing
>     return prepareStatement(aStatement);
> }
>-// -----------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL OConnection::createInstance( const ::rtl::OUString& _sServiceSpecifier ) throw (Exception, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createInstance" );
>@@ -748,13 +704,11 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const ::rtl::OUStr
>     }
>     return Reference< XInterface >(xRet,UNO_QUERY);
> }
>-// -----------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL OConnection::createInstanceWithArguments( const ::rtl::OUString& _sServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) throw (Exception, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createInstanceWithArguments" );
>     return createInstance(_sServiceSpecifier);
> }
>-// -----------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL OConnection::getAvailableServiceNames(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getAvailableServiceNames" );
>@@ -762,7 +716,6 @@ Sequence< ::rtl::OUString > SAL_CALL OConnection::getAvailableServiceNames(  ) t
>     aRet[0] = SERVICE_NAME_SINGLESELECTQUERYCOMPOSER;
>     return aRet;
> }
>-// -----------------------------------------------------------------------------
> Reference< XTablesSupplier > OConnection::getMasterTables()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getMasterTables" );
>@@ -781,7 +734,6 @@ Reference< XTablesSupplier > OConnection::getMasterTables()
>     }
>     return m_xMasterTables;
> }
>-// -----------------------------------------------------------------------------
> // XUsersSupplier
> Reference< XNameAccess > SAL_CALL OConnection::getUsers(  ) throw(RuntimeException)
> {
>@@ -792,7 +744,6 @@ Reference< XNameAccess > SAL_CALL OConnection::getUsers(  ) throw(RuntimeExcepti
>     Reference<XUsersSupplier> xUsr(getMasterTables(),UNO_QUERY);
>     return xUsr.is() ? xUsr->getUsers() : Reference< XNameAccess >();
> }
>-// -----------------------------------------------------------------------------
> // XGroupsSupplier
> Reference< XNameAccess > SAL_CALL OConnection::getGroups(  ) throw(RuntimeException)
> {
>@@ -803,7 +754,6 @@ Reference< XNameAccess > SAL_CALL OConnection::getGroups(  ) throw(RuntimeExcept
>     return xGrp.is() ? xGrp->getGroups() : Reference< XNameAccess >();
> }
> 
>-// -----------------------------------------------------------------------------
> void OConnection::impl_loadConnectionTools_throw()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::impl_loadConnectionTools_throw" );
>@@ -814,7 +764,6 @@ void OConnection::impl_loadConnectionTools_throw()
>         throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "service not registered: com.sun.star.sdb.tools.ConnectionTools" ) ), *this );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XTableName > SAL_CALL OConnection::createTableName(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createTableName" );
>@@ -825,7 +774,6 @@ Reference< XTableName > SAL_CALL OConnection::createTableName(  ) throw (Runtime
>     return m_xConnectionTools->createTableName();
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XObjectNames > SAL_CALL OConnection::getObjectNames(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getObjectNames" );
>@@ -836,7 +784,6 @@ Reference< XObjectNames > SAL_CALL OConnection::getObjectNames(  ) throw (Runtim
>     return m_xConnectionTools->getObjectNames();
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getDataSourceMetaData" );
>@@ -846,7 +793,6 @@ Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData(  )
> 
>     return m_xConnectionTools->getDataSourceMetaData();
> }
>-// -----------------------------------------------------------------------------
> Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const ::rtl::OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getFieldsByCommandDescriptor" );
>@@ -856,7 +802,6 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getF
> 
>     return m_xConnectionTools->getFieldsByCommandDescriptor(commandType,command,keepFieldsAlive);
> }
>-//--------------------------------------------------------------------
> Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal_Int32 commandType, const ::rtl::OUString& command ) throw (::com::sun::star::uno::RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getComposer" );
>@@ -867,7 +812,6 @@ Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal
>     return m_xConnectionTools->getComposer(commandType,command);
> }
> 
>-// -----------------------------------------------------------------------------
> void OConnection::impl_checkTableQueryNames_nothrow()
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::impl_checkTableQueryNames_nothrow" );
>@@ -903,7 +847,6 @@ void OConnection::impl_checkTableQueryNames_nothrow()
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const ::rtl::OUString& _TableName, ::sal_Int32 _ColorMode ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTableIcon" );
>@@ -921,7 +864,6 @@ Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const ::rtl::OUString&
>     return xReturn;
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const ::rtl::OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTableEditor" );
>diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
>index c8f9cf3..531d907 100644
>--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
>+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
>@@ -144,7 +144,6 @@ namespace dbaccess
> #define REGISTER_PROPERTY( propname, member ) \
>     registerProperty( PROPERTY_##propname, PROPERTY_ID_##propname, PropertyAttribute::BOUND, &member, ::getCppuType( &member ) )
> 
>-    //--------------------------------------------------------------------
>     DataAccessDescriptor::DataAccessDescriptor( const ::comphelper::ComponentContext& _rContext )
>         :DataAccessDescriptor_MutexBase()
>         ,DataAccessDescriptor_TypeBase()
>@@ -187,24 +186,19 @@ namespace dbaccess
>         REGISTER_PROPERTY( COLUMN,              m_xColumn );
>     }
> 
>-    //--------------------------------------------------------------------
>     DataAccessDescriptor::~DataAccessDescriptor()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     IMPLEMENT_FORWARD_XINTERFACE2( DataAccessDescriptor, DataAccessDescriptor_TypeBase, DataAccessDescriptor_PropertyBase );
> 
>-    //--------------------------------------------------------------------
>     IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataAccessDescriptor, DataAccessDescriptor_TypeBase, DataAccessDescriptor_PropertyBase );
> 
>-    //--------------------------------------------------------------------
>     ::rtl::OUString SAL_CALL DataAccessDescriptor::getImplementationName() throw (RuntimeException)
>     {
>         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.dba.DataAccessDescriptor" ) );
>     }
> 
>-    //--------------------------------------------------------------------
>     ::sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
>     {
>         Sequence< ::rtl::OUString > aServices( getSupportedServiceNames() );
>@@ -213,7 +207,6 @@ namespace dbaccess
>         return ::std::find( pStart, pEnd, rServiceName ) != pEnd;
>     }
> 
>-    //--------------------------------------------------------------------
>     Sequence< ::rtl::OUString > SAL_CALL DataAccessDescriptor::getSupportedServiceNames(  ) throw (RuntimeException)
>     {
>         Sequence< ::rtl::OUString > aServices(1);
>@@ -221,20 +214,17 @@ namespace dbaccess
>         return aServices;
>     }
> 
>-    //-------------------------------------------------------------------------
>     Reference< XPropertySetInfo > SAL_CALL DataAccessDescriptor::getPropertySetInfo() throw(RuntimeException)
>     {
>         Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
>         return xInfo;
>     }
> 
>-    //-------------------------------------------------------------------------
>     ::cppu::IPropertyArrayHelper& DataAccessDescriptor::getInfoHelper()
>     {
>         return *getArrayHelper();
>     }
> 
>-    //------------------------------------------------------------------------------
>     ::cppu::IPropertyArrayHelper* DataAccessDescriptor::createArrayHelper( ) const
>     {
>         Sequence< Property > aProps;
>@@ -273,24 +263,20 @@ namespace dbaccess
>         ::comphelper::ComponentContext  m_aContext;
>     };
> 
>-    //--------------------------------------------------------------------
>     DataAccessDescriptorFactory::DataAccessDescriptorFactory( const Reference< XComponentContext >& _rxContext )
>         :m_aContext( _rxContext )
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     DataAccessDescriptorFactory::~DataAccessDescriptorFactory()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     ::rtl::OUString DataAccessDescriptorFactory::getSingletonName_static()
>     {
>         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.DataAccessDescriptorFactory" ) );
>     }
> 
>-    //--------------------------------------------------------------------
>     Sequence< ::rtl::OUString > DataAccessDescriptorFactory::getSupportedServiceNames_static() throw( RuntimeException )
>     {
>         Sequence< ::rtl::OUString > aServices(1);
>@@ -298,25 +284,21 @@ namespace dbaccess
>         return aServices;
>     }
> 
>-    //--------------------------------------------------------------------
>     ::rtl::OUString DataAccessDescriptorFactory::getImplementationName_static() throw( RuntimeException )
>     {
>         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.dba.DataAccessDescriptorFactory" ) );
>     }
> 
>-    //--------------------------------------------------------------------
>     Reference< XInterface > DataAccessDescriptorFactory::Create( const Reference< XComponentContext >& _rxContext )
>     {
>         return *( new DataAccessDescriptorFactory( _rxContext ) );
>     }
> 
>-    //--------------------------------------------------------------------
>     ::rtl::OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName() throw (RuntimeException)
>     {
>         return getImplementationName_static();
>     }
> 
>-    //--------------------------------------------------------------------
>     ::sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
>     {
>         Sequence< ::rtl::OUString > aServices( getSupportedServiceNames_static() );
>@@ -325,13 +307,11 @@ namespace dbaccess
>         return ::std::find( pStart, pEnd, rServiceName ) != pEnd;
>     }
> 
>-    //--------------------------------------------------------------------
>     Sequence< ::rtl::OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames(  ) throw (RuntimeException)
>     {
>         return getSupportedServiceNames_static();
>     }
> 
>-    //--------------------------------------------------------------------
>     Reference< XPropertySet > SAL_CALL DataAccessDescriptorFactory::createDataAccessDescriptor(  ) throw (RuntimeException)
>     {
>         return new DataAccessDescriptor( m_aContext );
>@@ -341,7 +321,6 @@ namespace dbaccess
> } // namespace dbaccess
> //........................................................................
> 
>-//--------------------------------------------------------------------------
> extern "C" void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory()
> {
>     static ::dba::OSingletonRegistration< ::dbaccess::DataAccessDescriptorFactory > aAutoRegistration;
>diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
>index e584553..9085c0c 100644
>--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
>+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
>@@ -190,7 +190,6 @@ namespace dbaccess
> 
> //= ODatabaseContext
> //==========================================================================
>-//--------------------------------------------------------------------------
> ODatabaseContext::ODatabaseContext( const Reference< XComponentContext >& _rxContext )
>     :DatabaseAccessContext_Base(m_aMutex)
>     ,m_aContext( _rxContext )
>@@ -209,7 +208,6 @@ ODatabaseContext::ODatabaseContext( const Reference< XComponentContext >& _rxCon
>     osl_decrementInterlockedCount( &m_refCount );
> }
> 
>-//--------------------------------------------------------------------------
> ODatabaseContext::~ODatabaseContext()
> {
>     ::basic::BasicManagerRepository::revokeCreationListener( *this );
>@@ -222,20 +220,17 @@ ODatabaseContext::~ODatabaseContext()
> }
> 
> // Helper
>-//------------------------------------------------------------------------------
> rtl::OUString ODatabaseContext::getImplementationName_static() throw( RuntimeException )
> 
> {
>     return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.ODatabaseContext"));
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XInterface > ODatabaseContext::Create(const Reference< XComponentContext >& _rxContext)
> {
>     return *( new ODatabaseContext( _rxContext ) );
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< rtl::OUString > ODatabaseContext::getSupportedServiceNames_static(void) throw( RuntimeException )
> {
>     Sequence< ::rtl::OUString > aSNS( 1 );
>@@ -244,25 +239,21 @@ Sequence< rtl::OUString > ODatabaseContext::getSupportedServiceNames_static(void
> }
> 
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString ODatabaseContext::getImplementationName(  ) throw(RuntimeException)
> {
>     return getImplementationName_static();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool ODatabaseContext::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > ODatabaseContext::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     return getSupportedServiceNames_static();
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XInterface > ODatabaseContext::impl_createNewDataSource()
> {
>     ::rtl::Reference<ODatabaseModelImpl> pImpl( new ODatabaseModelImpl( m_aContext.getLegacyServiceFactory(), *this ) );
>@@ -271,7 +262,6 @@ Reference< XInterface > ODatabaseContext::impl_createNewDataSource()
>     return xDataSource.get();
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL ODatabaseContext::createInstance(  ) throw (Exception, RuntimeException)
> {
>     // for convenience of the API user, we ensure the document is fully initialized (effectively: XLoadable::initNew
>@@ -279,7 +269,6 @@ Reference< XInterface > SAL_CALL ODatabaseContext::createInstance(  ) throw (Exc
>     return impl_createNewDataSource();
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL ODatabaseContext::createInstanceWithArguments( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException)
> {
>     ::comphelper::NamedValueCollection aArgs( _rArguments );
>@@ -295,7 +284,6 @@ Reference< XInterface > SAL_CALL ODatabaseContext::createInstanceWithArguments(
>     return xDataSource;
> }
> // DatabaseAccessContext_Base
>-//------------------------------------------------------------------------------
> void ODatabaseContext::disposing()
> {
>     // notify our listener
>@@ -315,7 +303,6 @@ void ODatabaseContext::disposing()
> }
> 
> // XNamingService
>-//------------------------------------------------------------------------------
> Reference< XInterface >  ODatabaseContext::getRegisteredObject(const rtl::OUString& _rName) throw( Exception, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -334,7 +321,6 @@ Reference< XInterface >  ODatabaseContext::getRegisteredObject(const rtl::OUStri
> 
>     return loadObjectFromURL( _rName, sURL );
> }
>-// -----------------------------------------------------------------------------
> Reference< XInterface > ODatabaseContext::loadObjectFromURL(const ::rtl::OUString& _rName,const ::rtl::OUString& _sURL)
> {
>     INetURLObject aURL( _sURL );
>@@ -399,17 +385,14 @@ Reference< XInterface > ODatabaseContext::loadObjectFromURL(const ::rtl::OUStrin
> 
>     return pModelImpl->getOrCreateDataSource().get();
> }
>-// -----------------------------------------------------------------------------
> void ODatabaseContext::appendAtTerminateListener(const ODatabaseModelImpl& _rDataSourceModel)
> {
>     m_pDatabaseDocumentLoader->append(_rDataSourceModel);
> }
>-// -----------------------------------------------------------------------------
> void ODatabaseContext::removeFromTerminateListener(const ODatabaseModelImpl& _rDataSourceModel)
> {
>     m_pDatabaseDocumentLoader->remove(_rDataSourceModel);
> }
>-// -----------------------------------------------------------------------------
> void ODatabaseContext::setTransientProperties(const ::rtl::OUString& _sURL, ODatabaseModelImpl& _rDataSourceModel )
> {
>     if ( m_aDatasourceProperties.end() == m_aDatasourceProperties.find(_sURL) )
>@@ -441,7 +424,6 @@ void ODatabaseContext::setTransientProperties(const ::rtl::OUString& _sURL, ODat
>     }
> }
> 
>-//------------------------------------------------------------------------------
> void ODatabaseContext::registerObject(const rtl::OUString& _rName, const Reference< XInterface > & _rxObject) throw( Exception, RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -468,7 +450,6 @@ void ODatabaseContext::registerObject(const rtl::OUString& _rName, const Referen
>     m_aContainerListeners.notifyEach( &XContainerListener::elementInserted, aEvent );
> }
> 
>-//------------------------------------------------------------------------------
> void ODatabaseContext::storeTransientProperties( ODatabaseModelImpl& _rModelImpl)
> {
>     Reference< XPropertySet > xSource( _rModelImpl.getOrCreateDataSource(), UNO_QUERY );
>@@ -526,19 +507,16 @@ void ODatabaseContext::storeTransientProperties( ODatabaseModelImpl& _rModelImpl
>     }
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL ODatabaseContext::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException)
> {
>     m_aContainerListeners.addInterface(_rxListener);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL ODatabaseContext::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException)
> {
>     m_aContainerListeners.removeInterface(_rxListener);
> }
> 
>-//------------------------------------------------------------------------------
> void ODatabaseContext::revokeObject(const rtl::OUString& _rName) throw( Exception, RuntimeException )
> {
>     ClearableMutexGuard aGuard(m_aMutex);
>@@ -565,68 +543,57 @@ void ODatabaseContext::revokeObject(const rtl::OUString& _rName) throw( Exceptio
>     m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvent );
> }
> 
>-//------------------------------------------------------------------------------
> ::sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
> {
>     return m_xDatabaseRegistrations->hasRegisteredDatabase( _Name );
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL ODatabaseContext::getRegistrationNames() throw (RuntimeException)
> {
>     return m_xDatabaseRegistrations->getRegistrationNames();
> }
> 
>-//------------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
> {
>     return m_xDatabaseRegistrations->getDatabaseLocation( _Name );
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL ODatabaseContext::registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException)
> {
>     m_xDatabaseRegistrations->registerDatabaseLocation( _Name, _Location );
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
> {
>     m_xDatabaseRegistrations->revokeDatabaseLocation( _Name );
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL ODatabaseContext::changeDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
> {
>     m_xDatabaseRegistrations->changeDatabaseLocation( _Name, _NewLocation );
> }
> 
>-//------------------------------------------------------------------------------
> ::sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
> {
>     return m_xDatabaseRegistrations->isDatabaseRegistrationReadOnly( _Name );
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL ODatabaseContext::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException)
> {
>     m_xDatabaseRegistrations->addDatabaseRegistrationsListener( _Listener );
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL ODatabaseContext::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException)
> {
>     m_xDatabaseRegistrations->removeDatabaseRegistrationsListener( _Listener );
> }
> 
> // ::com::sun::star::container::XElementAccess
>-//------------------------------------------------------------------------------
> Type ODatabaseContext::getElementType(  ) throw(RuntimeException)
> {
>     return::getCppuType(static_cast<Reference<XDataSource>*>(NULL));
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool ODatabaseContext::hasElements(void) throw( RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -636,7 +603,6 @@ sal_Bool ODatabaseContext::hasElements(void) throw( RuntimeException )
> }
> 
> // ::com::sun::star::container::XEnumerationAccess
>-//------------------------------------------------------------------------------
> Reference< ::com::sun::star::container::XEnumeration >  ODatabaseContext::createEnumeration(void) throw( RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -644,7 +610,6 @@ Reference< ::com::sun::star::container::XEnumeration >  ODatabaseContext::create
> }
> 
> // ::com::sun::star::container::XNameAccess
>-//------------------------------------------------------------------------------
> Any ODatabaseContext::getByName(const rtl::OUString& _rName) throw( NoSuchElementException,
>                                                           WrappedTargetException, RuntimeException )
> {
>@@ -695,7 +660,6 @@ Any ODatabaseContext::getByName(const rtl::OUString& _rName) throw( NoSuchElemen
>     }
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< rtl::OUString > ODatabaseContext::getElementNames(void) throw( RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -704,7 +668,6 @@ Sequence< rtl::OUString > ODatabaseContext::getElementNames(void) throw( Runtime
>     return getRegistrationNames();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool ODatabaseContext::hasByName(const rtl::OUString& _rName) throw( RuntimeException )
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -713,7 +676,6 @@ sal_Bool ODatabaseContext::hasByName(const rtl::OUString& _rName) throw( Runtime
>     return hasRegisteredDatabase( _rName );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XInterface > ODatabaseContext::getObject( const ::rtl::OUString& _rURL )
> {
>     ObjectCacheIterator aFind = m_aDatabaseObjects.find( _rURL );
>@@ -722,7 +684,6 @@ Reference< XInterface > ODatabaseContext::getObject( const ::rtl::OUString& _rUR
>         xExistent = aFind->second->getOrCreateDataSource();
>     return xExistent;
> }
>-// -----------------------------------------------------------------------------
> void ODatabaseContext::registerDatabaseDocument( ODatabaseModelImpl& _rModelImpl )
> {
>     ::rtl::OUString sURL( _rModelImpl.getURL() );
>@@ -737,7 +698,6 @@ void ODatabaseContext::registerDatabaseDocument( ODatabaseModelImpl& _rModelImpl
>     else
>         OSL_ENSURE( false, "ODatabaseContext::registerDatabaseDocument: already have an object registered for this URL!" );
> }
>-// -----------------------------------------------------------------------------
> void ODatabaseContext::revokeDatabaseDocument( const ODatabaseModelImpl& _rModelImpl )
> {
>     ::rtl::OUString sURL( _rModelImpl.getURL() );
>@@ -746,7 +706,6 @@ void ODatabaseContext::revokeDatabaseDocument( const ODatabaseModelImpl& _rModel
> #endif
>     m_aDatabaseObjects.erase( sURL );
> }
>-// -----------------------------------------------------------------------------
> void ODatabaseContext::databaseDocumentURLChange( const ::rtl::OUString& _rOldURL, const ::rtl::OUString& _rNewURL )
> {
> #if OSL_DEBUG_LEVEL > 1
>@@ -762,7 +721,6 @@ void ODatabaseContext::databaseDocumentURLChange( const ::rtl::OUString& _rOldUR
>     m_aDatabaseObjects[ _rNewURL ] = oldPos->second;
>     m_aDatabaseObjects.erase( oldPos );
> }
>-// -----------------------------------------------------------------------------
> sal_Int64 SAL_CALL ODatabaseContext::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
> {
>     if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
>@@ -770,7 +728,6 @@ sal_Int64 SAL_CALL ODatabaseContext::getSomething( const Sequence< sal_Int8 >& r
> 
>     return 0;
> }
>-// -----------------------------------------------------------------------------
> Sequence< sal_Int8 > ODatabaseContext::getUnoTunnelImplementationId()
> {
>     static ::cppu::OImplementationId * pId = 0;
>@@ -786,7 +743,6 @@ Sequence< sal_Int8 > ODatabaseContext::getUnoTunnelImplementationId()
>     return pId->getImplementationId();
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseContext::onBasicManagerCreated( const Reference< XModel >& _rxForDocument, BasicManager& _rBasicManager )
> {
>     // if it's a database document ...
>diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
>index d748154..27f9efe 100644
>--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
>+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
>@@ -129,7 +129,6 @@ namespace dbaccess
> //============================================================
> //= ViewMonitor
> //============================================================
>-//--------------------------------------------------------------------------
> bool ViewMonitor::onControllerConnected( const Reference< XController >& _rxController )
> {
>     bool bFirstControllerEver = ( m_bEverHadController == false );
>@@ -141,7 +140,6 @@ bool ViewMonitor::onControllerConnected( const Reference< XController >& _rxCont
>     return bFirstControllerEver;
> }
> 
>-//--------------------------------------------------------------------------
> bool ViewMonitor::onSetCurrentController( const Reference< XController >& _rxController )
> {
>     // we interpret this as "loading the document (including UI) is finished",
>@@ -160,13 +158,11 @@ bool ViewMonitor::onSetCurrentController( const Reference< XController >& _rxCon
> //= ODatabaseDocument
> //============================================================
> DBG_NAME(ODatabaseDocument)
>-//--------------------------------------------------------------------------
> extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument()
> {
>     static ::dba::OAutoRegistration< ODatabaseDocument > aAutoRegistration;
> }
> 
>-//--------------------------------------------------------------------------
> ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>& _pImpl	)
>             :ModelDependentComponent( _pImpl )
>             ,ODatabaseDocument_OfficeDocument( getMutex() )
>@@ -216,7 +212,6 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>&
>     }
> }
> 
>-//--------------------------------------------------------------------------
> ODatabaseDocument::~ODatabaseDocument()
> {
>     OSL_TRACE( "DD: dtor: %p: %p", this, m_pImpl.get() );
>@@ -229,7 +224,6 @@ ODatabaseDocument::~ODatabaseDocument()
> 
>     delete m_pEventContainer, m_pEventContainer = NULL;
> }
>-// -----------------------------------------------------------------------------
> Any SAL_CALL ODatabaseDocument::queryInterface( const Type& _rType ) throw (RuntimeException)
> {
>     // strip XEmbeddedScripts and XScriptInvocationContext if we have any form/report
>@@ -247,18 +241,15 @@ Any SAL_CALL ODatabaseDocument::queryInterface( const Type& _rType ) throw (Runt
>         aReturn = ODatabaseDocument_Title::queryInterface(_rType);
>     return aReturn;
> }
>-//------------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::acquire(  ) throw ()
> {
>     ODatabaseDocument_OfficeDocument::acquire();
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::release(  ) throw ()
> {
>     ODatabaseDocument_OfficeDocument::release();
> }
>-//------------------------------------------------------------------------------
> Sequence< Type > SAL_CALL ODatabaseDocument::getTypes(	) throw (RuntimeException)
> {
>     Sequence< Type > aTypes = ::comphelper::concatSequences(
>@@ -299,7 +290,6 @@ Sequence< Type > SAL_CALL ODatabaseDocument::getTypes(	) throw (RuntimeException
> 
>     return aTypes;
> }
>-//------------------------------------------------------------------------------
> Sequence< sal_Int8 > SAL_CALL ODatabaseDocument::getImplementationId(  ) throw (RuntimeException)
> {
>     static ::cppu::OImplementationId * pId = 0;
>@@ -315,19 +305,15 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseDocument::getImplementationId(  ) throw (
>     return pId->getImplementationId();
> }
> 
>-// -----------------------------------------------------------------------------
> // local functions
>-// -----------------------------------------------------------------------------
> namespace
> {
>-    // -----------------------------------------------------------------------------
>     Reference< XStatusIndicator > lcl_extractStatusIndicator( const ::comphelper::NamedValueCollection& _rArguments )
>     {
>         Reference< XStatusIndicator > xStatusIndicator;
>         return _rArguments.getOrDefault( "StatusIndicator", xStatusIndicator );
>     }
> 
>-    // -----------------------------------------------------------------------------
>     static void lcl_triggerStatusIndicator_throw( const ::comphelper::NamedValueCollection& _rArguments, DocumentGuard& _rGuard, const bool _bStart )
>     {
>         Reference< XStatusIndicator > xStatusIndicator( lcl_extractStatusIndicator( _rArguments ) );
>@@ -350,7 +336,6 @@ namespace
>             // note that |reset| can throw a DisposedException
>     }
> 
>-    // -----------------------------------------------------------------------------
>     static void lcl_extractStatusIndicator( const ::comphelper::NamedValueCollection& _rArguments, Sequence< Any >& _rCallArgs )
>     {
>         Reference< XStatusIndicator > xStatusIndicator( lcl_extractStatusIndicator( _rArguments ) );
>@@ -362,7 +347,6 @@ namespace
>         _rCallArgs[ nLength ] <<= xStatusIndicator;
>     }
> 
>-    // -----------------------------------------------------------------------------
>     static void lcl_extractAndStartStatusIndicator( const ::comphelper::NamedValueCollection& _rArguments, Reference< XStatusIndicator >& _rxStatusIndicator,
>         Sequence< Any >& _rCallArgs )
>     {
>@@ -384,7 +368,6 @@ namespace
>         }
>     }
> 
>-    // -----------------------------------------------------------------------------
>     static Sequence< PropertyValue > lcl_appendFileNameToDescriptor( const ::comphelper::NamedValueCollection& _rDescriptor, const ::rtl::OUString _rURL )
>     {
>         ::comphelper::NamedValueCollection aMutableDescriptor( _rDescriptor );
>@@ -397,7 +380,6 @@ namespace
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::impl_setInitialized()
> {
>     m_eInitState = Initialized;
>@@ -406,7 +388,6 @@ void ODatabaseDocument::impl_setInitialized()
>     m_aEventNotifier.onDocumentInitialized();
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::impl_reset_nothrow()
> {
>     try
>@@ -431,7 +412,6 @@ void ODatabaseDocument::impl_reset_nothrow()
>     m_pImpl->m_bDocumentReadOnly = sal_False;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::impl_import_nolck_throw( const ::comphelper::ComponentContext _rContext, const Reference< XInterface >& _rxTargetComponent,
>                                                  const ::comphelper::NamedValueCollection& _rResource )
> {
>@@ -469,7 +449,6 @@ void ODatabaseDocument::impl_import_nolck_throw( const ::comphelper::ComponentCo
>         xStatusIndicator->end();
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::initNew(  ) throw (DoubleInitializationException, IOException, Exception, RuntimeException)
> {
>     // SYNCHRONIZED ->
>@@ -504,7 +483,6 @@ void SAL_CALL ODatabaseDocument::initNew(  ) throw (DoubleInitializationExceptio
>     impl_notifyStorageChange_nolck_nothrow( xTempStor );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::load( const Sequence< PropertyValue >& _Arguments ) throw (DoubleInitializationException, IOException, Exception, RuntimeException)
> {
>     // SYNCHRONIZED ->
>@@ -550,7 +528,6 @@ void SAL_CALL ODatabaseDocument::load( const Sequence< PropertyValue >& _Argumen
>     // <- SYNCHRONIZED
> }
> 
>-// -----------------------------------------------------------------------------
> namespace
> {
>     // .........................................................................
>@@ -581,7 +558,6 @@ namespace
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> ::sal_Bool SAL_CALL ODatabaseDocument::wasModifiedSinceLastSave() throw ( RuntimeException )
> {
>     DocumentGuard aGuard( *this );
>@@ -620,7 +596,6 @@ namespace
>     return sal_False;
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const ::rtl::OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException )
> {
>     DocumentGuard aGuard( *this );
>@@ -657,7 +632,6 @@ void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const ::rtl::OUString& i_T
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::recoverFromFile( const ::rtl::OUString& i_SourceLocation, const ::rtl::OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException )
> {
>     DocumentGuard aGuard( *this, DocumentGuard::InitMethod );
>@@ -706,7 +680,6 @@ void SAL_CALL ODatabaseDocument::recoverFromFile( const ::rtl::OUString& i_Sourc
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> // XModel
> sal_Bool SAL_CALL ODatabaseDocument::attachResource( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException)
> {
>@@ -714,7 +687,6 @@ sal_Bool SAL_CALL ODatabaseDocument::attachResource( const ::rtl::OUString& _rUR
>     return impl_attachResource( _rURL, _rArguments, aGuard );
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ODatabaseDocument::impl_attachResource( const ::rtl::OUString& i_rLogicalDocumentURL,
>             const Sequence< PropertyValue >& i_rMediaDescriptor, DocumentGuard& _rDocGuard )
> {
>@@ -756,21 +728,18 @@ sal_Bool ODatabaseDocument::impl_attachResource( const ::rtl::OUString& i_rLogic
>     return sal_True;
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL ODatabaseDocument::getURL(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
>     return m_pImpl->getURL();
> }
> 
>-// -----------------------------------------------------------------------------
> Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getArgs(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
>     return m_pImpl->getMediaDescriptor().getPropertyValues();
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::connectController( const Reference< XController >& _xController ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -797,7 +766,6 @@ void SAL_CALL ODatabaseDocument::connectController( const Reference< XController
>     m_pImpl->checkMacrosOnLoading();
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::disconnectController( const Reference< XController >& _xController ) throw (RuntimeException)
> {
>     bool bNotifyViewClosed = false;
>@@ -842,7 +810,6 @@ void SAL_CALL ODatabaseDocument::disconnectController( const Reference< XControl
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::lockControllers(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -850,7 +817,6 @@ void SAL_CALL ODatabaseDocument::lockControllers(  ) throw (RuntimeException)
>     ++m_pImpl->m_nControllerLockCount;
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::unlockControllers(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -858,7 +824,6 @@ void SAL_CALL ODatabaseDocument::unlockControllers(  ) throw (RuntimeException)
>     --m_pImpl->m_nControllerLockCount;
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL ODatabaseDocument::hasControllersLocked(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -866,7 +831,6 @@ sal_Bool SAL_CALL ODatabaseDocument::hasControllersLocked(  ) throw (RuntimeExce
>     return m_pImpl->m_nControllerLockCount != 0;
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XController > SAL_CALL ODatabaseDocument::getCurrentController() throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -874,7 +838,6 @@ Reference< XController > SAL_CALL ODatabaseDocument::getCurrentController() thro
>     return m_xCurrentController.is() ? m_xCurrentController : ( m_aControllers.empty() ? Reference< XController >() : *m_aControllers.begin() );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::setCurrentController( const Reference< XController >& _xController ) throw (NoSuchElementException, RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -904,7 +867,6 @@ void SAL_CALL ODatabaseDocument::setCurrentController( const Reference< XControl
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL ODatabaseDocument::getCurrentSelection(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -916,14 +878,12 @@ Reference< XInterface > SAL_CALL ODatabaseDocument::getCurrentSelection(  ) thro
> 
>     return xRet;
> }
>-// -----------------------------------------------------------------------------
> 
> // XStorable
> sal_Bool SAL_CALL ODatabaseDocument::hasLocation(  ) throw (RuntimeException)
> {
>     return getLocation().getLength() > 0;
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL ODatabaseDocument::getLocation(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
>@@ -931,13 +891,11 @@ sal_Bool SAL_CALL ODatabaseDocument::hasLocation(  ) throw (RuntimeException)
>         // both XStorable::getLocation and XModel::getURL have to return the URL of the document, *not*
>         // the location of the file which the docunment was possibly recovered from (which would be getDocFileLocation)
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL ODatabaseDocument::isReadonly(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
>     return m_pImpl->m_bDocumentReadOnly;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::store(  ) throw (IOException, RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -975,7 +933,6 @@ void SAL_CALL ODatabaseDocument::store(  ) throw (IOException, RuntimeException)
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::impl_throwIOExceptionCausedBySave_throw( const Any& i_rError, const ::rtl::OUString& i_rTargetURL ) const
> {
>     ::rtl::OUString sErrorMessage = extractExceptionMessage( m_pImpl->m_aContext, i_rError );
>@@ -987,7 +944,6 @@ void ODatabaseDocument::impl_throwIOExceptionCausedBySave_throw( const Any& i_rE
>     throw IOException( sErrorMessage, *const_cast< ODatabaseDocument* >( this ) );
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::impl_storeAs_throw( const ::rtl::OUString& _rURL, const ::comphelper::NamedValueCollection& _rArguments,
>     const StoreType _eType, DocumentGuard& _rGuard ) throw ( IOException, RuntimeException )
> {
>@@ -1090,7 +1046,6 @@ void ODatabaseDocument::impl_storeAs_throw( const ::rtl::OUString& _rURL, const
>         impl_notifyStorageChange_nolck_nothrow( xNewRootStorage );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XStorage > ODatabaseDocument::impl_createStorageFor_throw( const ::rtl::OUString& _rURL ) const
> {
>     Reference < ::com::sun::star::ucb::XSimpleFileAccess > xTempAccess;
>@@ -1109,7 +1064,6 @@ Reference< XStorage > ODatabaseDocument::impl_createStorageFor_throw( const ::rt
>     return Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aParam ), UNO_QUERY_THROW );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::storeAsURL( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (IOException, RuntimeException)
> {
>     // SYNCHRONIZED ->
>@@ -1158,7 +1112,6 @@ void SAL_CALL ODatabaseDocument::storeAsURL( const ::rtl::OUString& _rURL, const
>         m_aEventNotifier.notifyDocumentEvent( "OnCreate" );
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::impl_storeToStorage_throw( const Reference< XStorage >& _rxTargetStorage, const Sequence< PropertyValue >& _rMediaDescriptor,
>                                                    DocumentGuard& _rDocGuard ) const
> {
>@@ -1199,7 +1152,6 @@ void ODatabaseDocument::impl_storeToStorage_throw( const Reference< XStorage >&
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::storeToURL( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (IOException, RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -1241,7 +1193,6 @@ void SAL_CALL ODatabaseDocument::storeToURL( const ::rtl::OUString& _rURL, const
>     m_aEventNotifier.notifyDocumentEventAsync( "OnSaveToDone", NULL, makeAny( _rURL ) );
> }
> 
>-// -----------------------------------------------------------------------------
> // XModifyBroadcaster
> void SAL_CALL ODatabaseDocument::addModifyListener( const Reference< XModifyListener >& _xListener ) throw (RuntimeException)
> {
>@@ -1249,14 +1200,12 @@ void SAL_CALL ODatabaseDocument::addModifyListener( const Reference< XModifyList
>     m_aModifyListeners.addInterface(_xListener);
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::removeModifyListener( const Reference< XModifyListener >& _xListener ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>     m_aModifyListeners.removeInterface(_xListener);
> }
> 
>-// -----------------------------------------------------------------------------
> // XModifiable
> sal_Bool SAL_CALL ODatabaseDocument::isModified(  ) throw (RuntimeException)
> {
>@@ -1265,7 +1214,6 @@ sal_Bool SAL_CALL ODatabaseDocument::isModified(  ) throw (RuntimeException)
>     return m_pImpl->m_bModified;
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::setModified( sal_Bool _bModified ) throw (PropertyVetoException, RuntimeException)
> {
>     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
>@@ -1276,7 +1224,6 @@ void SAL_CALL ODatabaseDocument::setModified( sal_Bool _bModified ) throw (Prope
>     // a proper "modified" flag
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::impl_setModified_nothrow( sal_Bool _bModified, DocumentGuard& _rGuard )
> {
>     // SYNCHRONIZED ->
>@@ -1297,32 +1244,27 @@ void ODatabaseDocument::impl_setModified_nothrow( sal_Bool _bModified, DocumentG
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> // ::com::sun::star::document::XEventBroadcaster
> void SAL_CALL ODatabaseDocument::addEventListener(const uno::Reference< document::XEventListener >& _Listener ) throw (uno::RuntimeException)
> {
>     m_aEventNotifier.addLegacyEventListener( _Listener );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::removeEventListener( const uno::Reference< document::XEventListener >& _Listener ) throw (uno::RuntimeException)
> {
>     m_aEventNotifier.removeLegacyEventListener( _Listener );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::addDocumentEventListener( const Reference< XDocumentEventListener >& _Listener ) throw (RuntimeException)
> {
>     m_aEventNotifier.addDocumentEventListener( _Listener );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::removeDocumentEventListener( const Reference< XDocumentEventListener >& _Listener ) throw (RuntimeException)
> {
>     m_aEventNotifier.removeDocumentEventListener( _Listener );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const ::rtl::OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) throw (IllegalArgumentException, NoSupportException, RuntimeException)
> {
>     if ( !_EventName.getLength() )
>@@ -1342,33 +1284,28 @@ void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const ::rtl::OUString& _Ev
>     m_aEventNotifier.notifyDocumentEvent( _EventName, _ViewController, _Supplement );
> }
> 
>-// -----------------------------------------------------------------------------
> Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getPrinter(  ) throw (RuntimeException)
> {
>     DBG_ERROR( "ODatabaseDocument::getPrinter: not supported!" );
>     return Sequence< PropertyValue >();
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::setPrinter( const Sequence< PropertyValue >& /*aPrinter*/ ) throw (IllegalArgumentException, RuntimeException)
> {
>     DBG_ERROR( "ODatabaseDocument::setPrinter: not supported!" );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::print( const Sequence< PropertyValue >& /*xOptions*/ ) throw (IllegalArgumentException, RuntimeException)
> {
>     DBG_ERROR( "ODatabaseDocument::print: not supported!" );
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::impl_reparent_nothrow( const WeakReference< XNameAccess >& _rxContainer )
> {
>     Reference< XChild > xChild( _rxContainer.get(), UNO_QUERY );
>     if  ( xChild.is() )
>         xChild->setParent( *this );
> }
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::clearObjectContainer( WeakReference< XNameAccess >& _rxContainer)
> {
>     Reference< XNameAccess > xContainer = _rxContainer;
>@@ -1379,7 +1316,6 @@ void ODatabaseDocument::clearObjectContainer( WeakReference< XNameAccess >& _rxC
>         xChild->setParent( NULL );
>     _rxContainer = Reference< XNameAccess >();
> }
>-// -----------------------------------------------------------------------------
> Reference< XNameAccess > ODatabaseDocument::impl_getDocumentContainer_throw( ODatabaseModelImpl::ObjectType _eType )
> {
>     if ( ( _eType != ODatabaseModelImpl::E_FORM ) && ( _eType != ODatabaseModelImpl::E_REPORT ) )
>@@ -1415,7 +1351,6 @@ Reference< XNameAccess > ODatabaseDocument::impl_getDocumentContainer_throw( ODa
>     return xContainer;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::impl_closeControllerFrames_nolck_throw( sal_Bool _bDeliverOwnership )
> {
>     Controllers aCopy = m_aControllers;
>@@ -1440,7 +1375,6 @@ void ODatabaseDocument::impl_closeControllerFrames_nolck_throw( sal_Bool _bDeliv
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> struct DisposeControllerFrame : public ::std::unary_function< Reference< XController >, void >
> {
>     void operator()( const Reference< XController >& _rxController ) const
>@@ -1460,7 +1394,6 @@ struct DisposeControllerFrame : public ::std::unary_function< Reference< XContro
>     };
> };
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::impl_disposeControllerFrames_nothrow()
> {
>     Controllers aCopy;
>@@ -1468,7 +1401,6 @@ void ODatabaseDocument::impl_disposeControllerFrames_nothrow()
>     ::std::for_each( aCopy.begin(), aCopy.end(), DisposeControllerFrame() );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::close( sal_Bool _bDeliverOwnership ) throw (CloseVetoException, RuntimeException)
> {
>     // nearly everything below can/must be done without our mutex locked, the below is just for
>@@ -1508,32 +1440,27 @@ void SAL_CALL ODatabaseDocument::close( sal_Bool _bDeliverOwnership ) throw (Clo
>     m_bClosing = false;
>     // <- SYNCHRONIZED
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::addCloseListener( const Reference< ::com::sun::star::util::XCloseListener >& Listener ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>     m_aCloseListener.addInterface(Listener);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::removeCloseListener( const Reference< ::com::sun::star::util::XCloseListener >& Listener ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>     m_aCloseListener.removeInterface(Listener);
> }
>-// -----------------------------------------------------------------------------
> Reference< XNameAccess > SAL_CALL ODatabaseDocument::getFormDocuments(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit );
>     return impl_getDocumentContainer_throw( ODatabaseModelImpl::E_FORM );
> }
>-// -----------------------------------------------------------------------------
> Reference< XNameAccess > SAL_CALL ODatabaseDocument::getReportDocuments(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit );
>     return impl_getDocumentContainer_throw( ODatabaseModelImpl::E_REPORT );
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::WriteThroughComponent( const Reference< XComponent >& xComponent, const sal_Char* pStreamName,
>     const sal_Char* pServiceName, const Sequence< Any >& _rArguments, const Sequence< PropertyValue >& rMediaDesc,
>     const Reference<XStorage>& _xStorageToSaveTo ) const
>@@ -1602,7 +1529,6 @@ void ODatabaseDocument::WriteThroughComponent( const Reference< XOutputStream >&
>     xFilter->filter( rMediaDesc );
> }
> 
>-// -----------------------------------------------------------------------------
> void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _rxTargetStorage, const ::comphelper::NamedValueCollection& _rMediaDescriptor ) const
> {
>     // extract status indicator
>@@ -1665,7 +1591,6 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
>     m_pImpl->storeLibraryContainersTo( _rxTargetStorage );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XUIConfigurationManager > SAL_CALL ODatabaseDocument::getUIConfigurationManager(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -1703,7 +1628,6 @@ Reference< XUIConfigurationManager > SAL_CALL ODatabaseDocument::getUIConfigurat
> 
>     return m_xUIConfigurationManager;
> }
>-// -----------------------------------------------------------------------------
> Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -1711,14 +1635,12 @@ Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentSubStorage( const :
>     Reference< XDocumentSubStorageSupplier > xStorageAccess( m_pImpl->getDocumentSubStorageSupplier() );
>     return xStorageAccess->getDocumentSubStorage( aStorageName, nMode );
> }
>-// -----------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL ODatabaseDocument::getDocumentSubStoragesNames(  ) throw (::com::sun::star::io::IOException, RuntimeException)
> {
>     Reference< XDocumentSubStorageSupplier > xStorageAccess( m_pImpl->getDocumentSubStorageSupplier() );
>     return xStorageAccess->getDocumentSubStoragesNames();
> }
> 
>-//------------------------------------------------------------------------------
> void ODatabaseDocument::impl_notifyStorageChange_nolck_nothrow( const Reference< XStorage >& _rxNewRootStorage )
> {
>     Reference< XInterface > xMe( *const_cast< ODatabaseDocument* >( this ) );
>@@ -1727,7 +1649,6 @@ void ODatabaseDocument::impl_notifyStorageChange_nolck_nothrow( const Reference<
>         boost::bind( &XStorageChangeListener::notifyStorageChange, _1, boost::cref( xMe ), boost::cref( _rxNewRootStorage ) ) );
> }
> 
>-//------------------------------------------------------------------------------
> void ODatabaseDocument::disposing()
> {
>     OSL_TRACE( "DD: disp: %p: %p", this, m_pImpl.get() );
>@@ -1799,42 +1720,35 @@ void ODatabaseDocument::disposing()
> 
>     aKeepAlive.clear();
> }
>-// -----------------------------------------------------------------------------
> // XComponent
> void SAL_CALL ODatabaseDocument::dispose(  ) throw (RuntimeException)
> {
>     ::cppu::WeakComponentImplHelperBase::dispose();
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::addEventListener( const Reference< lang::XEventListener >& _xListener ) throw (RuntimeException)
> {
>     ::cppu::WeakComponentImplHelperBase::addEventListener( _xListener );
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::removeEventListener( const Reference< lang::XEventListener >& _xListener ) throw (RuntimeException)
> {
>     ::cppu::WeakComponentImplHelperBase::removeEventListener( _xListener );
> }
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString ODatabaseDocument::getImplementationName(  ) throw(RuntimeException)
> {
>     return getImplementationName_static();
> }
> 
>-//------------------------------------------------------------------------------
> rtl::OUString ODatabaseDocument::getImplementationName_static(  ) throw(RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.comp.dba.ODatabaseDocument");
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > ODatabaseDocument::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     return getSupportedServiceNames_static();
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XInterface > ODatabaseDocument::Create( const Reference< XComponentContext >& _rxContext )
> {
>     ::comphelper::ComponentContext aContext( _rxContext );
>@@ -1846,7 +1760,6 @@ Reference< XInterface > ODatabaseDocument::Create( const Reference< XComponentCo
>     return xModel.get();
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > ODatabaseDocument::getSupportedServiceNames_static(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSNS( 2 );
>@@ -1855,19 +1768,16 @@ Sequence< ::rtl::OUString > ODatabaseDocument::getSupportedServiceNames_static(
>     return aSNS;
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool ODatabaseDocument::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
>-// -----------------------------------------------------------------------------
> Reference< XDataSource > SAL_CALL ODatabaseDocument::getDataSource() throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
>     return m_pImpl->getOrCreateDataSource();
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::loadFromStorage( const Reference< XStorage >& /*xStorage*/, const Sequence< PropertyValue >& /*aMediaDescriptor*/ ) throw (IllegalArgumentException, DoubleInitializationException, IOException, Exception, RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -1878,14 +1788,12 @@ void SAL_CALL ODatabaseDocument::loadFromStorage( const Reference< XStorage >& /
>     );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::storeToStorage( const Reference< XStorage >& _rxStorage, const Sequence< PropertyValue >& _rMediaDescriptor ) throw (IllegalArgumentException, IOException, Exception, RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>     impl_storeToStorage_throw( _rxStorage, _rMediaDescriptor, aGuard );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::switchToStorage( const Reference< XStorage >& _rxNewRootStorage ) throw (IllegalArgumentException, IOException, Exception, RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -1896,56 +1804,48 @@ void SAL_CALL ODatabaseDocument::switchToStorage( const Reference< XStorage >& _
>     impl_notifyStorageChange_nolck_nothrow( xNewRootStorage );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentStorage(  ) throw (IOException, Exception, RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>     return m_pImpl->getOrCreateRootStorage();
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::addStorageChangeListener( const Reference< XStorageChangeListener >& _Listener ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>     m_aStorageListeners.addInterface( _Listener );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::removeStorageChangeListener( const Reference< XStorageChangeListener >& _Listener ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>     m_aStorageListeners.addInterface( _Listener );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XStorageBasedLibraryContainer > SAL_CALL ODatabaseDocument::getBasicLibraries() throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit );
>     return m_pImpl->getLibraryContainer( true );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XStorageBasedLibraryContainer > SAL_CALL ODatabaseDocument::getDialogLibraries() throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>     return m_pImpl->getLibraryContainer( false );
> }
> 
>-// -----------------------------------------------------------------------------
> ::sal_Bool SAL_CALL ODatabaseDocument::getAllowMacroExecution() throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>     return m_pImpl->adjustMacroMode_AutoReject();
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XEmbeddedScripts > SAL_CALL ODatabaseDocument::getScriptContainer() throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>     return this;
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< provider::XScriptProvider > SAL_CALL ODatabaseDocument::getScriptProvider(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this );
>@@ -1967,26 +1867,22 @@ Reference< provider::XScriptProvider > SAL_CALL ODatabaseDocument::getScriptProv
>     return xScriptProvider;
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XNameReplace > SAL_CALL ODatabaseDocument::getEvents(  ) throw (RuntimeException)
> {
>     DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit );
>     return m_pEventContainer;
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseDocument::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException)
> {
>     if ( m_pImpl.is() )
>         m_pImpl->disposing(Source);
> }
> 
>-//------------------------------------------------------------------
> Reference< XInterface > ODatabaseDocument::getThis() const
> {
>     return *const_cast< ODatabaseDocument* >( this );
> }
>-// -----------------------------------------------------------------------------
> struct CreateAny : public ::std::unary_function< Reference<XController>, Any>
> {
>     Any operator() (const Reference<XController>& lhs) const
>@@ -2003,14 +1899,12 @@ Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers(  ) throw (
>     ::std::transform( m_aControllers.begin(), m_aControllers.end(), aController.getArray(), CreateAny() );
>     return new ::comphelper::OAnyEnumeration(aController);
> }
>-// -----------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL ODatabaseDocument::getAvailableViewControllerNames(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aNames(1);
>     aNames[0] = SERVICE_SDB_APPLICATIONCONTROLLER;
>     return aNames;
> }
>-// -----------------------------------------------------------------------------
> Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewController( const Reference< XFrame >& _Frame ) throw (IllegalArgumentException, Exception, RuntimeException)
> {
>     return createViewController(
>@@ -2020,7 +1914,6 @@ Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewControlle
>     );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const ::rtl::OUString& _ViewName, const Sequence< PropertyValue >& _Arguments, const Reference< XFrame >& _Frame ) throw (IllegalArgumentException, Exception, RuntimeException)
> {
>     if ( !_ViewName.equalsAscii( "Default" ) && !_ViewName.equalsAscii( "Preview" ) )
>@@ -2045,7 +1938,6 @@ Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( cons
>     return xController;
> }
> 
>-// -----------------------------------------------------------------------------
> //=============================================================================
> Reference< XTitle > ODatabaseDocument::impl_getTitleHelper_throw()
> {
>@@ -2183,7 +2075,6 @@ void SAL_CALL ODatabaseDocument::releaseNumberForComponent( const uno::Reference
>     return ::rtl::OUString();/*RTL_CONSTASCII_USTRINGPARAM(" : "));*/
> }
> 
>-//------------------------------------------------------------------
> //........................................................................
> }	// namespace dbaccess
> //........................................................................
>diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
>index c6c8233..49105b4 100644
>--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
>+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
>@@ -67,21 +67,18 @@ namespace dbaccess
>     using ::com::sun::star::uno::XAggregation;
>     /** === end UNO using === **/
> 
>-    //--------------------------------------------------------------------
>     static const ::rtl::OUString& getConfigurationRootPath()
>     {
>         static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("org.openoffice.Office.DataAccess/RegisteredNames");
>         return s_sNodeName;
>     }
> 
>-    //--------------------------------------------------------------------
>     const ::rtl::OUString& getLocationNodeName()
>     {
>         static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii( "Location" );
>         return s_sNodeName;
>     }
> 
>-    //--------------------------------------------------------------------
>     const ::rtl::OUString& getNameNodeName()
>     {
>         static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii( "Name" );
>@@ -150,7 +147,6 @@ namespace dbaccess
>     //====================================================================
>     //= DatabaseRegistrations - implementation
>     //====================================================================
>-    //--------------------------------------------------------------------
>     DatabaseRegistrations::DatabaseRegistrations( const ::comphelper::ComponentContext& _rxContext )
>         :m_aContext( _rxContext )
>         ,m_aConfigurationRoot()
>@@ -160,12 +156,10 @@ namespace dbaccess
>             m_aContext.getLegacyServiceFactory(), getConfigurationRootPath(), -1, ::utl::OConfigurationTreeRoot::CM_UPDATABLE );
>     }
> 
>-    //--------------------------------------------------------------------
>     DatabaseRegistrations::~DatabaseRegistrations()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_nothrow( const ::rtl::OUString& _rName )
>     {
>         Sequence< ::rtl::OUString > aNames( m_aConfigurationRoot.getNodeNames() );
>@@ -184,7 +178,6 @@ namespace dbaccess
>         return ::utl::OConfigurationNode();
>     }
> 
>-    //--------------------------------------------------------------------
>     ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_throw( const ::rtl::OUString& _rName, const bool _bMustExist )
>     {
>         ::utl::OConfigurationNode aNodeForName( impl_getNodeForName_nothrow( _rName ) );
>@@ -224,7 +217,6 @@ namespace dbaccess
>         return aNewNode;
>     }
> 
>-    //--------------------------------------------------------------------
>     ::utl::OConfigurationNode DatabaseRegistrations::impl_checkValidName_throw( const ::rtl::OUString& _rName, const bool _bMustExist )
>     {
>         if ( !m_aConfigurationRoot.isValid() )
>@@ -236,7 +228,6 @@ namespace dbaccess
>         return impl_getNodeForName_throw( _rName, _bMustExist );
>     }
> 
>-    //--------------------------------------------------------------------
>     void DatabaseRegistrations::impl_checkValidLocation_throw( const ::rtl::OUString& _rLocation )
>     {
>         if ( !_rLocation.getLength() )
>@@ -247,7 +238,6 @@ namespace dbaccess
>             throw IllegalArgumentException( ::rtl::OUString(), *this, 2 );
>     }
> 
>-    //--------------------------------------------------------------------
>     ::sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_aMutex );
>@@ -255,7 +245,6 @@ namespace dbaccess
>         return aNodeForName.isValid();
>     }
>     
>-    //------------------------------------------------------------------------------
>     Sequence< ::rtl::OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() throw (RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_aMutex );
>@@ -279,7 +268,6 @@ namespace dbaccess
>         return aDisplayNames;
>     }
> 
>-    //--------------------------------------------------------------------
>     ::rtl::OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_aMutex );
>@@ -293,7 +281,6 @@ namespace dbaccess
>         return sLocation;
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException)
>     {
>         ::osl::ClearableMutexGuard aGuard( m_aMutex );
>@@ -312,7 +299,6 @@ namespace dbaccess
>         m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::registeredDatabaseLocation, aEvent );
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
>     {
>         ::osl::ClearableMutexGuard aGuard( m_aMutex );
>@@ -338,7 +324,6 @@ namespace dbaccess
>         m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::revokedDatabaseLocation, aEvent );
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
>     {
>         ::osl::ClearableMutexGuard aGuard( m_aMutex );
>@@ -364,7 +349,6 @@ namespace dbaccess
>         m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::changedDatabaseLocation, aEvent );
>     }
> 
>-    //--------------------------------------------------------------------
>     ::sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_aMutex );
>@@ -372,14 +356,12 @@ namespace dbaccess
>         return aDataSourceRegistration.isReadonly();
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL DatabaseRegistrations::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException)
>     {
>         if ( _Listener.is() )
>             m_aRegistrationListeners.addInterface( _Listener );
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL DatabaseRegistrations::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException)
>     {
>         if ( _Listener.is() )
>diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
>index 0ee04b8..bce7ce5 100644
>--- a/dbaccess/source/core/dataaccess/datasource.cxx
>+++ b/dbaccess/source/core/dataaccess/datasource.cxx
>@@ -146,9 +146,7 @@ protected:
>     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
> };
> 
>-//------------------------------------------------------------
> DBG_NAME( FlushNotificationAdapter )
>-//------------------------------------------------------------
> FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener )
>     :m_aBroadcaster( _rxBroadcaster )
>     ,m_aListener( _rxListener )
>@@ -165,13 +163,11 @@ FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable
>     DBG_ASSERT( m_refCount == 1, "FlushNotificationAdapter::FlushNotificationAdapter: broadcaster isn't holding by hard ref!?" );
> }
> 
>-//------------------------------------------------------------
> FlushNotificationAdapter::~FlushNotificationAdapter()
> {
>     DBG_DTOR( FlushNotificationAdapter, NULL );
> }
> 
>-//--------------------------------------------------------------------
> void SAL_CALL FlushNotificationAdapter::impl_dispose( bool _bRevokeListener )
> {
>     Reference< XFlushListener > xKeepAlive( this );
>@@ -187,7 +183,6 @@ void SAL_CALL FlushNotificationAdapter::impl_dispose( bool _bRevokeListener )
>     m_aBroadcaster = Reference< XFlushable >();
> }
> 
>-//--------------------------------------------------------------------
> void SAL_CALL FlushNotificationAdapter::flushed( const EventObject& rEvent ) throw (RuntimeException)
> {
>     Reference< XFlushListener > xListener( m_aListener );
>@@ -197,7 +192,6 @@ void SAL_CALL FlushNotificationAdapter::flushed( const EventObject& rEvent ) thr
>         impl_dispose( true );
> }
> 
>-//--------------------------------------------------------------------
> void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source ) throw (RuntimeException)
> {
>     Reference< XFlushListener > xListener( m_aListener );
>@@ -207,26 +201,22 @@ void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source ) t
>     impl_dispose( false );
> }
> 
>-//--------------------------------------------------------------------------
> OAuthenticationContinuation::OAuthenticationContinuation()
>     :m_bRemberPassword(sal_True),   // TODO: a meaningfull default
>     m_bCanSetUserName(sal_True)
> {
> }
> 
>-//--------------------------------------------------------------------------
> sal_Bool SAL_CALL OAuthenticationContinuation::canSetRealm(  ) throw(RuntimeException)
> {
>     return sal_False;
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OAuthenticationContinuation::setRealm( const ::rtl::OUString& /*Realm*/ ) throw(RuntimeException)
> {
>     DBG_ERROR("OAuthenticationContinuation::setRealm: not supported!");
> }
> 
>-//--------------------------------------------------------------------------
> sal_Bool SAL_CALL OAuthenticationContinuation::canSetUserName(  ) throw(RuntimeException)
> {
>     // we alwas allow this, even if the database document is read-only. In this case,
>@@ -234,25 +224,21 @@ sal_Bool SAL_CALL OAuthenticationContinuation::canSetUserName(  ) throw(RuntimeE
>     return m_bCanSetUserName;
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OAuthenticationContinuation::setUserName( const ::rtl::OUString& _rUser ) throw(RuntimeException)
> {
>     m_sUser = _rUser;
> }
> 
>-//--------------------------------------------------------------------------
> sal_Bool SAL_CALL OAuthenticationContinuation::canSetPassword(  ) throw(RuntimeException)
> {
>     return sal_True;
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OAuthenticationContinuation::setPassword( const ::rtl::OUString& _rPassword ) throw(RuntimeException)
> {
>     m_sPassword = _rPassword;
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getRememberPasswordModes( RememberAuthentication& _reDefault ) throw(RuntimeException)
> {
>     Sequence< RememberAuthentication > aReturn(1);
>@@ -260,25 +246,21 @@ Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getReme
>     return aReturn;
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OAuthenticationContinuation::setRememberPassword( RememberAuthentication _eRemember ) throw(RuntimeException)
> {
>     m_bRemberPassword = (RememberAuthentication_NO != _eRemember);
> }
> 
>-//--------------------------------------------------------------------------
> sal_Bool SAL_CALL OAuthenticationContinuation::canSetAccount(  ) throw(RuntimeException)
> {
>     return sal_False;
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OAuthenticationContinuation::setAccount( const ::rtl::OUString& ) throw(RuntimeException)
> {
>     DBG_ERROR("OAuthenticationContinuation::setAccount: not supported!");
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getRememberAccountModes( RememberAuthentication& _reDefault ) throw(RuntimeException)
> {
>     Sequence < RememberAuthentication > aReturn(1);
>@@ -287,7 +269,6 @@ Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getReme
>     return aReturn;
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentication /*Remember*/ ) throw(RuntimeException)
> {
>     DBG_ERROR("OAuthenticationContinuation::setRememberAccount: not supported!");
>@@ -439,10 +420,8 @@ void OSharedConnectionManager::addEventListener(const Reference<XConnection>& _r
>     osl_incrementInterlockedCount(&_rIter->second.nALiveCount);
> }
> 
>-//----------------------------------------------------------------------
> namespace
> {
>-    //------------------------------------------------------------------
>     Sequence< PropertyValue > lcl_filterDriverProperties( const Reference< XDriver >& _xDriver, const ::rtl::OUString& _sUrl,
>         const Sequence< PropertyValue >& _rDataSourceSettings, const AsciiPropertyValue* _pKnownSettings )
>     {
>@@ -489,10 +468,8 @@ namespace
>         return Sequence< PropertyValue >();
>     }
> 
>-    //------------------------------------------------------------------
>     typedef ::std::map< ::rtl::OUString, sal_Int32 > PropertyAttributeCache;
> 
>-    //------------------------------------------------------------------
>     struct IsDefaultAndNotRemoveable : public ::std::unary_function< PropertyValue, bool >
>     {
>     private:
>@@ -521,13 +498,11 @@ namespace
> //= ODatabaseContext
> //============================================================
> DBG_NAME(ODatabaseSource)
>-//--------------------------------------------------------------------------
> extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource()
> {
>     static ::dba::OAutoRegistration< ODatabaseSource > aAutoRegistration;
> }
> 
>-//--------------------------------------------------------------------------
> ODatabaseSource::ODatabaseSource(const ::rtl::Reference<ODatabaseModelImpl>& _pImpl)
>             :ModelDependentComponent( _pImpl )
>             ,ODatabaseSource_Base( getMutex() )
>@@ -540,7 +515,6 @@ ODatabaseSource::ODatabaseSource(const ::rtl::Reference<ODatabaseModelImpl>& _pI
>     OSL_TRACE( "DS: ctor: %p: %p", this, m_pImpl.get() );
> }
> 
>-//--------------------------------------------------------------------------
> ODatabaseSource::~ODatabaseSource()
> {
>     OSL_TRACE( "DS: dtor: %p: %p", this, m_pImpl.get() );
>@@ -552,7 +526,6 @@ ODatabaseSource::~ODatabaseSource()
>     }
> }
> 
>-//--------------------------------------------------------------------------
> void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocument, const ::rtl::OUString& _rNewName, DBContextAccess )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::setName" );
>@@ -564,7 +537,6 @@ void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocume
> }
> 
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getTypes" );
>@@ -578,7 +550,6 @@ Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException)
>     );
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< sal_Int8 > ODatabaseSource::getImplementationId() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getImplementationId" );
>@@ -596,7 +567,6 @@ Sequence< sal_Int8 > ODatabaseSource::getImplementationId() throw (RuntimeExcept
> }
> 
> // com::sun::star::uno::XInterface
>-//--------------------------------------------------------------------------
> Any ODatabaseSource::queryInterface( const Type & rType ) throw (RuntimeException)
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::queryInterface" );
>@@ -606,45 +576,38 @@ Any ODatabaseSource::queryInterface( const Type & rType ) throw (RuntimeExceptio
>     return aIface;
> }
> 
>-//--------------------------------------------------------------------------
> void ODatabaseSource::acquire() throw ()
> {
>     ODatabaseSource_Base::acquire();
> }
> 
>-//--------------------------------------------------------------------------
> void ODatabaseSource::release() throw ()
> {
>     ODatabaseSource_Base::release();
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseSource::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException)
> {
>     if ( m_pImpl.is() )
>         m_pImpl->disposing(Source);
> }
> // XServiceInfo
>-//------------------------------------------------------------------------------
> rtl::OUString ODatabaseSource::getImplementationName(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getImplementationName" );
>     return getImplementationName_static();
> }
> 
>-//------------------------------------------------------------------------------
> rtl::OUString ODatabaseSource::getImplementationName_static(  ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getImplementationName_static" );
>     return rtl::OUString::createFromAscii("com.sun.star.comp.dba.ODatabaseSource");
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > ODatabaseSource::getSupportedServiceNames(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getSupportedServiceNames" );
>     return getSupportedServiceNames_static();
> }
>-//------------------------------------------------------------------------------
> Reference< XInterface > ODatabaseSource::Create( const Reference< XComponentContext >& _rxContext )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::Create" );
>@@ -653,7 +616,6 @@ Reference< XInterface > ODatabaseSource::Create( const Reference< XComponentCont
>     return xDBContext->createInstance();
> }
> 
>-//------------------------------------------------------------------------------
> Sequence< ::rtl::OUString > ODatabaseSource::getSupportedServiceNames_static(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getSupportedServiceNames_static" );
>@@ -663,14 +625,12 @@ Sequence< ::rtl::OUString > ODatabaseSource::getSupportedServiceNames_static(  )
>     return aSNS;
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool ODatabaseSource::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::supportsService" );
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
> // OComponentHelper
>-//------------------------------------------------------------------------------
> void ODatabaseSource::disposing()
> {
>     OSL_TRACE( "DS: disp: %p, %p", this, m_pImpl.get() );
>@@ -684,7 +644,6 @@ void ODatabaseSource::disposing()
>     ODatabaseDocument::clearObjectContainer(m_pImpl->m_xTableDefinitions);
>     m_pImpl.clear();
> }
>-//------------------------------------------------------------------------------
> Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::OUString& _rUid, const ::rtl::OUString& _rPwd)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::buildLowLevelConnection" );
>@@ -795,7 +754,6 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O
> }
> 
> // OPropertySetHelper
>-//------------------------------------------------------------------------------
> Reference< XPropertySetInfo >  ODatabaseSource::getPropertySetInfo() throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getPropertySetInfo" );
>@@ -803,7 +761,6 @@ Reference< XPropertySetInfo >  ODatabaseSource::getPropertySetInfo() throw (Runt
> }
> 
> // comphelper::OPropertyArrayUsageHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper* ODatabaseSource::createArrayHelper( ) const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::createArrayHelper" );
>@@ -825,13 +782,11 @@ Reference< XPropertySetInfo >  ODatabaseSource::getPropertySetInfo() throw (Runt
> }
> 
> // cppu::OPropertySetHelper
>-//------------------------------------------------------------------------------
> ::cppu::IPropertyArrayHelper& ODatabaseSource::getInfoHelper()
> {
>     return *getArrayHelper();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException  )
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::convertFastPropertyValue" );
>@@ -906,7 +861,6 @@ sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any &
>     return bModified;
> }
> 
>-//------------------------------------------------------------------------------
> namespace
> {
>     struct SelectPropertyName : public ::std::unary_function< PropertyValue, ::rtl::OUString >
>@@ -979,7 +933,6 @@ namespace
>     }
> }
> 
>-//------------------------------------------------------------------------------
> void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::setFastPropertyValue_NoBroadcast" );
>@@ -1025,7 +978,6 @@ void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
>     }
> }
> 
>-//------------------------------------------------------------------------------
> void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
> {
>     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getFastPropertyValue" );
>@@ -1114,7 +1066,6 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con
> }
> 
> // XDataSource
>-//------------------------------------------------------------------------------
> void ODatabaseSource::setLoginTimeout(sal_Int32 seconds) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::setLoginTimeout" );
>@@ -1122,7 +1073,6 @@ void ODatabaseSource::setLoginTimeout(sal_Int32 seconds) throw( SQLException, Ru
>     m_pImpl->m_nLoginTimeout = seconds;
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int32 ODatabaseSource::getLoginTimeout(void) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getLoginTimeout" );
>@@ -1132,31 +1082,26 @@ sal_Int32 ODatabaseSource::getLoginTimeout(void) throw( SQLException, RuntimeExc
> 
> 
> // XCompletedConnection
>-//------------------------------------------------------------------------------
> Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::connectWithCompletion" );
>     return connectWithCompletion(_rxHandler,sal_False);
> }
>-// -----------------------------------------------------------------------------
> Reference< XConnection > ODatabaseSource::getConnection(const rtl::OUString& user, const rtl::OUString& password) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getConnection" );
>     return getConnection(user,password,sal_False);
> }
>-// -----------------------------------------------------------------------------
> Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnection( const ::rtl::OUString& user, const ::rtl::OUString& password ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getIsolatedConnection" );
>     return getConnection(user,password,sal_True);
> }
>-// -----------------------------------------------------------------------------
> Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnectionWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getIsolatedConnectionWithCompletion" );
>     return connectWithCompletion(_rxHandler,sal_True);
> }
>-// -----------------------------------------------------------------------------
> Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler,sal_Bool _bIsolated ) throw(SQLException, RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::connectWithCompletion" );
>@@ -1244,7 +1189,6 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const rtl::OUString& user, const rtl::OUString& password)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::buildIsolatedConnection" );
>@@ -1259,7 +1203,6 @@ Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const rtl::OUS
>     }
>     return xConn;
> }
>-//------------------------------------------------------------------------------
> Reference< XConnection > ODatabaseSource::getConnection(const rtl::OUString& user, const rtl::OUString& password,sal_Bool _bIsolated) throw( SQLException, RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getConnection" );
>@@ -1292,7 +1235,6 @@ Reference< XConnection > ODatabaseSource::getConnection(const rtl::OUString& use
>     return xConn;
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XNameAccess > SAL_CALL ODatabaseSource::getBookmarks(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getBookmarks" );
>@@ -1300,7 +1242,6 @@ Reference< XNameAccess > SAL_CALL ODatabaseSource::getBookmarks(  ) throw (Runti
>     return static_cast< XNameContainer* >(&m_aBookmarks);
> }
> 
>-//------------------------------------------------------------------------------
> Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getQueryDefinitions" );
>@@ -1331,9 +1272,7 @@ Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(
>     }
>     return xContainer;
> }
>-//------------------------------------------------------------------------------
> // XTablesSupplier
>-//------------------------------------------------------------------------------
> Reference< XNameAccess >  ODatabaseSource::getTables() throw( RuntimeException )
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getTables" );
>@@ -1348,7 +1287,6 @@ Reference< XNameAccess >  ODatabaseSource::getTables() throw( RuntimeException )
>     }
>     return xContainer;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseSource::flush(  ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::flush" );
>@@ -1378,7 +1316,6 @@ void SAL_CALL ODatabaseSource::flush(  ) throw (RuntimeException)
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::flushed" );
>@@ -1412,19 +1349,16 @@ void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (R
>     m_pImpl->setModified( bWasModified );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseSource::addFlushListener( const Reference< ::com::sun::star::util::XFlushListener >& _xListener ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::addFlushListener" );
>     m_aFlushListeners.addInterface(_xListener);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseSource::removeFlushListener( const Reference< ::com::sun::star::util::XFlushListener >& _xListener ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::removeFlushListener" );
>     m_aFlushListeners.removeInterface(_xListener);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& /*Event*/ ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::elementInserted" );
>@@ -1432,7 +1366,6 @@ void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& /*Event*/
>     if ( m_pImpl.is() )
>         m_pImpl->setModified(sal_True);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::elementRemoved" );
>@@ -1440,7 +1373,6 @@ void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& /*Event*/ )
>     if ( m_pImpl.is() )
>         m_pImpl->setModified(sal_True);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException)
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::elementReplaced" );
>@@ -1448,7 +1380,6 @@ void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/
>     if ( m_pImpl.is() )
>         m_pImpl->setModified(sal_True);
> }
>-// -----------------------------------------------------------------------------
> // XDocumentDataSource
> Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocument() throw (RuntimeException)
> {
>@@ -1461,13 +1392,11 @@ Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocume
> 
>     return Reference< XOfficeDatabaseDocument >( xModel, UNO_QUERY_THROW );
> }
>-// -----------------------------------------------------------------------------
> Reference< XInterface > ODatabaseSource::getThis() const
> {
>     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getThis" );
>     return *const_cast< ODatabaseSource* >( this );
> }
>-// -----------------------------------------------------------------------------
> //........................................................................
> }	// namespace dbaccess
> //........................................................................
>diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
>index d8c997c..c47c728 100644
>--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
>+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
>@@ -67,7 +67,6 @@ namespace dbaccess
> //==========================================================================
> //= ODefinitionContainer_Impl
> //==========================================================================
>-//--------------------------------------------------------------------------
> void ODefinitionContainer_Impl::erase( TContentPtr _pDefinition )
> {
>     NamedDefinitions::iterator aPos = find( _pDefinition );
>@@ -75,7 +74,6 @@ void ODefinitionContainer_Impl::erase( TContentPtr _pDefinition )
>         m_aDefinitions.erase( aPos );
> }
> 
>-//--------------------------------------------------------------------------
> ODefinitionContainer_Impl::const_iterator ODefinitionContainer_Impl::find( TContentPtr _pDefinition ) const
> {
>     return ::std::find_if(
>@@ -88,7 +86,6 @@ ODefinitionContainer_Impl::const_iterator ODefinitionContainer_Impl::find( TCont
>     );
> }
> 
>-//--------------------------------------------------------------------------
> ODefinitionContainer_Impl::iterator ODefinitionContainer_Impl::find( TContentPtr _pDefinition )
> {
>     return ::std::find_if(
>@@ -105,7 +102,6 @@ ODefinitionContainer_Impl::iterator ODefinitionContainer_Impl::find( TContentPtr
> //= ODefinitionContainer
> //==========================================================================
> DBG_NAME(ODefinitionContainer)
>-//--------------------------------------------------------------------------
> ODefinitionContainer::ODefinitionContainer(   const Reference< XMultiServiceFactory >& _xORB
>                                             , const Reference< XInterface >&	_xParentContainer
>                                             , const TContentPtr& _pImpl
>@@ -133,7 +129,6 @@ ODefinitionContainer::ODefinitionContainer(   const Reference< XMultiServiceFact
>     DBG_CTOR(ODefinitionContainer, NULL);
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL ODefinitionContainer::disposing()
> {
>     OContentHelper::disposing();
>@@ -165,7 +160,6 @@ void SAL_CALL ODefinitionContainer::disposing()
>     m_aDocumentMap.clear();
> }
> 
>-//--------------------------------------------------------------------------
> ODefinitionContainer::~ODefinitionContainer()
> {
>     DBG_DTOR(ODefinitionContainer, NULL);
>@@ -174,12 +168,10 @@ ODefinitionContainer::~ODefinitionContainer()
> IMPLEMENT_FORWARD_XINTERFACE2( ODefinitionContainer,OContentHelper,ODefinitionContainer_Base)
> IMPLEMENT_TYPEPROVIDER2(ODefinitionContainer,OContentHelper,ODefinitionContainer_Base);
> // XServiceInfo
>-//--------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL ODefinitionContainer::getImplementationName(  ) throw(RuntimeException)
> {
>     return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ODefinitionContainer"));
> }
>-//--------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames(  ) throw(RuntimeException)
> {
>     Sequence< ::rtl::OUString > aReturn(2);
>@@ -189,7 +181,6 @@ Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNa
> }
> 
> // XNameContainer
>-//--------------------------------------------------------------------------
> void SAL_CALL ODefinitionContainer::insertByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
> {
>     ResettableMutexGuard aGuard(m_aMutex);
>@@ -203,7 +194,6 @@ void SAL_CALL ODefinitionContainer::insertByName( const ::rtl::OUString& _rName,
>     notifyByName( aGuard, _rName, xNewElement, NULL, E_INSERTED, ContainerListemers );
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL ODefinitionContainer::removeByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
> {
>     ResettableMutexGuard aGuard(m_aMutex);
>@@ -228,7 +218,6 @@ void SAL_CALL ODefinitionContainer::removeByName( const ::rtl::OUString& _rName
> }
> 
> // XNameReplace
>-//--------------------------------------------------------------------------
> void SAL_CALL ODefinitionContainer::replaceByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
> {
>     ResettableMutexGuard aGuard(m_aMutex);
>@@ -248,7 +237,6 @@ void SAL_CALL ODefinitionContainer::replaceByName( const ::rtl::OUString& _rName
>     disposeComponent(xOldElement);
> }
> 
>-// -----------------------------------------------------------------------------
> namespace
> {
>     typedef Reference< XVeto > ( SAL_CALL XContainerApproveListener::*ContainerApprovalMethod )( const ContainerEvent& );
>@@ -287,7 +275,6 @@ namespace
>     };
> }
> 
>-// -----------------------------------------------------------------------------
> void ODefinitionContainer::notifyByName( ResettableMutexGuard& _rGuard, const ::rtl::OUString& _rName,
>         const Reference< XContent >& _xNewElement, const Reference< XContent >& _xOldElement,
>         ContainerOperation _eOperation, ListenerType _eType )
>@@ -330,28 +317,24 @@ void ODefinitionContainer::notifyByName( ResettableMutexGuard& _rGuard, const ::
>         _rGuard.reset();
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL ODefinitionContainer::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException)
> {
>     if (_rxListener.is())
>         m_aContainerListeners.addInterface(_rxListener);
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL ODefinitionContainer::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException)
> {
>     if (_rxListener.is())
>         m_aContainerListeners.removeInterface(_rxListener);
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL ODefinitionContainer::addContainerApproveListener( const Reference< XContainerApproveListener >& _Listener ) throw (RuntimeException)
> {
>     if ( _Listener.is() )
>         m_aApproveListeners.addInterface( _Listener );
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL ODefinitionContainer::removeContainerApproveListener( const Reference< XContainerApproveListener >& _Listener ) throw (RuntimeException)
> {
>     if ( _Listener.is() )
>@@ -360,13 +343,11 @@ void SAL_CALL ODefinitionContainer::removeContainerApproveListener( const Refere
> 
> 
> // XElementAccess
>-//--------------------------------------------------------------------------
> Type SAL_CALL ODefinitionContainer::getElementType( ) throw (RuntimeException)
> {
>     return ::getCppuType( static_cast< Reference< XContent >* >(NULL) );
> }
> 
>-//--------------------------------------------------------------------------
> sal_Bool SAL_CALL ODefinitionContainer::hasElements( ) throw (RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -374,14 +355,12 @@ sal_Bool SAL_CALL ODefinitionContainer::hasElements( ) throw (RuntimeException)
> }
> 
> // XEnumerationAccess
>-//--------------------------------------------------------------------------
> Reference< XEnumeration > SAL_CALL ODefinitionContainer::createEnumeration(  ) throw(RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>     return new ::comphelper::OEnumerationByIndex(static_cast<XIndexAccess*>(this));
> }
> 
>-//--------------------------------------------------------------------------
> // XIndexAccess
> sal_Int32 SAL_CALL ODefinitionContainer::getCount(  ) throw(RuntimeException)
> {
>@@ -389,7 +368,6 @@ sal_Int32 SAL_CALL ODefinitionContainer::getCount(  ) throw(RuntimeException)
>     return m_aDocuments.size();
> }
> 
>-//--------------------------------------------------------------------------
> Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -410,7 +388,6 @@ Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOu
>     return makeAny(xProp);
> }
> 
>-//--------------------------------------------------------------------------
> Any SAL_CALL ODefinitionContainer::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -418,7 +395,6 @@ Any SAL_CALL ODefinitionContainer::getByName( const ::rtl::OUString& _rName ) th
>     return makeAny( implGetByName( _rName, sal_True ) );
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString& _rName, sal_Bool _bReadIfNeccessary) throw (NoSuchElementException)
> {
>     Documents::iterator aMapPos = m_aDocumentMap.find(_rName);
>@@ -440,7 +416,6 @@ Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString&
>     return xProp;
> }
> 
>-//--------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames(  ) throw(RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -459,7 +434,6 @@ Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames(  ) t
>     return aNames;
> }
> 
>-//--------------------------------------------------------------------------
> sal_Bool SAL_CALL ODefinitionContainer::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -467,7 +441,6 @@ sal_Bool SAL_CALL ODefinitionContainer::hasByName( const ::rtl::OUString& _rName
>     return checkExistence(_rName);
> }
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) throw(RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -486,7 +459,6 @@ void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) thr
>     }
> }
> 
>-//--------------------------------------------------------------------------
> void ODefinitionContainer::implRemove(const ::rtl::OUString& _rName)
> {
>     // from the object maps
>@@ -502,7 +474,6 @@ void ODefinitionContainer::implRemove(const ::rtl::OUString& _rName)
>     }
> }
> 
>-//--------------------------------------------------------------------------
> namespace
> {
>     bool    lcl_ensureName( const Reference< XContent >& _rxContent, const ::rtl::OUString& _rName )
>@@ -547,7 +518,6 @@ namespace
>         return false;
>     }
> }
>-//--------------------------------------------------------------------------
> void ODefinitionContainer::implAppend(const ::rtl::OUString& _rName, const Reference< XContent >& _rxNewObject)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -591,7 +561,6 @@ void ODefinitionContainer::implAppend(const ::rtl::OUString& _rName, const Refer
>     }
> }
> 
>-//--------------------------------------------------------------------------
> void ODefinitionContainer::implReplace(const ::rtl::OUString& _rName, const Reference< XContent >& _rxNewObject)
> {
>     DBG_ASSERT(checkExistence(_rName), "ODefinitionContainer::implReplace : invalid name !");
>@@ -602,7 +571,6 @@ void ODefinitionContainer::implReplace(const ::rtl::OUString& _rName, const Refe
>     addObjectListener(aFind->second);
> }
> 
>-// -----------------------------------------------------------------------------
> void ODefinitionContainer::approveNewObject(const ::rtl::OUString& _sName,const Reference< XContent >& _rxObject) const
> {
>     // check the arguments
>@@ -643,7 +611,6 @@ void ODefinitionContainer::approveNewObject(const ::rtl::OUString& _sName,const
>             *this );
> }
> 
>-// -----------------------------------------------------------------------------
> // XPropertyChangeListener
> void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException)
> {
>@@ -669,7 +636,6 @@ void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& e
>         m_bInPropertyChange = sal_False;
>     }
> }
>-// -----------------------------------------------------------------------------
> // XVetoableChangeListener
> void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& aEvent ) throw (PropertyVetoException, RuntimeException)
> {
>@@ -683,7 +649,6 @@ void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& a
>             throw PropertyVetoException();
>     }
> }
>-// -----------------------------------------------------------------------------
> void ODefinitionContainer::addObjectListener(const Reference< XContent >& _xNewObject)
> {
>     OSL_ENSURE(_xNewObject.is(),"ODefinitionContainer::addObjectListener: Object is null!");
>@@ -694,7 +659,6 @@ void ODefinitionContainer::addObjectListener(const Reference< XContent >& _xNewO
>         xProp->addVetoableChangeListener(PROPERTY_NAME, this);
>     }
> }
>-// -----------------------------------------------------------------------------
> void ODefinitionContainer::removeObjectListener(const Reference< XContent >& _xNewObject)
> {
>     Reference<XPropertySet> xProp(_xNewObject,UNO_QUERY);
>@@ -704,7 +668,6 @@ void ODefinitionContainer::removeObjectListener(const Reference< XContent >& _xN
>         xProp->removeVetoableChangeListener(PROPERTY_NAME, this);
>     }
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ODefinitionContainer::checkExistence(const ::rtl::OUString& _rName)
> {
>     return m_aDocumentMap.find(_rName) != m_aDocumentMap.end();
>diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
>index 08975e7..2d35d9a 100644
>--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
>+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
>@@ -91,7 +91,6 @@ public:
>     void SAL_CALL   approveElement( const ::rtl::OUString& _rName, const Reference< XInterface >& _rxElement );
> };
> 
>-//--------------------------------------------------------------------------
> void SAL_CALL LocalNameApproval::approveElement( const ::rtl::OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
> {
>     if ( _rName.indexOf( '/' ) != -1 )
>@@ -106,7 +105,6 @@ void SAL_CALL LocalNameApproval::approveElement( const ::rtl::OUString& _rName,
> //= ODocumentContainer
> //==========================================================================
> DBG_NAME(ODocumentContainer)
>-//--------------------------------------------------------------------------
> ODocumentContainer::ODocumentContainer(const Reference< XMultiServiceFactory >& _xORB
>                                     ,const Reference< XInterface >&	_xParentContainer
>                                     ,const TContentPtr& _pImpl
>@@ -123,7 +121,6 @@ ODocumentContainer::ODocumentContainer(const Reference< XMultiServiceFactory >&
>     setElementApproval( PContainerApprove( new LocalNameApproval ( _xORB ) ) );
> }
> 
>-//--------------------------------------------------------------------------
> ODocumentContainer::~ODocumentContainer()
> {
>     DBG_DTOR(ODocumentContainer, NULL);
>@@ -134,7 +131,6 @@ ODocumentContainer::~ODocumentContainer()
>         dispose();
>     }
> }
>-// -----------------------------------------------------------------------------
> IMPLEMENT_FORWARD_XINTERFACE3( ODocumentContainer,ODefinitionContainer,ODocumentContainer_Base,OPropertyStateContainer)
> IMPLEMENT_TYPEPROVIDER3(ODocumentContainer,ODefinitionContainer,OPropertyStateContainer,ODocumentContainer_Base);
> IMPLEMENT_SERVICE_INFO_IMPLNAME(ODocumentContainer, "com.sun.star.comp.dba.ODocumentContainer");
>@@ -148,13 +144,11 @@ Sequence< ::rtl::OUString > SAL_CALL ODocumentContainer::getSupportedServiceName
>     return aSupported;
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString ODocumentContainer::determineContentType() const
> {
>     return ::rtl::OUString();
> }
> 
>-//--------------------------------------------------------------------------
> Reference< XContent > ODocumentContainer::createObject( const ::rtl::OUString& _rName)
> {
>     const ODefinitionContainer_Impl& rDefinitions( getDefinitions() );
>@@ -164,7 +158,6 @@ Reference< XContent > ODocumentContainer::createObject( const ::rtl::OUString& _
>         return new ODocumentContainer( m_aContext.getLegacyServiceFactory(), *this, aFind->second, m_bFormsContainer );
>     return new ODocumentDefinition( *this, m_aContext.getLegacyServiceFactory(), aFind->second, m_bFormsContainer );
> }
>-// -----------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL ODocumentContainer::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (Exception, RuntimeException)
> {
>     return createInstanceWithArguments( aServiceSpecifier, Sequence< Any >() );
>@@ -183,7 +176,6 @@ namespace
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException)
> {
>     Reference< XInterface > xRet;
>@@ -237,7 +229,6 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
>         if ( bNew )
>         {
>             const static ::rtl::OUString sBaseName(RTL_CONSTASCII_USTRINGPARAM("Obj"));
>-            // -----------------------------------------------------------------------------
>             sPersistentName = sBaseName;
>             sPersistentName += ::rtl::OUString::valueOf(sal_Int32(rDefinitions.size() + 1));
>             Reference<XNameAccess> xElements(getContainerStorage(),UNO_QUERY);
>@@ -408,7 +399,6 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
>     xRet = xContent;
>     return xRet;
> }
>-// -----------------------------------------------------------------------------
> Sequence< ::rtl::OUString > SAL_CALL ODocumentContainer::getAvailableServiceNames(  ) throw (RuntimeException)
> {
>     Sequence< ::rtl::OUString > aSe(3);
>@@ -417,7 +407,6 @@ Sequence< ::rtl::OUString > SAL_CALL ODocumentContainer::getAvailableServiceName
>     aSe[2] = SERVICE_NAME_REPORT_COLLECTION;
>     return aSe;
> }
>-// -----------------------------------------------------------------------------
> Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException)
> {
>     Any aRet;
>@@ -502,7 +491,6 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
>         aRet = OContentHelper::execute(aCommand,CommandId,Environment);
>     return aRet;
> }
>-// -----------------------------------------------------------------------------
> namespace
> {
>     sal_Bool lcl_queryContent(const ::rtl::OUString& _sName,Reference< XNameContainer >& _xNameContainer,Any& _rRet,::rtl::OUString& _sSimpleName)
>@@ -535,7 +523,6 @@ namespace
>         return bRet;
>     }
> }
>-// -----------------------------------------------------------------------------
> Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const ::rtl::OUString& _sURL
>                                                                        , const ::rtl::OUString& /*TargetFrameName*/
>                                                                        , sal_Int32 /*SearchFlags*/
>@@ -585,7 +572,6 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const
>     }
>     return xComp;
> }
>-// -----------------------------------------------------------------------------
> Any SAL_CALL ODocumentContainer::getByHierarchicalName( const ::rtl::OUString& _sName ) throw (NoSuchElementException, RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -596,7 +582,6 @@ Any SAL_CALL ODocumentContainer::getByHierarchicalName( const ::rtl::OUString& _
>         return aContent;
>     throw NoSuchElementException(_sName,*this);
> }
>-// -----------------------------------------------------------------------------
> sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const ::rtl::OUString& _sName ) throw (RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -605,7 +590,6 @@ sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const ::rtl::OUStri
>     ::rtl::OUString sName;
>     return lcl_queryContent(_sName,xNameContainer,aContent,sName);
> }
>-// -----------------------------------------------------------------------------
> // XHierarchicalNameContainer
> void SAL_CALL ODocumentContainer::insertByHierarchicalName( const ::rtl::OUString& _sName, const Any& _aElement ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
> {
>@@ -630,7 +614,6 @@ void SAL_CALL ODocumentContainer::insertByHierarchicalName( const ::rtl::OUStrin
> 
>     xNameContainer->insertByName(sName,_aElement);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentContainer::removeByHierarchicalName( const ::rtl::OUString& _sName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
> {
>     if ( !_sName.getLength() )
>@@ -645,7 +628,6 @@ void SAL_CALL ODocumentContainer::removeByHierarchicalName( const ::rtl::OUStrin
> 
>     xNameContainer->removeByName(sName);
> }
>-// -----------------------------------------------------------------------------
> // XHierarchicalNameReplace
> void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const ::rtl::OUString& _sName, const Any& _aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
> {
>@@ -663,14 +645,12 @@ void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const ::rtl::OUStri
>     xNameContainer->replaceByName(sName,_aElement);
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL ODocumentContainer::getHierarchicalName() throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>     return impl_getHierarchicalName( false );
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const ::rtl::OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException)
> {
>     ::rtl::OUStringBuffer aBuffer;
>@@ -680,7 +660,6 @@ void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const ::rtl::OUStri
>     return aBuffer.makeStringAndClear();
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::Reference<OContentHelper> ODocumentContainer::getContent(const ::rtl::OUString& _sName) const
> {
>     ::rtl::Reference<OContentHelper> pContent = NULL;
>@@ -695,12 +674,10 @@ void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const ::rtl::OUStri
>     }
>     return pContent;
> }
>-// -----------------------------------------------------------------------------
> void ODocumentContainer::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any& _rDefault ) const
> {
>     _rDefault.clear();
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentContainer::commit(  ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -716,7 +693,6 @@ void SAL_CALL ODocumentContainer::commit(  ) throw (::com::sun::star::io::IOExce
>     if ( xTrans.is() )
>         xTrans->commit();
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentContainer::revert(  ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
> {
>     MutexGuard aGuard(m_aMutex);
>@@ -732,7 +708,6 @@ void SAL_CALL ODocumentContainer::revert(  ) throw (::com::sun::star::io::IOExce
>     if ( xTrans.is() )
>         xTrans->revert();
> }
>-// -----------------------------------------------------------------------------
> Reference< XStorage> ODocumentContainer::getContainerStorage() const
> { 
>     return  m_pImpl->m_pDataSource
>@@ -740,7 +715,6 @@ Reference< XStorage> ODocumentContainer::getContainerStorage() const
>         :   Reference< XStorage>();
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
> {
>     ResettableMutexGuard aGuard(m_aMutex);
>@@ -768,8 +742,6 @@ void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName )
> 
>     notifyByName( aGuard, _rName, NULL, NULL, E_REMOVED, ContainerListemers );
> }
>-// -----------------------------------------------------------------------------
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentContainer::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException)
> {
>     try
>diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
>index 907c6e2..ae5af16 100644
>--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
>+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
>@@ -152,7 +152,6 @@ namespace dbaccess
>     //=========================================================================
>     namespace
>     {
>-        // --------------------------------------------------------------------
>         ::rtl::OUString lcl_determineContentType_nothrow( const Reference< XStorage >& _rxContainerStorage,
>             const ::rtl::OUString& _rEntityName )
>         {
>@@ -205,7 +204,6 @@ namespace dbaccess
>         virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException);
>         virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException);
>     };
>-    //------------------------------------------------------------------
>     void SAL_CALL OEmbedObjectHolder::disposing()
>     {
>         if ( m_xBroadCaster.is() )
>@@ -213,7 +211,6 @@ namespace dbaccess
>         m_xBroadCaster = NULL;
>         m_pDefinition = NULL;
>     }
>-    //------------------------------------------------------------------
>     void SAL_CALL OEmbedObjectHolder::changingState( const lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException)
>     {
>         if ( !m_bInChangingState && nNewState == EmbedStates::RUNNING && nOldState == EmbedStates::ACTIVE && m_pDefinition )
>@@ -223,7 +220,6 @@ namespace dbaccess
>             m_bInChangingState = false;
>         }
>     }
>-    //------------------------------------------------------------------
>     void SAL_CALL OEmbedObjectHolder::stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException)
>     {
>         if ( !m_bInStateChange && nNewState == EmbedStates::RUNNING && nOldState == EmbedStates::ACTIVE && m_pDefinition )
>@@ -238,7 +234,6 @@ namespace dbaccess
>             m_bInStateChange = false;
>         }
>     }
>-    //------------------------------------------------------------------
>     void SAL_CALL OEmbedObjectHolder::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
>     {
>         m_xBroadCaster = NULL;
>@@ -352,7 +347,6 @@ namespace dbaccess
>     protected:
>     };
> 
>-    //------------------------------------------------------------------
>     void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException)
>     {
>         m_xClient.clear();
>@@ -376,14 +370,12 @@ namespace dbaccess
>         virtual void SAL_CALL setName( const ::rtl::OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException);
>     };
> 
>-    //------------------------------------------------------------------
>     void SAL_CALL ODocumentSaveContinuation::setName( const ::rtl::OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException)
>     {
>         m_sName = _sName;
>         m_xParentContainer = _xParent;
>     }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const Reference< XStorage >& _rxContainerStorage,
>     const ::rtl::OUString& _rEntityName, const ::comphelper::ComponentContext& _rContext,
>     Sequence< sal_Int8 >& _rClassId )
>@@ -393,7 +385,6 @@ namespace dbaccess
>         _rContext, _rClassId );
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const ::rtl::OUString& _rMediaType,
>     const ::comphelper::ComponentContext& _rContext, Sequence< sal_Int8 >& _rClassId )
> {
>@@ -441,13 +432,11 @@ namespace dbaccess
>     }
>     return sResult;
> }
>-// -----------------------------------------------------------------------------
> //==========================================================================
> //= ODocumentDefinition
> //==========================================================================
> DBG_NAME(ODocumentDefinition)
> 
>-//--------------------------------------------------------------------------
> ODocumentDefinition::ODocumentDefinition( const Reference< XInterface >& _rxContainer, const Reference< XMultiServiceFactory >& _xORB,
>                                           const TContentPtr& _pImpl, sal_Bool _bForm )
>     :OContentHelper(_xORB,_rxContainer,_pImpl)
>@@ -463,7 +452,6 @@ ODocumentDefinition::ODocumentDefinition( const Reference< XInterface >& _rxCont
>     registerProperties();
> }
> 
>-//--------------------------------------------------------------------------
> void ODocumentDefinition::initialLoad( const Sequence< sal_Int8 >& i_rClassID, const Sequence< PropertyValue >& i_rCreationArgs,
>                                        const Reference< XConnection >& i_rConnection )
> {
>@@ -474,7 +462,6 @@ void ODocumentDefinition::initialLoad( const Sequence< sal_Int8 >& i_rClassID, c
>     loadEmbeddedObject( i_rConnection, i_rClassID, i_rCreationArgs, false, false );
> }
> 
>-//--------------------------------------------------------------------------
> ODocumentDefinition::~ODocumentDefinition()
> {
>     DBG_DTOR(ODocumentDefinition, NULL);
>@@ -491,7 +478,6 @@ ODocumentDefinition::~ODocumentDefinition()
>         m_pInterceptor = NULL;
>     }
> }
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::closeObject()
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>@@ -515,7 +501,6 @@ void ODocumentDefinition::closeObject()
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentDefinition::disposing()
> {
>     OContentHelper::disposing();
>@@ -529,11 +514,9 @@ void SAL_CALL ODocumentDefinition::disposing()
>             xCloseable->removeCloseListener(this);
>     }
> }
>-// -----------------------------------------------------------------------------
> IMPLEMENT_TYPEPROVIDER3(ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base);
> IMPLEMENT_FORWARD_XINTERFACE3( ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base)
> IMPLEMENT_SERVICE_INFO1(ODocumentDefinition,"com.sun.star.comp.dba.ODocumentDefinition",SERVICE_SDB_DOCUMENTDEFINITION)
>-//--------------------------------------------------------------------------
> void ODocumentDefinition::registerProperties()
> {
> #define REGISTER_PROPERTY( name, location ) \
>@@ -548,7 +531,6 @@ void ODocumentDefinition::registerProperties()
>     REGISTER_PROPERTY   ( IS_FORM,         m_bForm                             );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentDefinition::getFastPropertyValue( Any& o_rValue, sal_Int32 i_nHandle ) const
> {
>     if ( i_nHandle == PROPERTY_ID_PERSISTENT_PATH )
>@@ -569,21 +551,18 @@ void SAL_CALL ODocumentDefinition::getFastPropertyValue( Any& o_rValue, sal_Int3
>     OPropertyStateContainer::getFastPropertyValue( o_rValue, i_nHandle );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XPropertySetInfo > SAL_CALL ODocumentDefinition::getPropertySetInfo(  ) throw(RuntimeException)
> {
>     Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
>     return xInfo;
> }
> 
>-//--------------------------------------------------------------------------
> IPropertyArrayHelper& ODocumentDefinition::getInfoHelper()
> {
>     return *getArrayHelper();
> }
> 
> 
>-//--------------------------------------------------------------------------
> IPropertyArrayHelper* ODocumentDefinition::createArrayHelper( ) const
> {
>     // properties maintained by our base class (see registerProperties)
>@@ -600,7 +579,6 @@ IPropertyArrayHelper* ODocumentDefinition::createArrayHelper( ) const
>     return new OPropertyArrayHelper( ::comphelper::concatSequences( aProps, aManualProps ) );
> }
> 
>-// -----------------------------------------------------------------------------
> class OExecuteImpl
> {
>     sal_Bool& m_rbSet;
>@@ -609,7 +587,6 @@ public:
>     ~OExecuteImpl(){ m_rbSet = sal_False; }
> };
> 
>-// -----------------------------------------------------------------------------
> namespace
> {
>     bool lcl_extractOpenMode( const Any& _rValue, sal_Int32& _out_rMode )
>@@ -629,7 +606,6 @@ namespace
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::impl_removeFrameFromDesktop_throw( const ::comphelper::ComponentContext& _rContxt, const Reference< XFrame >& _rxFrame )
> {
>     Reference< XFramesSupplier > xDesktop( _rContxt.createComponent( (::rtl::OUString)SERVICE_FRAME_DESKTOP ), UNO_QUERY_THROW );
>@@ -637,7 +613,6 @@ void ODocumentDefinition::impl_removeFrameFromDesktop_throw( const ::comphelper:
>     xFrames->remove( _rxFrame );
> }
> 
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::impl_onActivateEmbeddedObject_nothrow( const bool i_bReactivated )
> {
>     try
>@@ -674,7 +649,6 @@ void ODocumentDefinition::impl_onActivateEmbeddedObject_nothrow( const bool i_bR
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> namespace
> {
>     // =========================================================================
>@@ -767,7 +741,6 @@ namespace
>     };
> }
> 
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::impl_initFormEditView( const Reference< XController >& _rxController )
> {
>     try
>@@ -802,7 +775,6 @@ void ODocumentDefinition::impl_initFormEditView( const Reference< XController >&
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::impl_showOrHideComponent_throw( const bool i_bShow )
> {
>     const sal_Int32 nCurrentState = m_xEmbeddedObject.is() ? m_xEmbeddedObject->getCurrentState() : EmbedStates::LOADED;
>@@ -835,7 +807,6 @@ void ODocumentDefinition::impl_showOrHideComponent_throw( const bool i_bShow )
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, const bool _bActivate,
>         const Reference< XCommandEnvironment >& _rxEnvironment )
> {
>@@ -1019,7 +990,6 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons
>     return makeAny( xModel );
> }
> 
>-// -----------------------------------------------------------------------------
> Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException)
> {
>     Any aRet;
>@@ -1096,7 +1066,6 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
>         ::rtl::OUString sPersistentName;
>         aIni[1] >>= sPersistentName;
>         Reference< XStorage> xStorage = getContainerStorage();
>-        // -----------------------------------------------------------------------------
>         xStorage->copyElementTo(m_pImpl->m_aProps.sPersistentName,xDest,sPersistentName);
>     }
>     else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preview" ) ) )
>@@ -1168,7 +1137,6 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
> 
>     return aRet;
> }
>-// -----------------------------------------------------------------------------
> namespace
> {
>     void lcl_resetChildFormsToEmptyDataSource( const Reference< XIndexAccess>& _rxFormsContainer )
>@@ -1220,7 +1188,6 @@ namespace
> 
>     }
> }
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const Reference< XCommandEnvironment >& Environment )
>     throw( Exception )
> {
>@@ -1287,7 +1254,6 @@ void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const R
>     aGuard.clear();
> //	inserted();
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ODocumentDefinition::save(sal_Bool _bApprove)
> {
>     // default handling: instantiate an interaction handler and let it handle the parameter request
>@@ -1375,7 +1341,6 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove)
>     }
>     return sal_True;
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ODocumentDefinition::saveAs()
> {
>     // default handling: instantiate an interaction handler and let it handle the parameter request
>@@ -1433,7 +1398,6 @@ sal_Bool ODocumentDefinition::saveAs()
>                         {
>                             Reference< XStorage> xStorage = getContainerStorage();
>                             const static ::rtl::OUString sBaseName(RTL_CONSTASCII_USTRINGPARAM("Obj"));
>-                            // -----------------------------------------------------------------------------
>                             Reference<XNameAccess> xElements(xStorage,UNO_QUERY_THROW);
>                             ::rtl::OUString sPersistentName = ::dbtools::createUniqueName(xElements,sBaseName);
>                             xStorage->copyElementTo(m_pImpl->m_aProps.sPersistentName,xStorage,sPersistentName);
>@@ -1513,7 +1477,6 @@ namespace
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> namespace
> {
>     Reference< XFrame > lcl_getDatabaseDocumentFrame( ODatabaseModelImpl& _rImpl )
>@@ -1532,7 +1495,6 @@ namespace
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> sal_Bool ODocumentDefinition::objectSupportsEmbeddedScripts() const
> {
>     bool bAllowDocumentMacros = !m_pImpl->m_pDataSource
>@@ -1545,13 +1507,11 @@ sal_Bool ODocumentDefinition::objectSupportsEmbeddedScripts() const
>     return bAllowDocumentMacros;
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString ODocumentDefinition::determineContentType() const
> {
>     return lcl_determineContentType_nothrow( getContainerStorage(), m_pImpl->m_aProps.sPersistentName );
> }
> 
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::separateOpenCommandArguments( const Sequence< PropertyValue >& i_rOpenCommandArguments,
>         ::comphelper::NamedValueCollection& o_rDocumentLoadArgs, ::comphelper::NamedValueCollection& o_rEmbeddedObjectDescriptor )
> {
>@@ -1573,7 +1533,6 @@ void ODocumentDefinition::separateOpenCommandArguments( const Sequence< Property
>     o_rDocumentLoadArgs.merge( aOpenCommandArguments, false );
> }
> 
>-// -----------------------------------------------------------------------------
> Sequence< PropertyValue > ODocumentDefinition::fillLoadArgs( const Reference< XConnection>& _xConnection, const bool _bSuppressMacros, const bool _bReadOnly,
>         const Sequence< PropertyValue >& i_rOpenCommandArguments, Sequence< PropertyValue >& _out_rEmbeddedObjectDescriptor )
> {
>@@ -1657,7 +1616,6 @@ Sequence< PropertyValue > ODocumentDefinition::fillLoadArgs( const Reference< XC
> 
>     return aMediaDesc.getPropertyValues();
> }
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_rConnection, const Sequence< sal_Int8 >& _aClassID,
>         const Sequence< PropertyValue >& i_rOpenCommandArguments, const bool _bSuppressMacros, const bool _bReadOnly )
> {
>@@ -1823,7 +1781,6 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_
>         m_xLastKnownConnection = i_rConnection;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::onCommandPreview(Any& _rImage)
> {
>     loadEmbeddedObjectForPreview();
>@@ -1847,12 +1804,10 @@ void ODocumentDefinition::onCommandPreview(Any& _rImage)
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any& _rDefault ) const
> {
>     _rDefault.clear();
> }
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::onCommandGetDocumentProperties( Any& _rProps )
> {
>     loadEmbeddedObjectForPreview();
>@@ -1871,7 +1826,6 @@ void ODocumentDefinition::onCommandGetDocumentProperties( Any& _rProps )
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> Reference< util::XCloseable > ODocumentDefinition::impl_getComponent_throw( const bool i_ForceCreate )
> {
>     OSL_ENSURE(m_xEmbeddedObject.is(),"Illegal call for embeddedObject");
>@@ -1899,14 +1853,12 @@ Reference< util::XCloseable > ODocumentDefinition::impl_getComponent_throw( cons
>     return xComp;
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< util::XCloseable > ODocumentDefinition::getComponent() throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>     return impl_getComponent_throw( true );
> }
> 
>-// -----------------------------------------------------------------------------
> namespace
> {
>     Reference< XDatabaseDocumentUI > lcl_getDatabaseDocumentUI( ODatabaseModelImpl& _rModelImpl )
>@@ -1920,7 +1872,6 @@ namespace
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bForEditing )
> {
>     ::osl::ClearableMutexGuard aGuard( m_aMutex );
>@@ -1957,7 +1908,6 @@ Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bFor
>     return xComponent;
> }
> 
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::impl_store_throw()
> {
>     Reference<XEmbedPersist> xPersist( m_xEmbeddedObject, UNO_QUERY );
>@@ -1968,7 +1918,6 @@ void ODocumentDefinition::impl_store_throw()
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> bool ODocumentDefinition::impl_close_throw()
> {
>     bool bSuccess = prepareClose();
>@@ -1980,19 +1929,16 @@ bool ODocumentDefinition::impl_close_throw()
>     return bSuccess;
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XComponent > SAL_CALL ODocumentDefinition::open(  ) throw (WrappedTargetException, RuntimeException)
> {
>     return impl_openUI_nolck_throw( false );
> }
> 
>-// -----------------------------------------------------------------------------
> Reference< XComponent > SAL_CALL ODocumentDefinition::openDesign(  ) throw (WrappedTargetException, RuntimeException)
> {
>     return impl_openUI_nolck_throw( true );
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentDefinition::store(  ) throw (WrappedTargetException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -2008,7 +1954,6 @@ void SAL_CALL ODocumentDefinition::store(  ) throw (WrappedTargetException, Runt
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> ::sal_Bool SAL_CALL ODocumentDefinition::close(  ) throw (WrappedTargetException, RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>@@ -2027,14 +1972,12 @@ void SAL_CALL ODocumentDefinition::store(  ) throw (WrappedTargetException, Runt
>     return bSuccess;
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL ODocumentDefinition::getHierarchicalName() throw (RuntimeException)
> {
>     ::osl::MutexGuard aGuard( m_aMutex );
>     return impl_getHierarchicalName( false );
> }
> 
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const ::rtl::OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException)
> {
>     ::rtl::OUStringBuffer aBuffer;
>@@ -2044,7 +1987,6 @@ void SAL_CALL ODocumentDefinition::store(  ) throw (WrappedTargetException, Runt
>     return aBuffer.makeStringAndClear();
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentDefinition::rename( const ::rtl::OUString& _rNewName ) throw (SQLException, ElementExistException, RuntimeException)
> {
>     try
>@@ -2069,14 +2011,12 @@ void SAL_CALL ODocumentDefinition::rename( const ::rtl::OUString& _rNewName ) th
>         throw ElementExistException(_rNewName,*this);
>     }
> }
>-// -----------------------------------------------------------------------------
> Reference< XStorage> ODocumentDefinition::getContainerStorage() const
> {
>     return  m_pImpl->m_pDataSource
>         ?   m_pImpl->m_pDataSource->getStorage( m_bForm ? ODatabaseModelImpl::E_FORM : ODatabaseModelImpl::E_REPORT )
>         :   Reference< XStorage>();
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ODocumentDefinition::isModified()
> {
>     osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex);
>@@ -2088,7 +2028,6 @@ sal_Bool ODocumentDefinition::isModified()
>     }
>     return bRet;
> }
>-// -----------------------------------------------------------------------------
> bool ODocumentDefinition::prepareClose()
> {
>     if ( !m_xEmbeddedObject.is() )
>@@ -2146,7 +2085,6 @@ bool ODocumentDefinition::prepareClose()
> 
>     return true;
> }
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::fillReportData( const ::comphelper::ComponentContext& _rContext,
>                                                const Reference< util::XCloseable >& _rxComponent,
>                                                const Reference< XConnection >& _rxActiveConnection )
>@@ -2171,7 +2109,6 @@ void ODocumentDefinition::fillReportData( const ::comphelper::ComponentContext&
>         DBG_UNHANDLED_EXCEPTION();
>     }
> }
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::updateDocumentTitle()
> {
>     ::rtl::OUString sName = m_pImpl->m_aProps.aTitle;
>@@ -2196,7 +2133,6 @@ void ODocumentDefinition::updateDocumentTitle()
>     if ( xTitle.is() )
>         xTitle->setTitle(sName);
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentDefinition::queryClosing( const lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException)
> {
>     (void) Source;
>@@ -2211,16 +2147,13 @@ void SAL_CALL ODocumentDefinition::queryClosing( const lang::EventObject& Source
>         throw util::CloseVetoException();
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentDefinition::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
> {
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL ODocumentDefinition::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
> {
> }
> 
>-// -----------------------------------------------------------------------------
> void ODocumentDefinition::firePropertyChange( sal_Int32 i_nHandle, const Any& i_rNewValue, const Any& i_rOldValue,
>         sal_Bool i_bVetoable, const NotifierAccess )
> {
>@@ -2230,7 +2163,6 @@ void ODocumentDefinition::firePropertyChange( sal_Int32 i_nHandle, const Any& i_
> // =============================================================================
> // NameChangeNotifier
> // =============================================================================
>-// -----------------------------------------------------------------------------
> NameChangeNotifier::NameChangeNotifier( ODocumentDefinition& i_rDocumentDefinition, const ::rtl::OUString& i_rNewName,
>                                   ::osl::ResettableMutexGuard& i_rClearForNotify )
>     :m_rDocumentDefinition( i_rDocumentDefinition )
>@@ -2241,13 +2173,11 @@ NameChangeNotifier::NameChangeNotifier( ODocumentDefinition& i_rDocumentDefiniti
>     impl_fireEvent_throw( sal_True );
> }
> 
>-// -----------------------------------------------------------------------------
> NameChangeNotifier::~NameChangeNotifier()
> {
>     impl_fireEvent_throw( sal_False );
> }
> 
>-// -----------------------------------------------------------------------------
> void NameChangeNotifier::impl_fireEvent_throw( const sal_Bool i_bVetoable )
> {
>     m_rClearForNotify.clear();
>diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx
>index a17d40a..b1a4275 100644
>--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
>+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
>@@ -344,9 +344,7 @@ private:
>     */
>     sal_Bool objectSupportsEmbeddedScripts() const;
> 
>-    //-------------------------------------------------------------------------
>     //- commands
>-    //-------------------------------------------------------------------------
> 
>     void onCommandGetDocumentProperties( ::com::sun::star::uno::Any& _rProps );
>     void onCommandInsert( const ::rtl::OUString& _sURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( ::com::sun::star::uno::Exception );
>diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
>index 6788abf..615cf86 100644
>--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
>+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
>@@ -89,7 +89,6 @@ namespace dbaccess
>         }
>     };
> 
>-    //--------------------------------------------------------------------
>     namespace
>     {
>         static void lcl_dispatchScriptURL_throw( DocumentEventExecutor_Data& _rDocExecData,
>@@ -134,7 +133,6 @@ namespace dbaccess
>     //====================================================================
>     //= DocumentEventExecutor
>     //====================================================================
>-    //--------------------------------------------------------------------
>     DocumentEventExecutor::DocumentEventExecutor( const ::comphelper::ComponentContext& _rContext,
>             const Reference< XEventsSupplier >& _rxDocument )
>         :m_pData( new DocumentEventExecutor_Data( _rxDocument ) )
>@@ -157,12 +155,10 @@ namespace dbaccess
>         }
>     }
> 
>-    //--------------------------------------------------------------------
>     DocumentEventExecutor::~DocumentEventExecutor()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL DocumentEventExecutor::documentEventOccured( const DocumentEvent& _Event ) throw (RuntimeException)
>     {
>         Reference< XEventsSupplier > xEventsSupplier( m_pData->xDocument.get(), UNO_QUERY );
>@@ -219,7 +215,6 @@ namespace dbaccess
>         }
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL DocumentEventExecutor::disposing( const lang::EventObject& /*_Source*/ ) throw (RuntimeException)
>     {
>         // not interested in
>diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
>index 89c533b..7217ad8 100644
>--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
>+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
>@@ -148,20 +148,17 @@ namespace dbaccess
>         void impl_notifyEventAsync_nothrow( const DocumentEvent& _rEvent );
>     };
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL DocumentEventNotifier_Impl::acquire()
>     {
>         osl_incrementInterlockedCount( &m_refCount );
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL DocumentEventNotifier_Impl::release()
>     {
>         if ( 0 == osl_decrementInterlockedCount( &m_refCount ) )
>             delete this;
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier_Impl::disposing()
>     {
>         // SYNCHRONIZED ->
>@@ -187,7 +184,6 @@ namespace dbaccess
>         // <-- SYNCHRONIZED
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier_Impl::onDocumentInitialized()
>     {
>         if ( m_bInitialized )
>@@ -199,7 +195,6 @@ namespace dbaccess
>             m_pEventBroadcaster->create();
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier_Impl::impl_notifyEvent_nothrow( const DocumentEvent& _rEvent )
>     {
>         OSL_PRECOND( m_bInitialized,
>@@ -223,7 +218,6 @@ namespace dbaccess
>         }
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier_Impl::impl_notifyEventAsync_nothrow( const DocumentEvent& _rEvent )
>     {
>         if ( !m_pEventBroadcaster.is() )
>@@ -237,7 +231,6 @@ namespace dbaccess
>         m_pEventBroadcaster->addEvent( new DocumentEventHolder( _rEvent ), this );
>     }
> 
>-    // -----------------------------------------------------------------------------
>     void DocumentEventNotifier_Impl::processEvent( const ::comphelper::AnyEvent& _rEvent )
>     {
>         // beware, this is called from the notification thread
>@@ -253,61 +246,51 @@ namespace dbaccess
>     //====================================================================
>     //= DocumentEventNotifier
>     //====================================================================
>-    //--------------------------------------------------------------------
>     DocumentEventNotifier::DocumentEventNotifier( ::cppu::OWeakObject& _rBroadcasterDocument, ::osl::Mutex& _rMutex )
>         :m_pImpl( new DocumentEventNotifier_Impl( _rBroadcasterDocument, _rMutex ) )
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     DocumentEventNotifier::~DocumentEventNotifier()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier::disposing()
>     {
>         m_pImpl->disposing();
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier::onDocumentInitialized()
>     {
>         m_pImpl->onDocumentInitialized();
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier::addLegacyEventListener( const Reference< document::XEventListener >& _Listener )
>     {
>         m_pImpl->addLegacyEventListener( _Listener );
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier::removeLegacyEventListener( const Reference< document::XEventListener >& _Listener )
>     {
>         m_pImpl->removeLegacyEventListener( _Listener );
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier::addDocumentEventListener( const Reference< XDocumentEventListener >& _Listener )
>     {
>         m_pImpl->addDocumentEventListener( _Listener );
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier::removeDocumentEventListener( const Reference< XDocumentEventListener >& _Listener )
>     {
>         m_pImpl->removeDocumentEventListener( _Listener );
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier::notifyDocumentEvent( const ::rtl::OUString& _EventName,
>         const Reference< XController2 >& _ViewController, const Any& _Supplement )
>     {
>         m_pImpl->notifyDocumentEvent( _EventName, _ViewController, _Supplement );
>     }
> 
>-    //--------------------------------------------------------------------
>     void DocumentEventNotifier::notifyDocumentEventAsync( const ::rtl::OUString& _EventName,
>         const Reference< XController2 >& _ViewController, const Any& _Supplement )
>     {
>diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
>index 8594fc6..bcc62ab 100644
>--- a/dbaccess/source/core/dataaccess/documentevents.cxx
>+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
>@@ -87,7 +87,6 @@ namespace dbaccess
>         bool            bNeedsSyncNotify;
>     };
> 
>-    //--------------------------------------------------------------------
>     namespace
>     {
>         static const DocumentEventData* lcl_getDocumentEventData()
>@@ -126,7 +125,6 @@ namespace dbaccess
>     //====================================================================
>     //= DocumentEvents
>     //====================================================================
>-    //--------------------------------------------------------------------
>     DocumentEvents::DocumentEvents( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, DocumentEventsData& _rEventsData )
>         :m_pData( new DocumentEvents_Data( _rParent, _rMutex, _rEventsData ) )
>     {
>@@ -141,24 +139,20 @@ namespace dbaccess
>         }
>     }
> 
>-    //--------------------------------------------------------------------
>     DocumentEvents::~DocumentEvents()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL DocumentEvents::acquire() throw()
>     {
>         m_pData->rParent.acquire();
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL DocumentEvents::release() throw()
>     {
>         m_pData->rParent.release();
>     }
> 
>-    //--------------------------------------------------------------------
>     bool DocumentEvents::needsSynchronousNotification( const ::rtl::OUString& _rEventName )
>     {
>         const DocumentEventData* pEventData = lcl_getDocumentEventData();
>@@ -173,7 +167,6 @@ namespace dbaccess
>         return false;
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL DocumentEvents::replaceByName( const ::rtl::OUString& _Name, const Any& _Element ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_pData->rMutex );
>@@ -207,7 +200,6 @@ namespace dbaccess
>         elementPos->second = aEventDescriptor;
>     }
>     
>-    //--------------------------------------------------------------------
>     Any SAL_CALL DocumentEvents::getByName( const ::rtl::OUString& _Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_pData->rMutex );
>@@ -223,7 +215,6 @@ namespace dbaccess
>         return aReturn;
>     }
>     
>-    //--------------------------------------------------------------------
>     Sequence< ::rtl::OUString > SAL_CALL DocumentEvents::getElementNames(  ) throw (RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_pData->rMutex );
>@@ -238,7 +229,6 @@ namespace dbaccess
>         return aNames;
>     }
>     
>-    //--------------------------------------------------------------------
>     ::sal_Bool SAL_CALL DocumentEvents::hasByName( const ::rtl::OUString& _Name ) throw (RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_pData->rMutex );
>@@ -246,13 +236,11 @@ namespace dbaccess
>         return m_pData->rEventsData.find( _Name ) != m_pData->rEventsData.end();
>     }
>     
>-    //--------------------------------------------------------------------
>     Type SAL_CALL DocumentEvents::getElementType(  ) throw (RuntimeException)
>     {
>         return ::cppu::UnoType< Sequence< PropertyValue > >::get();
>     }
>     
>-    //--------------------------------------------------------------------
>     ::sal_Bool SAL_CALL DocumentEvents::hasElements(  ) throw (RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_pData->rMutex );
>diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
>index 352cae8..e4c0bbc 100644
>--- a/dbaccess/source/core/dataaccess/intercept.cxx
>+++ b/dbaccess/source/core/dataaccess/intercept.cxx
>@@ -416,7 +416,6 @@ void SAL_CALL OInterceptor::setMasterDispatchProvider(
>     osl::MutexGuard aGuard(m_aMutex);
>     m_xMasterDispatchProvider = NewSupplier;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OInterceptor::notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException)
> {
>     osl::ResettableMutexGuard _rGuard(m_aMutex);
>@@ -436,7 +435,6 @@ void SAL_CALL OInterceptor::notifyEvent( const ::com::sun::star::document::Event
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OInterceptor::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException)
> {
> }
>diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
>index 9ca29d4..473ed95 100644
>--- a/dbaccess/source/core/inc/column.hxx
>+++ b/dbaccess/source/core/inc/column.hxx
>@@ -73,7 +73,6 @@ namespace dbaccess
>                                                 ::com::sun::star::container::XNamed
>                                             >   OColumnBase;
> 
>-    //------------------------------------------------------------
>     class OColumn	:public comphelper::OBaseMutex
>                     ,public OColumnBase
>                     ,public ::comphelper::OPropertyContainer
>@@ -163,7 +162,6 @@ namespace dbaccess
>     class OContainerMediator;
>     typedef ::cppu::ImplHelper1< ::com::sun::star::container::XChild > TXChild;
>     typedef connectivity::OColumnsHelper OColumns_BASE;
>-    //------------------------------------------------------------
>     class OColumns : public OColumns_BASE
>                     ,public TXChild
>     {
>diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc
>index c438314..5743935 100644
>--- a/dbaccess/source/core/inc/core_resource.hrc
>+++ b/dbaccess/source/core/inc/core_resource.hrc
>@@ -32,10 +32,8 @@
> #include <svl/solar.hrc>
> #endif
> 
>-//------------------------------------------------------------------------------
> #define	RID_CORE_STRINGS_START					RID_DBACCESS_START
> 
>-//------------------------------------------------------------------------------
> //- String-IDs
> #define RID_STR_TRIED_OPEN_TABLE				( RID_CORE_STRINGS_START +  0 )
> #define RID_STR_CONNECTION_INVALID				( RID_CORE_STRINGS_START +  1 )
>diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx
>index 54dd2b8..ac7f477 100644
>--- a/dbaccess/source/core/inc/querycontainer.hxx
>+++ b/dbaccess/source/core/inc/querycontainer.hxx
>@@ -93,7 +93,6 @@ namespace dbaccess
> 
>         OContainerListener*     m_pCommandsListener;
> 
>-        // ------------------------------------------------------------------------
>         /** a class which automatically resets m_eDoingCurrently in it's destructor
>         */
>         class OAutoActionReset;	// just for the following friend declaration
>diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx
>index a5f7ad2..d5288b1 100644
>--- a/dbaccess/source/core/inc/sdbcoretools.hxx
>+++ b/dbaccess/source/core/inc/sdbcoretools.hxx
>@@ -47,16 +47,12 @@ namespace dbaccess
> {
> //.........................................................................
> 
>-    // -----------------------------------------------------------------------------
>     void notifyDataSourceModified(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject,sal_Bool _bModified);
> 
>-    // -----------------------------------------------------------------------------
>     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
>         getDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDependentObject );
> 
>-    // -----------------------------------------------------------------------------
> 
>-    // -----------------------------------------------------------------------------
>     /** 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 );
>diff --git a/dbaccess/source/core/misc/ContainerListener.cxx b/dbaccess/source/core/misc/ContainerListener.cxx
>index 37609f6..29ea91e 100644
>--- a/dbaccess/source/core/misc/ContainerListener.cxx
>+++ b/dbaccess/source/core/misc/ContainerListener.cxx
>@@ -49,12 +49,10 @@ namespace dbaccess
>     //====================================================================
>     //= OContainerListener
>     //====================================================================
>-    //--------------------------------------------------------------------
>     OContainerListener::~OContainerListener()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     Reference< XVeto > SAL_CALL OContainerListener::approveInsertElement( const ContainerEvent& _Event ) throw (WrappedTargetException, RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_rMutex );
>@@ -64,7 +62,6 @@ namespace dbaccess
>         return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveInsertElement(  _Event );
>     }
>     
>-    //--------------------------------------------------------------------
>     Reference< XVeto > SAL_CALL OContainerListener::approveReplaceElement( const ContainerEvent& _Event ) throw (WrappedTargetException, RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_rMutex );
>@@ -74,7 +71,6 @@ namespace dbaccess
>         return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveReplaceElement(  _Event );
>     }
>     
>-    //--------------------------------------------------------------------
>     Reference< XVeto > SAL_CALL OContainerListener::approveRemoveElement( const ContainerEvent& _Event ) throw (WrappedTargetException, RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_rMutex );
>@@ -84,7 +80,6 @@ namespace dbaccess
>         return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveRemoveElement(  _Event );
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL OContainerListener::elementInserted( const ContainerEvent& _Event ) throw(RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_rMutex );
>@@ -94,7 +89,6 @@ namespace dbaccess
>         dynamic_cast< XContainerListener& >( m_rDestination ).elementInserted(  _Event );
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL OContainerListener::elementRemoved( const ContainerEvent& _Event ) throw(RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_rMutex );
>@@ -104,7 +98,6 @@ namespace dbaccess
>         dynamic_cast< XContainerListener& >( m_rDestination ).elementRemoved(  _Event );
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL OContainerListener::elementReplaced( const ContainerEvent& _Event ) throw(RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_rMutex );
>@@ -114,7 +107,6 @@ namespace dbaccess
>         dynamic_cast< XContainerListener& >( m_rDestination ).elementReplaced(  _Event );
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL OContainerListener::disposing( const EventObject& _Source ) throw(RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_rMutex );
>diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
>index 38c7cc6..15eabb0 100644
>--- a/dbaccess/source/core/misc/ContainerMediator.cxx
>+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
>@@ -84,7 +84,6 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain
>         m_xContainer.clear();
>     }
> }
>-// -----------------------------------------------------------------------------
> OContainerMediator::~OContainerMediator()
> {
>     DBG_DTOR(OContainerMediator,NULL);	
>@@ -92,7 +91,6 @@ OContainerMediator::~OContainerMediator()
>     impl_cleanup_nothrow();
> }
> 
>-// -----------------------------------------------------------------------------
> void OContainerMediator::impl_cleanup_nothrow()
> {
>     try
>@@ -115,7 +113,6 @@ void OContainerMediator::impl_cleanup_nothrow()
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException)
> {		
>     ::osl::MutexGuard aGuard(m_aMutex);
>@@ -131,7 +128,6 @@ void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>@@ -153,7 +149,6 @@ void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException)
> {
>     Reference< XContainer > xContainer = m_xContainer;
>@@ -186,7 +181,6 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) throw(RuntimeException)
> {
>     ::osl::MutexGuard aGuard(m_aMutex);
>@@ -194,7 +188,6 @@ void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) thr
>     impl_cleanup_nothrow();
> }
> 
>-// -----------------------------------------------------------------------------
> void OContainerMediator::impl_initSettings_nothrow( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDestination )
> {
>     try
>@@ -211,7 +204,6 @@ void OContainerMediator::impl_initSettings_nothrow( const ::rtl::OUString& _rNam
>     }
> }
> 
>-// -----------------------------------------------------------------------------
> void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, const Reference< XPropertySet >& _xDest )
> {
>     if ( !m_xSettings.is() )
>@@ -255,7 +247,6 @@ void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, co
>     ::rtl::Reference< OPropertyForward > pForward( new OPropertyForward( _xDest, m_xSettings, _sName, aPropertyList ) );
>     m_aForwardList[ _sName ] = pForward;
> }
>-// -----------------------------------------------------------------------------
> //........................................................................
> }	// namespace dbaccess
> //........................................................................
>diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
>index 74271f6..2eb969a 100644
>--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
>+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
>@@ -58,7 +58,6 @@ using namespace ::com::sun::star;
> using ::com::sun::star::sdbc::SQLException;
> using ::com::sun::star::uno::Reference;
> using ::com::sun::star::uno::RuntimeException;
>-// -----------------------------------------------------------------------------
> DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContext > const & context) :
>     TDatabaseDataProvider(m_aMutex),
>     ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >(
>@@ -89,7 +88,6 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContex
>     }
>     osl_decrementInterlockedCount( &m_refCount );
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::disposing()
> {
>     lang::EventObject aEvt(static_cast<XWeak*>(this));
>@@ -106,50 +104,38 @@ void SAL_CALL DatabaseDataProvider::disposing()
>     ::comphelper::disposeComponent(m_xInternal);
>     m_xActiveConnection.clear();
> }
>-// -----------------------------------------------------------------------------
> uno::Any DatabaseDataProvider::queryInterface(uno::Type const & type) throw (uno::RuntimeException)
> {
>     return TDatabaseDataProvider::queryInterface(type);
> }
>-// -----------------------------------------------------------------------------
> 
>-//------------------------------------------------------------------------------
> rtl::OUString DatabaseDataProvider::getImplementationName_Static(  ) throw(uno::RuntimeException)
> {
>     return rtl::OUString::createFromAscii("com.sun.star.comp.chart2.data.DatabaseDataProvider");
> }
>-// -----------------------------------------------------------------------------
>-// -------------------------------------------------------------------------
> // XServiceInfo
> ::rtl::OUString SAL_CALL DatabaseDataProvider::getImplementationName(  ) throw(uno::RuntimeException)
> {
>     return getImplementationName_Static();
> }
>-// -----------------------------------------------------------------------------
>-// -------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException)
> {
>     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
> }
>-// -----------------------------------------------------------------------------
>-//------------------------------------------------------------------------------
> uno::Sequence< ::rtl::OUString > DatabaseDataProvider::getSupportedServiceNames_Static(  ) throw (uno::RuntimeException)
> {
>     uno::Sequence< rtl::OUString > aSNS( 1 );
>     aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DatabaseDataProvider"));
>     return aSNS;
> }
>-// -----------------------------------------------------------------------------
> uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames(  ) throw(uno::RuntimeException)
> {
>     return getSupportedServiceNames_Static();
> }
>-// -----------------------------------------------------------------------------
> uno::Reference< uno::XInterface > DatabaseDataProvider::Create(uno::Reference< uno::XComponentContext > const & context)
> {
>     return *(new DatabaseDataProvider(context)) ;
> }
>-// -----------------------------------------------------------------------------
> // lang::XInitialization:
> void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception)
> {
>@@ -165,7 +151,6 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
>     }
>     m_xAggregateSet->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, uno::makeAny( m_xActiveConnection ) );
> }
>-// -----------------------------------------------------------------------------
> 
> // chart2::data::XDataProvider:
> ::sal_Bool SAL_CALL DatabaseDataProvider::createDataSourcePossible(const uno::Sequence< beans::PropertyValue > & _aArguments) throw (uno::RuntimeException)
>@@ -199,8 +184,6 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
>     }
>     return sal_True;
> }
>-// -----------------------------------------------------------------------------
>-// -----------------------------------------------------------------------------
> uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::createDataSource(const uno::Sequence< beans::PropertyValue > & _aArguments) throw (uno::RuntimeException, lang::IllegalArgumentException)
> {
>     osl::ResettableMutexGuard aClearForNotifies(m_aMutex);
>@@ -251,7 +234,6 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat
>     }
>     return m_xInternal->createDataSource(_aArguments);
> }
>-// -----------------------------------------------------------------------------
> 
> uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArguments(const uno::Reference< chart2::data::XDataSource > & _xDataSource) throw (uno::RuntimeException)
> {
>@@ -291,13 +273,11 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum
>         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE );
>     return aArguments;
> }
>-// -----------------------------------------------------------------------------
> 
> ::sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const ::rtl::OUString & /*aRangeRepresentation*/) throw (uno::RuntimeException)
> {
>     return sal_True;
> }
>-// -----------------------------------------------------------------------------
> uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const
> {
>     ::std::map< ::rtl::OUString,com::sun::star::uno::Any>::const_iterator aFind = m_aNumberFormats.find(_sRangeRepresentation);
>@@ -305,7 +285,6 @@ uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const ::rtl::OUSt
>         return aFind->second;
>     return uno::makeAny(sal_Int32(0));
> }
>-// -----------------------------------------------------------------------------
> uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const ::rtl::OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException)
> {
>     osl::MutexGuard g(m_aMutex);
>@@ -387,7 +366,6 @@ double SAL_CALL DatabaseDataProvider::getNotANumber()    throw (uno::RuntimeExce
>     return m_xComplexDescriptionAccess->isNotANumber(nNumber);
> }
> 
>-// -----------------------------------------------------------------------------
> 
> uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRangeSelection() throw (uno::RuntimeException)
> {
>@@ -398,64 +376,54 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRange
>     // different Any initialization in Java and C++ polymorphic structs.
>     return uno::Reference< sheet::XRangeSelection >();
> }
>-// -----------------------------------------------------------------------------
> // chart2::data::XRangeXMLConversion:
> ::rtl::OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const ::rtl::OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_xRangeConversion->convertRangeToXML(_sRangeRepresentation);
> }
>-// -----------------------------------------------------------------------------
> 
> ::rtl::OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const ::rtl::OUString & _sXMLRange) throw (uno::RuntimeException, lang::IllegalArgumentException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_xRangeConversion->convertRangeFromXML(_sXMLRange);
> }
>-// -----------------------------------------------------------------------------
> 
> // com.sun.star.beans.XPropertySet:
> uno::Reference< beans::XPropertySetInfo > SAL_CALL DatabaseDataProvider::getPropertySetInfo() throw (uno::RuntimeException)
> {
>     return ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::getPropertySetInfo();
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::setPropertyValue(const ::rtl::OUString & aPropertyName, const uno::Any & aValue) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException)
> {
>     ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::setPropertyValue(aPropertyName, aValue);
> }
>-// -----------------------------------------------------------------------------
> 
> uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const ::rtl::OUString & aPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException)
> {
>     return ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::getPropertyValue(aPropertyName);
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException)
> {
>     ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addPropertyChangeListener(aPropertyName, xListener);
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException)
> {
>     ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removePropertyChangeListener(aPropertyName, xListener);
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException)
> {
>     ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addVetoableChangeListener(aPropertyName, xListener);
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::removeVetoableChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException)
> {
>     ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removeVetoableChangeListener(aPropertyName, xListener);
> }
>-// -----------------------------------------------------------------------------
> 
> // chart2::data::XDatabaseDataProvider:
> uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getMasterFields() throw (uno::RuntimeException)
>@@ -463,33 +431,28 @@ uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getMasterFields(
>     osl::MutexGuard g(m_aMutex);
>     return m_MasterFields;
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::setMasterFields(const uno::Sequence< ::rtl::OUString > & the_value) throw (uno::RuntimeException)
> {
>     impl_invalidateParameter_nothrow();
>     set(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MasterFields")),the_value,m_MasterFields);
> }
>-// -----------------------------------------------------------------------------
> 
> uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getDetailFields() throw (uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_DetailFields;
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::setDetailFields(const uno::Sequence< ::rtl::OUString > & the_value) throw (uno::RuntimeException)
> {
>     set(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DetailFields")),the_value,m_DetailFields);
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL DatabaseDataProvider::getCommand() throw (uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_Command;
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::setCommand(const ::rtl::OUString & the_value) throw (uno::RuntimeException)
> {
>@@ -500,14 +463,12 @@ void SAL_CALL DatabaseDataProvider::setCommand(const ::rtl::OUString & the_value
>     }
>     set(PROPERTY_COMMAND,the_value,m_Command);
> }
>-// -----------------------------------------------------------------------------
> 
> ::sal_Int32 SAL_CALL DatabaseDataProvider::getCommandType() throw (uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_CommandType;
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) throw (uno::RuntimeException)
> {
>@@ -517,14 +478,12 @@ void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) throw
>     }
>     set(PROPERTY_COMMAND_TYPE,the_value,m_CommandType);
> }
>-// -----------------------------------------------------------------------------
> 
> ::rtl::OUString SAL_CALL DatabaseDataProvider::getFilter() throw (uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_aFilterManager.getFilterComponent( dbtools::FilterManager::fcPublicFilter );
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::setFilter(const ::rtl::OUString & the_value) throw (uno::RuntimeException)
> {
>@@ -534,13 +493,11 @@ void SAL_CALL DatabaseDataProvider::setFilter(const ::rtl::OUString & the_value)
>     }
>     set(PROPERTY_FILTER,the_value,m_Filter);
> }
>-// -----------------------------------------------------------------------------
> ::sal_Bool SAL_CALL DatabaseDataProvider::getApplyFilter() throw (RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_ApplyFilter;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setApplyFilter( ::sal_Bool the_value ) throw (RuntimeException)
> {
>     {
>@@ -549,13 +506,11 @@ void SAL_CALL DatabaseDataProvider::setApplyFilter( ::sal_Bool the_value ) throw
>     }
>     set(PROPERTY_APPLYFILTER,the_value,m_ApplyFilter);
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL DatabaseDataProvider::getHavingClause() throw (uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_HavingClause;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setHavingClause( const ::rtl::OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException)
> {
>     {
>@@ -564,13 +519,11 @@ void SAL_CALL DatabaseDataProvider::setHavingClause( const ::rtl::OUString& the_
>     }
>     set(PROPERTY_HAVING_CLAUSE,the_value,m_HavingClause);
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL DatabaseDataProvider::getGroupBy() throw (uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_GroupBy;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setGroupBy( const ::rtl::OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException)
> {
>     {
>@@ -579,13 +532,11 @@ void SAL_CALL DatabaseDataProvider::setGroupBy( const ::rtl::OUString& the_value
>     }
>     set(PROPERTY_GROUP_BY,the_value,m_GroupBy);
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL DatabaseDataProvider::getOrder() throw (uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_Order;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setOrder( const ::rtl::OUString& the_value ) throw (uno::RuntimeException)
> {
>     {
>@@ -594,37 +545,31 @@ void SAL_CALL DatabaseDataProvider::setOrder( const ::rtl::OUString& the_value )
>     }
>     set(PROPERTY_ORDER,the_value,m_Order);
> }
>-// -----------------------------------------------------------------------------
> ::sal_Bool SAL_CALL DatabaseDataProvider::getEscapeProcessing() throw (uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_EscapeProcessing;
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::setEscapeProcessing(::sal_Bool the_value) throw (uno::RuntimeException)
> {
>     set(PROPERTY_ESCAPE_PROCESSING,the_value,m_EscapeProcessing);
> }
>-// -----------------------------------------------------------------------------
> ::sal_Int32 SAL_CALL DatabaseDataProvider::getRowLimit() throw (uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_RowLimit;
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::setRowLimit(::sal_Int32 the_value) throw (uno::RuntimeException)
> {
>     set(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowLimit")),the_value,m_RowLimit);
> }
>-// -----------------------------------------------------------------------------
> uno::Reference< sdbc::XConnection > SAL_CALL DatabaseDataProvider::getActiveConnection() throw (uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_xActiveConnection;
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::setActiveConnection(const uno::Reference< sdbc::XConnection > & the_value) throw (uno::RuntimeException, lang::IllegalArgumentException)
> {
>@@ -632,25 +577,21 @@ void SAL_CALL DatabaseDataProvider::setActiveConnection(const uno::Reference< sd
>         throw lang::IllegalArgumentException();
>     set(PROPERTY_ACTIVE_CONNECTION,the_value,m_xActiveConnection);
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString SAL_CALL DatabaseDataProvider::getDataSourceName() throw (uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     return m_DataSourceName;
> }
>-// -----------------------------------------------------------------------------
> 
> void SAL_CALL DatabaseDataProvider::setDataSourceName(const ::rtl::OUString& the_value) throw (uno::RuntimeException)
> {
>     set(PROPERTY_DATASOURCENAME,the_value,m_DataSourceName);
> }
>-// -----------------------------------------------------------------------------
> void DatabaseDataProvider::impl_executeRowSet_throw(::osl::ResettableMutexGuard& _rClearForNotifies)
> {
>     if ( impl_fillParameters_nothrow(_rClearForNotifies) )
>         m_xRowSet->execute();
> }
>-// -----------------------------------------------------------------------------
> void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const uno::Sequence< uno::Sequence< ::rtl::OUString > >& i_aColumnNames)
> {
>     // clear the data before fill the new one
>@@ -783,14 +724,12 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat
>     }
>     xData->setData(aData);
> }
>-// -----------------------------------------------------------------------------
> void DatabaseDataProvider::impl_fillRowSet_throw()
> {
>     m_xAggregateSet->setPropertyValue( PROPERTY_FILTER,   uno::makeAny( getFilter() ) );
>     uno::Reference< sdbc::XParameters> xParam(m_xRowSet,uno::UNO_QUERY_THROW);
>     xParam->clearParameters( );
> }
>-// -----------------------------------------------------------------------------
> bool DatabaseDataProvider::impl_fillParameters_nothrow( ::osl::ResettableMutexGuard& _rClearForNotifies)
> {
>     // do we have to fill the parameters again?
>@@ -803,159 +742,133 @@ bool DatabaseDataProvider::impl_fillParameters_nothrow( ::osl::ResettableMutexGu
>     return true;
> }
> // com::sun::star::sdbc::XParameters
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setNull(parameterIndex, sqlType);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setBoolean(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setByte(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setShort(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setInt(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setLong(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setFloat(sal_Int32 parameterIndex, float x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setFloat(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setDouble(sal_Int32 parameterIndex, double x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setDouble(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setString(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setBytes(sal_Int32 parameterIndex, const uno::Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setBytes(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setDate(sal_Int32 parameterIndex, const util::Date& x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setDate(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setTime(sal_Int32 parameterIndex, const util::Time& x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setTime(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setTimestamp(sal_Int32 parameterIndex, const util::DateTime& x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setTimestamp(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setBinaryStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setBinaryStream(parameterIndex, x, length);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setCharacterStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setCharacterStream(parameterIndex, x, length);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setObjectWithInfo(sal_Int32 parameterIndex, const uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setObjectWithInfo(parameterIndex, x, targetSqlType, scale);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setObject(sal_Int32 parameterIndex, const uno::Any& x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setObject(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setRef(sal_Int32 parameterIndex, const uno::Reference<sdbc::XRef>& x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setRef(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setBlob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XBlob>& x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setBlob(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setClob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XClob>& x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setClob(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setArray(sal_Int32 parameterIndex, const Reference<sdbc::XArray>& x) throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.setArray(parameterIndex, x);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::clearParameters() throw( SQLException, RuntimeException )
> {
>     m_aParameterManager.clearParameters();
> }
> //==============================================================================
> // com::sun::star::sdbc::XRowSet
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::execute() throw( SQLException, RuntimeException )
> {
>     uno::Sequence< beans::PropertyValue > aEmpty;
>     createDataSource(aEmpty);
> }
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::addRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener) throw( RuntimeException )
> {
>     if (m_xRowSet.is())
>         m_xRowSet->addRowSetListener(_rListener);
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::removeRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener) throw( RuntimeException )
> {
>     if (m_xRowSet.is())
>@@ -963,129 +876,107 @@ void SAL_CALL DatabaseDataProvider::removeRowSetListener(const uno::Reference<sd
> }
> //==============================================================================
> // com::sun::star::sdbc::XResultSet
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::next() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->next();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::isBeforeFirst() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->isBeforeFirst();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::isAfterLast() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->isAfterLast();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::isFirst() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->isFirst();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::isLast() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->isLast();
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::beforeFirst() throw( SQLException, RuntimeException )
> {
>     m_xRowSet->beforeFirst();
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::afterLast() throw( SQLException, RuntimeException )
> {
>     m_xRowSet->afterLast();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::first() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->first();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::last() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->last();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Int32 SAL_CALL DatabaseDataProvider::getRow() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->getRow();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::absolute(sal_Int32 row) throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->absolute(row);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::relative(sal_Int32 rows) throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->relative(rows);
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::previous() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->previous();
> }
> 
>-//------------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::refreshRow() throw( SQLException, RuntimeException )
> {
>     m_xRowSet->refreshRow();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::rowUpdated() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->rowUpdated();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::rowInserted() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->rowInserted();
> }
> 
>-//------------------------------------------------------------------------------
> sal_Bool SAL_CALL DatabaseDataProvider::rowDeleted() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->rowDeleted();
> }
> 
>-//------------------------------------------------------------------------------
> uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getStatement() throw( SQLException, RuntimeException )
> {
>     return m_xRowSet->getStatement();
> }
>-// -----------------------------------------------------------------------------
> uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getParent(  ) throw (uno::RuntimeException)
> {
>     return m_xParent;
> }
>-// -----------------------------------------------------------------------------
> void SAL_CALL DatabaseDataProvider::setParent( const uno::Reference< uno::XInterface >& _xParent ) throw (lang::NoSupportException, uno::RuntimeException)
> {
>     osl::MutexGuard g(m_aMutex);
>     m_xParent = _xParent;
> }
>-// -----------------------------------------------------------------------------
> void DatabaseDataProvider::impl_invalidateParameter_nothrow()
> {
>     osl::MutexGuard g(m_aMutex);
>     m_aParameterManager.clearAllParameterInformation();
> }
>-// -----------------------------------------------------------------------------
> } // namespace dbaccess
>diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx
>index e6e41a0..e1e4a8b 100644
>--- a/dbaccess/source/core/misc/PropertyForward.cxx
>+++ b/dbaccess/source/core/misc/PropertyForward.cxx
>@@ -53,7 +53,6 @@ namespace dbaccess
> 
>     DBG_NAME(OPropertyForward)	
> 
>-    //------------------------------------------------------------------------
>     OPropertyForward::OPropertyForward( const Reference< XPropertySet>& _xSource, const Reference< XNameAccess>& _xDestContainer,
>             const ::rtl::OUString& _sName, const ::std::vector< ::rtl::OUString>& _aPropertyList )
>         :m_xSource( _xSource, UNO_SET_THROW )
>@@ -83,13 +82,11 @@ namespace dbaccess
>         osl_decrementInterlockedCount( &m_refCount );
>     }
> 
>-    // -----------------------------------------------------------------------------
>     OPropertyForward::~OPropertyForward()
>     {
>         DBG_DTOR(OPropertyForward,NULL);	
>     }
> 
>-    // -----------------------------------------------------------------------------
>     void SAL_CALL OPropertyForward::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException)
>     {
>         ::osl::MutexGuard aGuard( m_aMutex );
>@@ -132,7 +129,6 @@ namespace dbaccess
>         }
>     }
> 
>-    // -----------------------------------------------------------------------------
>     void SAL_CALL OPropertyForward::disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ ) throw (RuntimeException)
>     {
>         ::osl::MutexGuard aGuard(m_aMutex);
>@@ -147,7 +143,6 @@ namespace dbaccess
>         m_xDest = NULL;
>     }
> 
>-    // -----------------------------------------------------------------------------
>     void OPropertyForward::setDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDest )
>     {
>         ::osl::MutexGuard aGuard( m_aMutex );
>diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx
>index 5135cd8..9dac34a 100644
>--- a/dbaccess/source/core/misc/apitools.cxx
>+++ b/dbaccess/source/core/misc/apitools.cxx
>@@ -48,7 +48,6 @@ using namespace dbaccess;
> //= OSubComponent
> //============================================================
> DBG_NAME(OSubComponent)
>-//--------------------------------------------------------------------------
> OSubComponent::OSubComponent(Mutex& _rMutex, const Reference< XInterface > & xParent)
>               :OComponentHelper(_rMutex)
>               ,m_xParent(xParent)
>@@ -56,7 +55,6 @@ OSubComponent::OSubComponent(Mutex& _rMutex, const Reference< XInterface > & xPa
>     DBG_CTOR(OSubComponent,NULL);
> 
> }
>-// -----------------------------------------------------------------------------
> OSubComponent::~OSubComponent()
> {
>     m_xParent = NULL;
>@@ -65,7 +63,6 @@ OSubComponent::~OSubComponent()
> }
> 
> // com::sun::star::lang::XTypeProvider
>-//--------------------------------------------------------------------------
> Sequence< Type > OSubComponent::getTypes() throw (RuntimeException)
> {
>     OTypeCollection aTypes(::getCppuType( (const Reference< XComponent > *)0 ),
>@@ -76,13 +73,11 @@ Sequence< Type > OSubComponent::getTypes() throw (RuntimeException)
> }
> 
> // XInterface
>-//--------------------------------------------------------------------------
> void OSubComponent::acquire() throw ( )
> {
>     OComponentHelper::acquire();
> }
> 
>-//--------------------------------------------------------------------------
> void OSubComponent::release() throw ( )
> {
>     Reference< XInterface > x( xDelegator );
>@@ -132,7 +127,6 @@ void OSubComponent::release() throw ( )
>     OWeakAggObject::release();
> }
> 
>-//--------------------------------------------------------------------------
> Any OSubComponent::queryInterface( const Type & rType ) throw(RuntimeException)
> {
>     Any aReturn;
>diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
>index 778a65f..efe4c00 100644
>--- a/dbaccess/source/core/misc/dsntypes.cxx
>+++ b/dbaccess/source/core/misc/dsntypes.cxx
>@@ -67,7 +67,6 @@ namespace dbaccess
> //= ODsnTypeCollection
> //=========================================================================
> DBG_NAME(ODsnTypeCollection)
>-//-------------------------------------------------------------------------
> ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory)
> :m_aDriverConfig(_xFactory)
> ,m_xFactory(_xFactory)
>@@ -89,18 +88,15 @@ ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< :
>         "ODsnTypeCollection::ODsnTypeCollection : invalid resources !");
> }
> 
>-//-------------------------------------------------------------------------
> ODsnTypeCollection::~ODsnTypeCollection()
> {
>     DBG_DTOR(ODsnTypeCollection,NULL);
>     DBG_ASSERT(0 == m_nLivingIterators, "ODsnTypeCollection::~ODsnTypeCollection : there are still living iterator objects!");
> }
>-//-------------------------------------------------------------------------
> String ODsnTypeCollection::getTypeDisplayName(const ::rtl::OUString& _sURL) const
> {
>     return m_aDriverConfig.getDriverTypeDisplayName(_sURL);
> }
>-//-------------------------------------------------------------------------
> String ODsnTypeCollection::cutPrefix(const ::rtl::OUString& _sURL) const
> {
>     String sURL( _sURL);
>@@ -124,7 +120,6 @@ String ODsnTypeCollection::cutPrefix(const ::rtl::OUString& _sURL) const
>     return sRet;
> }
> 
>-//-------------------------------------------------------------------------
> String ODsnTypeCollection::getPrefix(const ::rtl::OUString& _sURL) const
> {
>     String sURL( _sURL);
>@@ -149,14 +144,12 @@ String ODsnTypeCollection::getPrefix(const ::rtl::OUString& _sURL) const
>     return sRet;
> }
> 
>-//-------------------------------------------------------------------------
> bool ODsnTypeCollection::hasDriver( const sal_Char* _pAsciiPattern ) const
> {
>     String sPrefix( getPrefix( ::rtl::OUString::createFromAscii( _pAsciiPattern ) ) );
>     return ( sPrefix.Len() > 0 );
> }
> 
>-// -----------------------------------------------------------------------------
> bool ODsnTypeCollection::isConnectionUrlRequired(const ::rtl::OUString& _sURL) const
> {
>     String sURL( _sURL);
>@@ -175,13 +168,11 @@ bool ODsnTypeCollection::isConnectionUrlRequired(const ::rtl::OUString& _sURL) c
>     } // for(;aIter != aEnd;++aIter)
>     return sRet.GetChar(sRet.Len()-1) == '*';
> }
>-// -----------------------------------------------------------------------------
> String ODsnTypeCollection::getMediaType(const ::rtl::OUString& _sURL) const
> {
>     const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
>     return aFeatures.getOrDefault("MediaType",::rtl::OUString());
> }
>-// -----------------------------------------------------------------------------
> String ODsnTypeCollection::getDatasourcePrefixFromMediaType(const ::rtl::OUString& _sMediaType,const ::rtl::OUString& _sExtension)
> {
>     String sURL, sFallbackURL;
>@@ -210,7 +201,6 @@ String ODsnTypeCollection::getDatasourcePrefixFromMediaType(const ::rtl::OUStrin
>     sURL.EraseTrailingChars('*');
>     return sURL;
> }
>-// -----------------------------------------------------------------------------
> bool ODsnTypeCollection::isShowPropertiesEnabled( const ::rtl::OUString& _sURL ) const
> {
>     return !(    _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")-1) 
>@@ -223,7 +213,6 @@ bool ODsnTypeCollection::isShowPropertiesEnabled( const ::rtl::OUString& _sURL )
>             ||  _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:ldap",sizeof("sdbc:address:evolution:ldap")-1) 
>             ||  _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:macab",sizeof("sdbc:address:macab")-1)  );
> }
>-// -----------------------------------------------------------------------------
> void ODsnTypeCollection::extractHostNamePort(const ::rtl::OUString& _rDsn,String& _sDatabaseName,String& _rsHostname,sal_Int32& _nPortNumber) const
> {
>     String sUrl = cutPrefix(_rDsn);
>@@ -267,57 +256,48 @@ void ODsnTypeCollection::extractHostNamePort(const ::rtl::OUString& _rDsn,String
>         }
>     }
> }
>-// -----------------------------------------------------------------------------
> String ODsnTypeCollection::getJavaDriverClass(const ::rtl::OUString& _sURL) const
> {
>     const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getProperties(_sURL);
>     return aFeatures.getOrDefault("JavaDriverClass",::rtl::OUString());
> }
>-//-------------------------------------------------------------------------
> sal_Bool ODsnTypeCollection::isFileSystemBased(const ::rtl::OUString& _sURL) const
> {
>     const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
>     return aFeatures.getOrDefault("FileSystemBased",sal_False);
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ODsnTypeCollection::supportsTableCreation(const ::rtl::OUString& _sURL) const
> {
>     const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
>     return aFeatures.getOrDefault("SupportsTableCreation",sal_False);
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ODsnTypeCollection::supportsColumnDescription(const ::rtl::OUString& _sURL) const
> {
>     const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
>     return aFeatures.getOrDefault("SupportsColumnDescription",sal_False);
> }
>-// -----------------------------------------------------------------------------
> sal_Bool ODsnTypeCollection::supportsBrowsing(const ::rtl::OUString& _sURL) const
> {
>     const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
>     return aFeatures.getOrDefault("SupportsBrowsing",sal_False);
> }
>-// -----------------------------------------------------------------------------
> bool ODsnTypeCollection::needsJVM(const String& _sURL) const
> {
>     const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
>     return aFeatures.getOrDefault("UseJava",sal_False);
> }
>-// -----------------------------------------------------------------------------
> Sequence<PropertyValue> ODsnTypeCollection::getDefaultDBSettings( const ::rtl::OUString& _sURL ) const
> {
>     const ::comphelper::NamedValueCollection& aProperties = m_aDriverConfig.getProperties(_sURL);
>     return aProperties.getPropertyValues();
> }
> 
>-//-------------------------------------------------------------------------
> bool ODsnTypeCollection::isEmbeddedDatabase( const ::rtl::OUString& _sURL ) const
> {
>     const ::rtl::OUString sEmbeddedDatabaseURL = getEmbeddedDatabase();
>     WildCard aWildCard(sEmbeddedDatabaseURL);
>     return aWildCard.Matches(_sURL);
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString ODsnTypeCollection::getEmbeddedDatabase() const
> {
>     ::rtl::OUString sEmbeddedDatabaseURL;
>@@ -338,18 +318,15 @@ bool ODsnTypeCollection::isEmbeddedDatabase( const ::rtl::OUString& _sURL ) cons
>         sEmbeddedDatabaseURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:embedded:hsqldb"));
>     return sEmbeddedDatabaseURL;
> }
>-//-------------------------------------------------------------------------
> ODsnTypeCollection::TypeIterator ODsnTypeCollection::begin() const
> {
>     return TypeIterator(this, 0);
> }
> 
>-//-------------------------------------------------------------------------
> ODsnTypeCollection::TypeIterator ODsnTypeCollection::end() const
> {
>     return TypeIterator(this, m_aDsnTypesDisplayNames.size());
> }
>-//-------------------------------------------------------------------------
> DATASOURCE_TYPE ODsnTypeCollection::determineType(const String& _rDsn) const
> {
>     String sDsn(_rDsn);
>@@ -451,7 +428,6 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const String& _rDsn) const
> 
>     return DST_UNKNOWN;
> }
>-// -----------------------------------------------------------------------------
> void ODsnTypeCollection::fillPageIds(const ::rtl::OUString& _sURL,::std::vector<sal_Int16>& _rOutPathIds) const
> {
>     DATASOURCE_TYPE eType = determineType(_sURL);
>@@ -516,7 +492,6 @@ void ODsnTypeCollection::fillPageIds(const ::rtl::OUString& _sURL,::std::vector<
>             break;
>     }
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString ODsnTypeCollection::getType(const ::rtl::OUString& _sURL) const
> {
>     ::rtl::OUString sOldPattern;
>@@ -532,7 +507,6 @@ void ODsnTypeCollection::fillPageIds(const ::rtl::OUString& _sURL,::std::vector<
>     } // for(sal_Int32 i = 0;aIter != aEnd;++aIter,++i)
>     return sOldPattern;
> }
>-// -----------------------------------------------------------------------------
> sal_Int32 ODsnTypeCollection::getIndexOf(const ::rtl::OUString& _sURL) const
> {
>     sal_Int32 nRet = -1;
>@@ -552,7 +526,6 @@ sal_Int32 ODsnTypeCollection::getIndexOf(const ::rtl::OUString& _sURL) const
>     
>     return nRet;
> }
>-// -----------------------------------------------------------------------------
> sal_Int32 ODsnTypeCollection::size() const
> {
>     return m_aDsnPrefixes.size();
>@@ -560,7 +533,6 @@ sal_Int32 ODsnTypeCollection::size() const
> //=========================================================================
> //= ODsnTypeCollection::TypeIterator
> //=========================================================================
>-//-------------------------------------------------------------------------
> ODsnTypeCollection::TypeIterator::TypeIterator(const ODsnTypeCollection* _pContainer, sal_Int32 _nInitialPos)
>     :m_pContainer(_pContainer)
>     ,m_nPosition(_nInitialPos)
>@@ -571,7 +543,6 @@ ODsnTypeCollection::TypeIterator::TypeIterator(const ODsnTypeCollection* _pConta
> #endif
> }
> 
>-//-------------------------------------------------------------------------
> ODsnTypeCollection::TypeIterator::TypeIterator(const TypeIterator& _rSource)
>     :m_pContainer(_rSource.m_pContainer)
>     ,m_nPosition(_rSource.m_nPosition)
>@@ -581,7 +552,6 @@ ODsnTypeCollection::TypeIterator::TypeIterator(const TypeIterator& _rSource)
> #endif
> }
> 
>-//-------------------------------------------------------------------------
> ODsnTypeCollection::TypeIterator::~TypeIterator()
> {
> #ifdef DBG_UTIL
>@@ -589,19 +559,16 @@ ODsnTypeCollection::TypeIterator::~TypeIterator()
> #endif
> }
> 
>-//-------------------------------------------------------------------------
> String ODsnTypeCollection::TypeIterator::getDisplayName() const
> {
>     DBG_ASSERT(m_nPosition < (sal_Int32)m_pContainer->m_aDsnTypesDisplayNames.size(), "ODsnTypeCollection::TypeIterator::getDisplayName : invalid position!");
>     return m_pContainer->m_aDsnTypesDisplayNames[m_nPosition];
> }
>-// -----------------------------------------------------------------------------
> ::rtl::OUString ODsnTypeCollection::TypeIterator::getURLPrefix() const
> {
>     DBG_ASSERT(m_nPosition < (sal_Int32)m_pContainer->m_aDsnPrefixes.size(), "ODsnTypeCollection::TypeIterator::getDisplayName : invalid position!");
>     return m_pContainer->m_aDsnPrefixes[m_nPosition];
> }
>-//-------------------------------------------------------------------------
> const ODsnTypeCollection::TypeIterator&	ODsnTypeCollection::TypeIterator::operator++()
> {
>     DBG_ASSERT(m_nPosition < (sal_Int32)m_pContainer->m_aDsnTypesDisplayNames.size(), "ODsnTypeCollection::TypeIterator::operator++ : invalid position!");
>@@ -610,7 +577,6 @@ const ODsnTypeCollection::TypeIterator&	ODsnTypeCollection::TypeIterator::operat
>     return *this;
> }
> 
>-//-------------------------------------------------------------------------
> const ODsnTypeCollection::TypeIterator&	ODsnTypeCollection::TypeIterator::operator--()
> {
>     DBG_ASSERT(m_nPosition >= 0, "ODsnTypeCollection::TypeIterator::operator-- : invalid position!");
>@@ -619,7 +585,6 @@ const ODsnTypeCollection::TypeIterator&	ODsnTypeCollection::TypeIterator::operat
>     return *this;
> }
> 
>-//-------------------------------------------------------------------------
> bool operator==(const ODsnTypeCollection::TypeIterator& lhs, const ODsnTypeCollection::TypeIterator& rhs)
> {
>     return (lhs.m_pContainer == rhs.m_pContainer) && (lhs.m_nPosition == rhs.m_nPosition);
>diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
>index 2538faf..1f4dedd 100644
>--- a/dbaccess/source/core/misc/objectnameapproval.cxx
>+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
>@@ -71,7 +71,6 @@ namespace dbaccess
>     //====================================================================
>     //= ObjectNameApproval
>     //====================================================================
>-    //--------------------------------------------------------------------
>     ObjectNameApproval::ObjectNameApproval( const Reference< XConnection >& _rxConnection, ObjectType _eType )
>         :m_pImpl( new ObjectNameApproval_Impl )
>     {
>@@ -79,12 +78,10 @@ namespace dbaccess
>         m_pImpl->nCommandType = _eType == TypeQuery ? CommandType::QUERY : CommandType::TABLE;
>     }
> 
>-    //--------------------------------------------------------------------
>     ObjectNameApproval::~ObjectNameApproval()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL ObjectNameApproval::approveElement( const ::rtl::OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
>     {
>         Reference< XConnection > xConnection( m_pImpl->aConnection );
>diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
>index 6fb936c..9e39ef6 100644
>--- a/dbaccess/source/core/misc/sdbcoretools.cxx
>+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
>@@ -66,7 +66,6 @@ namespace dbaccess
>     using namespace ::com::sun::star::container;
> 
>     // =========================================================================
>-    // -------------------------------------------------------------------------
>     void notifyDataSourceModified(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject,sal_Bool _bModified)
>     {
>         Reference< XInterface > xDs = getDataSource( _rxObject );
>@@ -78,7 +77,6 @@ namespace dbaccess
>             xModi->setModified(_bModified);
>     }
> 
>-    // -------------------------------------------------------------------------
>     Reference< XInterface > getDataSource( const Reference< XInterface >& _rxDependentObject )
>     {
>         Reference< XInterface > xParent = _rxDependentObject;
>@@ -92,7 +90,6 @@ namespace dbaccess
>         return xReturn;
>     }
> 
>-// -----------------------------------------------------------------------------
>     ::rtl::OUString extractExceptionMessage( const ::comphelper::ComponentContext& _rContext, const Any& _rError )
>     {
>         ::rtl::OUString sDisplayMessage;
>@@ -133,7 +130,6 @@ namespace dbaccess
> 
>     namespace tools { namespace stor {
> 
>-    // -----------------------------------------------------------------------------
>     bool storageIsWritable_nothrow( const Reference< XStorage >& _rxStorage )
>     {
>         if ( !_rxStorage.is() )
>@@ -153,7 +149,6 @@ namespace dbaccess
>         return ( nMode & ElementModes::WRITE ) != 0;
>     }
> 
>-    // -----------------------------------------------------------------------------
>     bool commitStorageIfWriteable( const Reference< XStorage >& _rxStorage ) SAL_THROW(( IOException, WrappedTargetException, RuntimeException ))
>     {
>         bool bSuccess = false;
>diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
>index 7b3ea6a..79eb629 100644
>--- a/dbaccess/source/core/misc/services.cxx
>+++ b/dbaccess/source/core/misc/services.cxx
>@@ -53,7 +53,6 @@ extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource();
> extern "C" void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory();
> 
> namespace dba{
>-//--------------------------------------------------------------------------
>     ::cppu::ImplementationEntry entries[] = {
>         { &::dbaccess::DatabaseDataProvider::Create, &::dbaccess::DatabaseDataProvider::getImplementationName_Static, &::dbaccess::DatabaseDataProvider::getSupportedServiceNames_Static,
>             &cppu::createSingleComponentFactory, 0, 0 },
>@@ -82,7 +81,6 @@ extern "C" void SAL_CALL createRegistryInfo_DBA()
>     }
> }
> 
>-//---------------------------------------------------------------------------------------
> 
> extern "C" OOO_DLLPUBLIC_DBA void SAL_CALL component_getImplementationEnvironment(
>                 const sal_Char	**ppEnvTypeName,
>@@ -93,7 +91,6 @@ extern "C" OOO_DLLPUBLIC_DBA void SAL_CALL component_getImplementationEnvironmen
>     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
> }
> 
>-//---------------------------------------------------------------------------------------
> extern "C" OOO_DLLPUBLIC_DBA sal_Bool SAL_CALL component_writeInfo(
>                 void* pServiceManager,
>                 void* pRegistryKey
>@@ -115,7 +112,6 @@ extern "C" OOO_DLLPUBLIC_DBA sal_Bool SAL_CALL component_writeInfo(
>     return sal_False;
> }
> 
>-//---------------------------------------------------------------------------------------
> extern "C" OOO_DLLPUBLIC_DBA void* SAL_CALL component_getFactory(
>                     const sal_Char* pImplementationName,
>                     void* pServiceManager,
>diff --git a/dbaccess/source/core/misc/userinformation.cxx b/dbaccess/source/core/misc/userinformation.cxx
>index 7af4e7c..a70706d 100644
>--- a/dbaccess/source/core/misc/userinformation.cxx
>+++ b/dbaccess/source/core/misc/userinformation.cxx
>@@ -39,7 +39,6 @@ using namespace ::utl;
> using namespace ::com::sun::star::uno;
> using namespace ::com::sun::star::lang;
> 
>-//--------------------------------------------------------------------------
> UserInformation::UserInformation()
> {
>     Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE);
>diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx
>index ab6c94d..258faf3 100644
>--- a/dbaccess/source/core/misc/veto.cxx
>+++ b/dbaccess/source/core/misc/veto.cxx
>@@ -46,25 +46,21 @@ namespace dbaccess
>     //====================================================================
>     //= Veto
>     //====================================================================
>-    //--------------------------------------------------------------------
>     Veto::Veto( const ::rtl::OUString& _rReason, const Any& _rDetails )
>         :m_sReason( _rReason )
>         ,m_aDetails( _rDetails )
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     Veto::~Veto()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     ::rtl::OUString SAL_CALL Veto::getReason() throw (RuntimeException)
>     {
>         return m_sReason;
>     }
>     
>-    //--------------------------------------------------------------------
>     Any SAL_CALL Veto::getDetails() throw (RuntimeException)
>     {
>         return m_aDetails;
>diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
>index 67ef81a..144353d 100644
>--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
>+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
>@@ -275,18 +275,15 @@ namespace dbaccess
>     //====================================================================
>     //= DatabaseDocumentRecovery
>     //====================================================================
>-    //--------------------------------------------------------------------
>     DatabaseDocumentRecovery::DatabaseDocumentRecovery( const ::comphelper::ComponentContext& i_rContext )
>         :m_pData( new DatabaseDocumentRecovery_Data( i_rContext ) )
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     DatabaseDocumentRecovery::~DatabaseDocumentRecovery()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     void DatabaseDocumentRecovery::saveModifiedSubComponents( const Reference< XStorage >& i_rTargetStorage,
>         const ::std::vector< Reference< XController > >& i_rControllers )
>     {
>@@ -341,7 +338,6 @@ namespace dbaccess
>         tools::stor::commitStorageIfWriteable( xRecoveryStorage );
>     }
> 
>-    //--------------------------------------------------------------------
>     void DatabaseDocumentRecovery::recoverSubDocuments( const Reference< XStorage >& i_rDocumentStorage,
>         const Reference< XController >& i_rTargetController )
>     {
>diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
>index e644b11..3130ea2 100644
>--- a/dbaccess/source/core/recovery/settingsimport.cxx
>+++ b/dbaccess/source/core/recovery/settingsimport.cxx
>@@ -57,24 +57,20 @@ namespace dbaccess
>     //====================================================================
>     //= SettingsImport
>     //====================================================================
>-    //--------------------------------------------------------------------
>     SettingsImport::SettingsImport()
>         :m_refCount( 0 )
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     SettingsImport::~SettingsImport()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     oslInterlockedCount SAL_CALL SettingsImport::acquire()
>     {
>         return osl_incrementInterlockedCount( &m_refCount );
>     }
> 
>-    //--------------------------------------------------------------------
>     oslInterlockedCount SAL_CALL SettingsImport::release()
>     {
>         oslInterlockedCount newCount = osl_decrementInterlockedCount( &m_refCount );
>@@ -83,7 +79,6 @@ namespace dbaccess
>         return newCount;
>     }
> 
>-    //--------------------------------------------------------------------
>     void SettingsImport::startElement( const Reference< XAttributeList >& i_rAttributes )
>     {
>         // find the name of the setting
>@@ -94,18 +89,15 @@ namespace dbaccess
>         }
>     }
> 
>-    //--------------------------------------------------------------------
>     void SettingsImport::endElement()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     void SettingsImport::characters( const ::rtl::OUString& i_rCharacters )
>     {
>         m_aCharacters.append( i_rCharacters );
>     }
> 
>-    //--------------------------------------------------------------------
>     void SettingsImport::split( const ::rtl::OUString& i_rElementName, ::rtl::OUString& o_rNamespace, ::rtl::OUString& o_rLocalName )
>     {
>         o_rNamespace = ::rtl::OUString();
>@@ -125,7 +117,6 @@ namespace dbaccess
>     //====================================================================
>     //= IgnoringSettingsImport
>     //====================================================================
>-    //--------------------------------------------------------------------
>     ::rtl::Reference< SettingsImport > IgnoringSettingsImport::nextState( const ::rtl::OUString& i_rElementName )
>     {
>         (void)i_rElementName;
>@@ -135,18 +126,15 @@ namespace dbaccess
>     //====================================================================
>     //= OfficeSettingsImport
>     //====================================================================
>-    //--------------------------------------------------------------------
>     OfficeSettingsImport::OfficeSettingsImport( ::comphelper::NamedValueCollection& o_rSettings )
>         :m_rSettings( o_rSettings )
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     OfficeSettingsImport::~OfficeSettingsImport()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     ::rtl::Reference< SettingsImport > OfficeSettingsImport::nextState( const ::rtl::OUString& i_rElementName )
>     {
>         // separate the namespace part from the element name
>@@ -169,18 +157,15 @@ namespace dbaccess
>     //====================================================================
>     //= ConfigItemImport
>     //====================================================================
>-    //--------------------------------------------------------------------
>     ConfigItemImport::ConfigItemImport( ::comphelper::NamedValueCollection& o_rSettings )
>         :m_rSettings( o_rSettings )
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     ConfigItemImport::~ConfigItemImport()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     ::rtl::Reference< SettingsImport > ConfigItemImport::nextState( const ::rtl::OUString& i_rElementName )
>     {
>         OSL_ENSURE( false, "ConfigItemImport::nextState: unexpected: this class is responsible for child-less items only!" );
>@@ -188,7 +173,6 @@ namespace dbaccess
>         return new IgnoringSettingsImport;
>     }
> 
>-    //--------------------------------------------------------------------
>     void ConfigItemImport::endElement()
>     {
>         SettingsImport::endElement();
>@@ -200,7 +184,6 @@ namespace dbaccess
>         m_rSettings.put( sItemName, aValue );
>     }
> 
>-    //--------------------------------------------------------------------
>     void ConfigItemImport::getItemValue( ::com::sun::star::uno::Any& o_rValue ) const
>     {
>         o_rValue.clear();
>@@ -250,18 +233,15 @@ namespace dbaccess
>     //====================================================================
>     //= ConfigItemSetImport
>     //====================================================================
>-    //--------------------------------------------------------------------
>     ConfigItemSetImport::ConfigItemSetImport( ::comphelper::NamedValueCollection& o_rSettings )
>         :ConfigItemImport( o_rSettings )
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     ConfigItemSetImport::~ConfigItemSetImport()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     ::rtl::Reference< SettingsImport > ConfigItemSetImport::nextState( const ::rtl::OUString& i_rElementName )
>     {
>         // separate the namespace part from the element name
>@@ -283,7 +263,6 @@ namespace dbaccess
>         return new IgnoringSettingsImport;
>     }
> 
>-    //--------------------------------------------------------------------
>     void ConfigItemSetImport::getItemValue( Any& o_rValue ) const
>     {
>         o_rValue <<= m_aChildSettings.getPropertyValues();
>diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
>index c02569b..9273ab5 100644
>--- a/dbaccess/source/core/recovery/storagestream.cxx
>+++ b/dbaccess/source/core/recovery/storagestream.cxx
>@@ -58,7 +58,6 @@ namespace dbaccess
>     //====================================================================
>     //= StorageOutputStream
>     //====================================================================
>-    //--------------------------------------------------------------------
>     StorageOutputStream::StorageOutputStream(   const ::comphelper::ComponentContext& i_rContext,
>                                                 const Reference< XStorage >& i_rParentStorage,
>                                                 const ::rtl::OUString& i_rStreamName
>@@ -72,12 +71,10 @@ namespace dbaccess
>         m_xOutputStream.set( xStream->getOutputStream(), UNO_SET_THROW );
>     }
> 
>-    //--------------------------------------------------------------------
>     StorageOutputStream::~StorageOutputStream()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     void StorageOutputStream::close()
>     {
>         ENSURE_OR_RETURN_VOID( m_xOutputStream.is(), "already closed" );
>@@ -91,7 +88,6 @@ namespace dbaccess
>     //====================================================================
>     //= StorageInputStream
>     //====================================================================
>-    //--------------------------------------------------------------------
>     StorageInputStream::StorageInputStream( const ::comphelper::ComponentContext& i_rContext,
>                                             const Reference< XStorage >& i_rParentStorage,
>                                             const ::rtl::OUString& i_rStreamName
>@@ -105,12 +101,10 @@ namespace dbaccess
>         m_xInputStream.set( xStream->getInputStream(), UNO_SET_THROW );
>     }
> 
>-    //--------------------------------------------------------------------
>     StorageInputStream::~StorageInputStream()
>     {
>     }
> 
>-    //--------------------------------------------------------------------
>     void StorageInputStream::close()
>     {
>         ENSURE_OR_RETURN_VOID( m_xInputStream.is(), "already closed" );
>diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
>index 0a680a1..17a2b1d 100644
>--- a/dbaccess/source/core/recovery/storagetextstream.cxx
>+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
>@@ -70,14 +70,12 @@ namespace dbaccess
>     //==================================================================================================================
>     namespace
>     {
>-        //--------------------------------------------------------------------------------------------------------------
>         static const ::rtl::OUString& lcl_getTextStreamEncodingName()
>         {
>             static const ::rtl::OUString s_sMapStreamEncodingName( RTL_CONSTASCII_USTRINGPARAM( "UTF-8" ) );
>             return s_sMapStreamEncodingName;
>         }
> 
>-        //--------------------------------------------------------------------------------------------------------------
>         static const ::rtl::OUString& lcl_getLineFeed()
>         {
>             static const ::rtl::OUString s_sLineFeed( sal_Unicode( '\n' ) );
>@@ -88,7 +86,6 @@ namespace dbaccess
>     //==================================================================================================================
>     //= StorageTextOutputStream
>     //==================================================================================================================
>-    //------------------------------------------------------------------------------------------------------------------
>     StorageTextOutputStream::StorageTextOutputStream(   const ::comphelper::ComponentContext& i_rContext,
>                                                         const Reference< XStorage >& i_rParentStorage,
>                                                         const ::rtl::OUString& i_rStreamName
>@@ -103,12 +100,10 @@ namespace dbaccess
>         xDataSource->setOutputStream( getOutputStream() );
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     StorageTextOutputStream::~StorageTextOutputStream()
>     {
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     void StorageTextOutputStream::writeLine( const ::rtl::OUString& i_rLine )
>     {
>         ENSURE_OR_RETURN_VOID( m_pData->xTextOutput.is(), "no text output" );
>@@ -117,7 +112,6 @@ namespace dbaccess
>         m_pData->xTextOutput->writeString( lcl_getLineFeed() );
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     void StorageTextOutputStream::writeLine()
>     {
>         ENSURE_OR_RETURN_VOID( m_pData->xTextOutput.is(), "no text output" );
>diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx
>index 47a3268..9c72377 100644
>--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
>+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
>@@ -81,7 +81,6 @@ namespace dbaccess
>     //==================================================================================================================
>     //= StorageXMLOutputStream
>     //==================================================================================================================
>-    //------------------------------------------------------------------------------------------------------------------
>     StorageXMLOutputStream::StorageXMLOutputStream( const ::comphelper::ComponentContext& i_rContext,
>                                                     const Reference< XStorage >& i_rParentStorage,
>                                                     const ::rtl::OUString& i_rStreamName )
>@@ -97,12 +96,10 @@ namespace dbaccess
>         m_pData->xAttributes = new SvXMLAttributeList;
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     StorageXMLOutputStream::~StorageXMLOutputStream()
>     {
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     void StorageXMLOutputStream::close()
>     {
>         ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "illegal document handler" );
>@@ -111,13 +108,11 @@ namespace dbaccess
>         // endDocument
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     void StorageXMLOutputStream::addAttribute( const ::rtl::OUString& i_rName, const ::rtl::OUString& i_rValue ) const
>     {
>         m_pData->xAttributes->AddAttribute( i_rName, i_rValue );
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     void StorageXMLOutputStream::startElement( const ::rtl::OUString& i_rElementName ) const
>     {
>         ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
>@@ -127,7 +122,6 @@ namespace dbaccess
>         m_pData->aElements.push( i_rElementName );
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     void StorageXMLOutputStream::endElement() const
>     {
>         ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
>@@ -138,7 +132,6 @@ namespace dbaccess
>         m_pData->aElements.pop();
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     void StorageXMLOutputStream::ignorableWhitespace( const ::rtl::OUString& i_rWhitespace ) const
>     {
>         ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
>@@ -146,7 +139,6 @@ namespace dbaccess
>         m_pData->xHandler->ignorableWhitespace( i_rWhitespace );
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     void StorageXMLOutputStream::characters( const ::rtl::OUString& i_rCharacters ) const
>     {
>         ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
>@@ -165,7 +157,6 @@ namespace dbaccess
>     //==================================================================================================================
>     //= StorageXMLInputStream
>     //==================================================================================================================
>-    //------------------------------------------------------------------------------------------------------------------
>     StorageXMLInputStream::StorageXMLInputStream( const ::comphelper::ComponentContext& i_rContext,
>                                                   const Reference< XStorage >& i_rParentStorage,
>                                                   const ::rtl::OUString& i_rStreamName )
>@@ -175,7 +166,6 @@ namespace dbaccess
>         m_pData->xParser.set( i_rContext.createComponent( "com.sun.star.xml.sax.Parser" ), UNO_QUERY_THROW );
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     void StorageXMLInputStream::import( const Reference< XDocumentHandler >& i_rHandler )
>     {
>         ENSURE_OR_THROW( i_rHandler.is(), "illegal document handler (NULL)" );
>@@ -187,7 +177,6 @@ namespace dbaccess
>         m_pData->xParser->parseStream( aInputSource );
>     }
> 
>-    //------------------------------------------------------------------------------------------------------------------
>     StorageXMLInputStream::~StorageXMLInputStream()
>     {
>     }
>diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx
>index 5ea946f..e6fc4b4 100644
>--- a/dbaccess/source/core/recovery/subcomponentloader.cxx
>+++ b/dbaccess/source/core/recovery/subcomponentloader.cxx
>@@ -120,7 +120,6 @@ namespace dbaccess
>     //====================================================================
>     //= SubComponentLoader
>     //====================================================================
>-    //--------------------------------------------------------------------
>     SubComponentLoader::SubComponentLoader( const Reference< XController >& i_rApplicationController,
>             const Reference< XCommandProcessor >& i_rSubDocumentDefinition )
>         :m_pData( new SubComponentLoader_Data( i_rSubDocumentDefinition ) )
>@@ -136,7 +135,6 @@ namespace dbaccess
>         osl_decrementInterlockedCount( &m_refCount );
>     }
> 
>-    //--------------------------------------------------------------------
>     SubComponentLoader::SubComponentLoader( const Reference< XController >& i_rApplicationController,
>             const Reference< XComponent >& i_rNonDocumentComponent )
>         :m_pData( new SubComponentLoader_Data( i_rNonDocumentComponent ) )
>@@ -152,27 +150,23 @@ namespace dbaccess
>         osl_decrementInterlockedCount( &m_refCount );
>     }
> 
>-    //--------------------------------------------------------------------
>     SubComponentLoader::~SubComponentLoader()
>     {
>         delete m_pData, m_pData = NULL;
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL SubComponentLoader::windowResized( const WindowEvent& i_rEvent ) throw (RuntimeException)
>     {
>         // not interested in
>         (void)i_rEvent;
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL SubComponentLoader::windowMoved( const WindowEvent& i_rEvent ) throw (RuntimeException)
>     {
>         // not interested in
>         (void)i_rEvent;
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL SubComponentLoader::windowShown( const EventObject& i_rEvent ) throw (RuntimeException)
>     {
>         (void)i_rEvent;
>@@ -181,14 +175,12 @@ namespace dbaccess
>         m_pData->xAppComponentWindow->removeWindowListener( this );
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL SubComponentLoader::windowHidden( const EventObject& i_rEvent ) throw (RuntimeException)
>     {
>         // not interested in
>         (void)i_rEvent;
>     }
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL SubComponentLoader::disposing( const EventObject& i_rEvent ) throw (RuntimeException)
>     {
>         // not interested in
>diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
>index c2ec6c6..eb79d0b 100644
>--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
>+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
>@@ -241,19 +241,16 @@ namespace dbaccess
>         const ::rtl::OUStringBuffer             m_aNamespace;
>     };
> 
>-    //--------------------------------------------------------------------
>     void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue )
>     {
>         m_rDelegator.addAttribute( impl_prefix( i_eName ), i_rValue );
>     }
> 
>-    //--------------------------------------------------------------------
>     void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue )
>     {
>         m_rDelegator.addAttribute( impl_prefix( i_eName ), ::xmloff::token::GetXMLToken( i_eValue ) );
>     }
> 
>-    //--------------------------------------------------------------------
>     void SettingsExportContext::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace )
>     {
>         if ( i_bIgnoreWhitespace )
>@@ -262,7 +259,6 @@ namespace dbaccess
>         m_rDelegator.startElement( impl_prefix( i_eName ) );
>     }
> 
>-    //--------------------------------------------------------------------
>     void SettingsExportContext::EndElement( const sal_Bool i_bIgnoreWhitespace )
>     {
>         if ( i_bIgnoreWhitespace )
>@@ -270,13 +266,11 @@ namespace dbaccess
>         m_rDelegator.endElement();
>     }
> 
>-    //--------------------------------------------------------------------
>     void SettingsExportContext::Characters( const ::rtl::OUString& i_rCharacters )
>     {
>         m_rDelegator.characters( i_rCharacters );
>     }
> 
>-    //--------------------------------------------------------------------
>     Reference< XMultiServiceFactory > SettingsExportContext::GetServiceFactory() const
>     {
>         return m_rContext.getLegacyServiceFactory();
>@@ -317,17 +311,14 @@ namespace dbaccess
>         ::comphelper::NamedValueCollection                  m_aSettings;
>     };
> 
>-    //--------------------------------------------------------------------
>     void SAL_CALL SettingsDocumentHandler::startDocument(  ) throw (SAXException, RuntimeException)
>     {
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL SettingsDocumentHandler::endDocument(  ) throw (SAXException, RuntimeException)
>     {
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL SettingsDocumentHandler::startElement( const ::rtl::OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException)
>     {
>         ::rtl::Reference< SettingsImport >  pNewState;
>@@ -359,7 +350,6 @@ namespace dbaccess
>         m_aStates.push( pNewState );
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL SettingsDocumentHandler::endElement( const ::rtl::OUString& i_Name ) throw (SAXException, RuntimeException)
>     {
>         ENSURE_OR_THROW( !m_aStates.empty(), "no active element" );
>@@ -370,7 +360,6 @@ namespace dbaccess
>         m_aStates.pop();
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL SettingsDocumentHandler::characters( const ::rtl::OUString& i_Chars ) throw (SAXException, RuntimeException)
>     {
>         ENSURE_OR_THROW( !m_aStates.empty(), "no active element" );
>@@ -379,14 +368,12 @@ namespace dbaccess
>         pCurrentState->characters( i_Chars );
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException)
>     {
>         // ignore them - that's why they're called "ignorable"
>         (void)aWhitespaces;
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL SettingsDocumentHandler::processingInstruction( const ::rtl::OUString& i_Target, const ::rtl::OUString& i_Data ) throw (SAXException, RuntimeException)
>     {
>         OSL_ENSURE( false, "SettingsDocumentHandler::processingInstruction: unexpected ..." );
>@@ -394,7 +381,6 @@ namespace dbaccess
>         (void)i_Data;
>     }
>     
>-    //--------------------------------------------------------------------
>     void SAL_CALL SettingsDocumentHandler::setDocumentLocator( const Reference< XLocator >& i_Locator ) throw (SAXException, RuntimeException)
>     {
>         (void)i_Locator;
>@@ -403,7 +389,6 @@ namespace dbaccess
>     //====================================================================
>     //= SubComponentRecovery
>     //====================================================================
>-    //--------------------------------------------------------------------
>     const ::rtl::OUString SubComponentRecovery::getComponentsStorageName( const SubComponentType i_eType )
>     {
>         static const ::rtl::OUString s_sFormsStorageName( RTL_CONSTASCII_USTRINGPARAM( "forms" ) );
>@@ -433,7 +418,6 @@ namespace dbaccess
>         return s_sFallback;
>     }
> 
>-    //--------------------------------------------------------------------
>     void SubComponentRecovery::saveToRecoveryStorage( const Reference< XStorage >& i_rRecoveryStorage,
>         MapCompTypeToCompDescs& io_mapCompDescs )
>     {
>@@ -480,7 +464,6 @@ namespace dbaccess
>         rMapCompDescs[ sStorName ] = m_aCompDesc;
>     }
> 
>-    //--------------------------------------------------------------------
>     void SubComponentRecovery::impl_identifyComponent_throw()
>     {
>         // ask the controller
>@@ -532,7 +515,6 @@ namespace dbaccess
>             "SubComponentRecovery::impl_identifyComponent_throw: couldn't classify the component!" );
>     }
> 
>-    //--------------------------------------------------------------------
>     void SubComponentRecovery::impl_saveQueryDesign_throw( const Reference< XStorage >& i_rObjectStorage )
>     {
>         ENSURE_OR_THROW( m_eType == QUERY, "illegal sub component type" );
>@@ -561,7 +543,6 @@ namespace dbaccess
>         aDesignOutput.close();
>     }
> 
>-    //--------------------------------------------------------------------
>     void SubComponentRecovery::impl_saveSubDocument_throw( const Reference< XStorage >& i_rObjectStorage )
>     {
>         ENSURE_OR_THROW( ( m_eType == FORM ) || ( m_eType == REPORT ), "illegal sub component type" );
>@@ -572,7 +553,6 @@ namespace dbaccess
>         xStorageDocument->storeToStorage( i_rObjectStorage, Sequence< PropertyValue >() );
>     }
> 
>-    //--------------------------------------------------------------------
>     Reference< XComponent > SubComponentRecovery::impl_recoverSubDocument_throw( const Reference< XStorage >& i_rRecoveryStorage,
>             const ::rtl::OUString& i_rComponentName, const bool i_bForEditing )
>     {
>@@ -622,7 +602,6 @@ namespace dbaccess
>         return xSubComponent;
>     }
> 
>-    //--------------------------------------------------------------------
>     Reference< XComponent > SubComponentRecovery::impl_recoverQueryDesign_throw( const Reference< XStorage >& i_rRecoveryStorage,
>         const ::rtl::OUString& i_rComponentName,  const bool i_bForEditing )
>     {
>@@ -676,7 +655,6 @@ namespace dbaccess
>         return xSubComponent;
>     }
> 
>-    //--------------------------------------------------------------------
>     Reference< XComponent > SubComponentRecovery::recoverFromStorage( const Reference< XStorage >& i_rRecoveryStorage,
>             const ::rtl::OUString& i_rComponentName, const bool i_bForEditing )
>     {
>diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx
>index 65a8373..00bcfc9 100644
>--- a/dbaccess/source/core/recovery/subcomponents.hxx
>+++ b/dbaccess/source/core/recovery/subcomponents.hxx
>@@ -44,7 +44,6 @@ namespace dbaccess
> 
>     namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
> 
>-    // -------------------------------------------------------------------
>     enum SubComponentType
>     {
>         TABLE = DatabaseObject::TABLE,
>@@ -57,7 +56,6 @@ namespace dbaccess
>         UNKNOWN         = 10001
>     };
> 
>-    // -------------------------------------------------------------------
>     struct DBACCESS_DLLPRIVATE SubComponentDescriptor
>     {
>         ::rtl::OUString     sName;
>@@ -76,7 +74,6 @@ namespace dbaccess
>         }
>     };
> 
>-    // -------------------------------------------------------------------
>     typedef ::std::hash_map< ::rtl::OUString, SubComponentDescriptor, ::rtl::OUStringHash > MapStringToCompDesc;
>     typedef ::std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs;
> 
>diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx
>index 5ab4c15..9919fa6 100644
>--- a/dbaccess/source/core/resource/core_resource.cxx
>+++ b/dbaccess/source/core/resource/core_resource.cxx
>@@ -34,7 +34,6 @@
> 
> // ---- needed as long as we have no contexts for components ---
> #include <vcl/svapp.hxx>
>-//---------------------------------------------------
> 
> #include <svl/solar.hrc>
> 
>@@ -49,7 +48,6 @@ namespace dbaccess
>     sal_Int32		ResourceManager::s_nClients = 0;
>     ResMgr*         ResourceManager::m_pImpl = NULL;
> 
>-    //------------------------------------------------------------------
>     void ResourceManager::ensureImplExists()
>     {
>         if (m_pImpl)
>@@ -62,7 +60,6 @@ namespace dbaccess
>         m_pImpl = ResMgr::CreateResMgr(sFileName.GetBuffer(), aLocale);
>     }
> 
>-    //------------------------------------------------------------------
>     ::rtl::OUString ResourceManager::loadString(sal_uInt16 _nResId)
>     {
>         ::rtl::OUString sReturn;
>@@ -74,7 +71,6 @@ namespace dbaccess
>         return sReturn;
>     }
> 
>-    //------------------------------------------------------------------
>     ::rtl::OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii, const ::rtl::OUString& _rReplace )
>     {
>         String sString( loadString( _nResId ) );
>@@ -82,7 +78,6 @@ namespace dbaccess
>         return sString;
>     }
> 
>-    //------------------------------------------------------------------
>     ::rtl::OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii1, const ::rtl::OUString& _rReplace1,
>         const sal_Char* _pPlaceholderAscii2, const ::rtl::OUString& _rReplace2 )
>     {
>@@ -92,14 +87,12 @@ namespace dbaccess
>         return sString;
>     }
> 
>-    //-------------------------------------------------------------------------
>     void ResourceManager::registerClient()
>     {
>         ::osl::MutexGuard aGuard(s_aMutex);
>         ++s_nClients;
>     }
> 
>-    //-------------------------------------------------------------------------
>     void ResourceManager::revokeClient()
>     {
>         ::osl::MutexGuard aGuard(s_aMutex);
>-- 
>1.7.1
>

Actions: View

Attachments on bug 30801: 39384 | 39397 | 39398 | 39400