remove dead codes and undesired comments

38 files changed, 7 insertions, 98 deletions

diff --git a/dbaccess/qa/complex/dbaccess/Beamer.java b/dbaccess/qa/complex/dbaccess/Beamer.java
index 797b5bca6..ec47e7945 100644
--- a/dbaccess/qa/complex/dbaccess/Beamer.java
+++ b/dbaccess/qa/complex/dbaccess/Beamer.java
@@ -142,7 +142,6 @@ public class Beamer extends complexlib.ComplexTestCase
         final XFrame frame = controller.getFrame();
         final XDispatchProvider dispatchP = (XDispatchProvider) UnoRuntime.queryInterface(XDispatchProvider.class, frame);
         URL command = new URL();
-        // command.Complete = ".component:DB/DataSourceBrowser";
         command.Complete = ".uno:ViewDataSourceBrowser";
 
         Object instance = getORB().createInstance("com.sun.star.util.URLTransformer");
diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java
index ecf66e830..c3e83c9c5 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -97,11 +97,7 @@ public class RowSet extends ComplexTestCase
                 for (int i = 0; m_resultSet.next(); ++i)
                 {
                     int pos = m_resultSet.getRow();
-                    // final int val = m_row.getInt(1);
-//                    log.println("Clone Move(" + m_id +")  before i: " + (i+1) + " Pos: " + pos + " Val: " + val);
                     testPosition(m_resultSet, m_row, i + 1, "clone move(" + m_id + ")");
-//                    val = m_row.getInt(1);
-//                    log.println("Clone Move(" + m_id +") after i: " + (i+1) + " Pos: " + pos + " Val: " + val);
                     int pos2 = m_resultSet.getRow();
                     assure("ResultSetMovementStress wrong position: " + i + " Pos1: " + pos + " Pos2: " + pos2, pos == pos2);
                 }
@@ -380,7 +376,6 @@ public class RowSet extends ComplexTestCase
         log.println("testing Thread");
         try
         {
-            // final XRow _row = (XRow)UnoRuntime.queryInterface(XRow.class,_resultSet);
             _resultSet.beforeFirst();
 
             final int numberOfThreads = 10;
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index f41d103df..f9cf63233 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -43,11 +43,9 @@ using namespace ::dbtools;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
-//	using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-//	using namespace ::cppu;
 using namespace ::osl;
 
 void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter)
@@ -204,8 +202,6 @@ void OBookmarkSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParamet
                     break;
                 case DataType::CHAR:
                 case DataType::VARCHAR:
-                //case DataType::DECIMAL:
-                //case DataType::NUMERIC:
                     _xParameter->updateString(nPos,_rValue);
                     break;
                 case DataType::BIGINT:
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 56e66d864..8d7c8723c 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -42,7 +42,6 @@ using namespace comphelper;
 using namespace connectivity;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
-//	using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
@@ -256,10 +255,8 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName
 
 void SAL_CALL ORowSetDataColumns::disposing(void)
 {
-    //	clear_NoDispose();
     ORowSetDataColumns_BASE::disposing();
     m_aColumns = NULL;
-    //	m_aColumns.clear();
 }
 
 void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector)
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index e1370f693..af8e6e87c 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -61,12 +61,10 @@ using namespace connectivity;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
-//	using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::io;
-//	using namespace ::cppu;
 using namespace ::osl;
 
 DBG_NAME(OCacheSet)
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 17ec5dfac..5d4620326 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -288,15 +288,12 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O
                 for(SelectColumnsMetaData::iterator aPosIter = (*m_pForeignColumnNames).begin();aPosIter != aPosEnd;++aPosIter)
                 {
                     // look for columns not in the source columns to use them as filter as well
-                    // if ( !xSourceColumns->hasByName(aPosIter->first) )
-                    {
                         if ( aFilter.getLength() )
                             aFilter.append(aAnd);
                         aFilter.append(::dbtools::quoteName( aQuote,sSelectTableName));
                         aFilter.append(s_sDot);
                         aFilter.append(::dbtools::quoteName( aQuote,aPosIter->second.sRealName));
                         aFilter.append(s_sParam);
-                    }
                 }
                 break;
             }
@@ -519,7 +516,6 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
     SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end();
     for(;aIter != aEnd;++aIter,++i)
     {
-        //if(xKeyColumns.is() && xKeyColumns->hasByName(aIter->first))
         if ( m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() )
         {
             sKeyCondition.append(::dbtools::quoteName( aQuote,aIter->second.sRealName));
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index c6f2c9839..7e604f4d2 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -200,7 +200,6 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
     TSQLStatements aIndexConditions;
     TSQLStatements aSql;
 
-    // sal_Int32 i = 1;
     // here we build the condition part for the update statement
     SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin();
     SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end();
@@ -393,7 +392,6 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne
     TSQLStatements aIndexConditions;
     TSQLStatements aSql;
 
-    // sal_Int32 i = 1;
     // here we build the condition part for the update statement
     SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin();
     SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end();
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index a9709762e..20f28b620 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1809,9 +1809,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
         }
 
         // get the locale
-        //	ConfigManager*	pConfigMgr = ConfigManager::GetConfigManager();
         Locale aLocale = SvtSysLocale().GetLocaleData().getLocale();
-        //	pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale;
 
         // get the numberformatTypes
         OSL_ENSURE(m_xActiveConnection.is(),"No ActiveConnection");
@@ -1928,8 +1926,6 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                     if(!xColumn.is())
                     {
                         // no column found so we could look at the position i
-                        //bReFetchName = sal_True;
-                        //sColumnLabel = ::rtl::OUString();
                         Reference<XIndexAccess> xIndexAccess(m_xColumns,UNO_QUERY);
                         if(xIndexAccess.is() && i <= xIndexAccess->getCount())
                         {
@@ -2641,7 +2637,6 @@ void SAL_CALL ORowSet::clearWarnings(  ) throw (SQLException, RuntimeException)
 
 void ORowSet::doCancelModification( )
 {
-    //OSL_ENSURE( isModification(), "ORowSet::doCancelModification: invalid call (no cache!)!" );
     if ( isModification() )
     {
         // read-only flag restored
@@ -2807,7 +2802,6 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
     sal_Int32 nRT	= PropertyAttribute::READONLY	| PropertyAttribute::TRANSIENT;
 
     // sdb.RowSet Properties
-    //	registerProperty(PROPERTY_CURSORNAME,		PROPERTY_ID_CURSORNAME,			PropertyAttribute::READONLY,		&m_aDataSourceName,		::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
     registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION,	PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,	&rParent.m_aActiveConnection,	::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL)));
     registerProperty(PROPERTY_RESULTSETCONCURRENCY,	PROPERTY_ID_RESULTSETCONCURRENCY,	PropertyAttribute::READONLY,	&m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
     registerProperty(PROPERTY_RESULTSETTYPE,		PROPERTY_ID_RESULTSETTYPE,			PropertyAttribute::READONLY,	&m_nResultSetType,		::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
@@ -2939,7 +2933,6 @@ void SAL_CALL ORowSetClone::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,c
 
 void ORowSetClone::doCancelModification( )
 {
-    //OSL_ENSURE( sal_False, "ORowSetClone::doCancelModification: invalid call!" );
 }
 
 sal_Bool ORowSetClone::isModification( )
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index ea7b55d29..492302f15 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -1108,7 +1108,6 @@ 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));
     m_bBeforeFirst	= m_pCache->isBeforeFirst();
     m_bAfterLast	= m_pCache->isAfterLast();
-    //m_pCache->resetInsertRow(sal_True);
 
     if(!(m_bBeforeFirst || m_bAfterLast))
     {
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 7f4b23f2a..bd2f8b809 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -264,9 +264,6 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
         // need to check if we could handle this select clause
         bAllKeysFound = bAllKeysFound && (nTablesCount == 1 || checkJoin(xConnection,_xAnalyzer,aUpdateTableName));
 
-        // || !(comphelper::hasProperty(PROPERTY_CANUPDATEINSERTEDROWS,xProp) && any2bool(xProp->getPropertyValue(PROPERTY_CANUPDATEINSERTEDROWS)))
-
-        // oj removed because keyset uses only the next// || (xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_RESULTSETTYPE) && comphelper::getINT32(xProp->getPropertyValue(PROPERTY_RESULTSETTYPE)) == ResultSetType::FORWARD_ONLY)
         if(!bAllKeysFound )
         {
             m_pCacheSet = new OStaticSet();
@@ -663,8 +660,6 @@ sal_Bool ORowSetCache::isFirst(  )
 
 sal_Bool ORowSetCache::isLast(  )
 {
-    //	return m_bRowCountFinal ? (m_nPosition==m_nRowCount) : m_pCacheSet->isLast();
-
     return m_nPosition == m_nRowCount;
 }
 
@@ -755,7 +750,6 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos
         }
         bCheck = m_pCacheSet->next();
     }
-    //	m_nStartPos = _nNewStartPos;
     // we have to read one row forward to enshure that we know when we are on last row
     // but only when we don't know it already
     if(!m_bRowCountFinal)
@@ -932,9 +926,6 @@ sal_Bool ORowSetCache::moveWindow()
             sal_Bool bCheck = m_pCacheSet->absolute(nPos);
             bCheck = fill(aIter,aEnd,nPos,bCheck); // refill the region wew don't need anymore
 
-//			// we know that this is the current maximal rowcount here
-//			if ( !m_bRowCountFinal && bCheck )
-//				m_nRowCount = std::max(nPos,m_nRowCount);
             // we have to read one row forward to enshure that we know when we are on last row
             // but only when we don't know it already
             sal_Bool bOk = sal_True;
diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx
index db9678c29..f7ae7fc30 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -90,7 +90,6 @@ namespace dbaccess
         ORowSetMatrix*					m_pInsertMatrix;		// represent the rows which should be inserted normally this is only one
         ORowSetMatrix::iterator			m_aInsertRow;			// represent a insert row
 
-        //	ORowSetRow						m_aInsertRow;			// present the row that should be inserted
         sal_Int32						m_nLastColumnIndex;		// the last column ask for, used for wasNull()
 
         connectivity::OSQLTable			m_aUpdateTable;			// used for updates/deletes and inserts
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index df26f5164..8af1be229 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -990,7 +990,6 @@ sal_Bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OS
         {
             // Ist das erste Element wieder eine OR-Verknuepfung?
             // Dann rekursiv absteigen ...
-            //if (!i && SQL_ISRULE(pCondition->getChild(i),search_condition))
             if (SQL_ISRULE(pCondition->getChild(i),search_condition))
                 bResult = setORCriteria(pCondition->getChild(i), _rIterator, rFilters, xFormatter);
             else
@@ -1042,9 +1041,7 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
             ::rtl::OUString aColumnName;
 
 
-            //	pCondition->parseNodeToStr(aValue,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar()));
             pCondition->parseNodeToStr( aValue, m_xConnection, NULL );
-            //	pCondition->getChild(0)->parseNodeToStr(aColumnName,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar()));
             pCondition->getChild(0)->parseNodeToStr( aColumnName, m_xConnection, NULL );
 
             // don't display the column name
@@ -1322,10 +1319,6 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
 
                 if(xColumnsSupp.is() && xColumnsSupp->getColumns()->hasByName(aColumnName))
                 {
-//					Reference<XPropertySet> xTableProp(xColumnsSupp,UNO_QUERY);
-//					xTableProp->getPropertyValue(PROPERTY_CATALOGNAME)	>>= aCatalog;
-//					xTableProp->getPropertyValue(PROPERTY_SCHEMANAME)	>>= aSchema;
-//					xTableProp->getPropertyValue(PROPERTY_NAME)			>>= aTable;
                     aTable = *pBegin;
                     break;
                 }
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 1249dcfdb..e5037a69d 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -45,11 +45,9 @@ using namespace connectivity;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
-//	using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-//	using namespace ::cppu;
 using namespace ::osl;
 
 void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/)
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index 3634b2853..0b00c63a0 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -46,11 +46,9 @@ using namespace ::dbtools;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
-//	using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-//	using namespace ::cppu;
 using namespace ::osl;
 
 void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter)
@@ -192,8 +190,6 @@ void WrappedResultSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xPar
                     break;
                 case DataType::CHAR:
                 case DataType::VARCHAR:
-                //case DataType::DECIMAL:
-                //case DataType::NUMERIC:
                     _xParameter->updateString(nPos,_rValue);
                     break;
                 case DataType::BIGINT:
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index f495088bd..abfd10969 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -50,7 +50,6 @@
 
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
-//using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index 1b33f28b5..e0dfc1ea8 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -113,7 +113,7 @@ Any OStatementBase::queryInterface( const Type & rType ) throw (RuntimeException
             Reference< XGeneratedResultSet > xGRes(m_xAggregateAsSet, UNO_QUERY);
             if ( ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ) == rType && xGRes.is() )
                 aIface = ::cppu::queryInterface(rType,static_cast< XGeneratedResultSet * >( this ));
-        } // if ( !aIface.hasValue() )
+        }
         if ( !aIface.hasValue() )
         {
             Reference< XPreparedBatchExecution > xGRes(m_xAggregateAsSet, UNO_QUERY);
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 4f41cdac0..704fc3c64 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -437,9 +437,6 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
 
     if ( nChanged > 0 )
     {
-        // @@@ Save changes.
-//		storeData();
-
         notifyDataSourceModified();
         aGuard.clear();
         aChanges.realloc( nChanged );
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx
index eaa262864..f40bdc952 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.cxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx
@@ -38,7 +38,6 @@ namespace dbaccess
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
-//	using namespace ::com::sun::star::reflection;
 using namespace connectivity;
 
 DBG_NAME(OSharedConnection)
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index f4daba6bb..bc3140886 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1991,7 +1991,6 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel
     }
     catch(uno::Exception)
     {
-        // ni
     }
     uno::Reference< frame::XUntitledNumbers > xNumberedControllers;
 
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 6a8a1d5a4..26d9ec1a6 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -572,7 +572,6 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const
     }
     catch(WrappedTargetException e)
     {
-        // throw IllegalArgumentException();
         throw;
     }
     return xComp;
@@ -752,8 +751,6 @@ void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName )
     // do the removal
     implRemove(_rName);
 
-    //	disposeComponent(xContent); // no dispose here, the object may be inserted again under a different name
-
     notifyByName( aGuard, _rName, NULL, NULL, E_REMOVED, ContainerListemers );
 }
 
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index c5262327d..506c316ce 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -143,7 +143,6 @@ namespace dbaccess
         DECLARE_SERVICE_INFO();
 
     // com::sun::star::beans::XPropertySet
-        //	virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const;
 
     // ::com::sun::star::sdbcx::XRename,
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 66a2896c6..cbd0f7c32 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -173,7 +173,6 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
 // chart2::data::XDataProvider:
 ::sal_Bool SAL_CALL DatabaseDataProvider::createDataSourcePossible(const uno::Sequence< beans::PropertyValue > & _aArguments) throw (uno::RuntimeException)
 {
-    //::osl::ResettableMutexGuard aClearForNotifies(m_aMutex);
     const beans::PropertyValue* pArgIter = _aArguments.getConstArray();
     const beans::PropertyValue* pArgEnd  = pArgIter + _aArguments.getLength();
     for(;pArgIter != pArgEnd;++pArgIter)
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index 9a6f71790..324d1397c 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -51,7 +51,6 @@ namespace dbaccess
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::lang;
-    //using namespace ::com::sun::star::sdbc;
 
     namespace
     {
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index d6833f01e..03ac72270 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -107,7 +107,6 @@ namespace adabasui
         catch(Exception&)
         {
             OSL_ASSERT(0);
-            //	showError(::dbtools::SQLExceptionInfo(e),this,);
         }
     }
     void SAL_CALL ODatabaseCreator::onTerminated()
diff --git a/dbaccess/source/filter/migration/makefile.mk b/dbaccess/source/filter/migration/makefile.mk
index 7bb53208d..9d4b95035 100644
--- a/dbaccess/source/filter/migration/makefile.mk
+++ b/dbaccess/source/filter/migration/makefile.mk
@@ -63,7 +63,6 @@ SHL1STDLIBS=\
 SHL1DEPN=
 SHL1LIBS=$(LIB1TARGET)
 SHL1IMPLIB=	i$(SHL1TARGET)
-# SHL1LIBS=	$(SLB)$/$(TARGET).lib
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
diff --git a/dbaccess/source/filter/xml/makefile.mk b/dbaccess/source/filter/xml/makefile.mk
index 6c6091c5f..3f3b02195 100644
--- a/dbaccess/source/filter/xml/makefile.mk
+++ b/dbaccess/source/filter/xml/makefile.mk
@@ -103,7 +103,6 @@ SHL1STDLIBS+= \
 SHL1DEPN=
 SHL1LIBS=$(LIB1TARGET)
 SHL1IMPLIB=	i$(SHL1TARGET)
-# SHL1LIBS=	$(SLB)$/$(TARGET).lib
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index 068538c55..020208c84 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -101,7 +101,6 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
             case XML_TOK_COLUMN_DEFAULT_VALUE:
                 if ( sValue.getLength() && sType.getLength() )
                     m_aDefaultValue <<= sValue;
-                //    SvXMLUnitConverter::convertAny(m_aDefaultValue,sType,sValue);
                 break;
             case XML_TOK_COLUMN_VISIBLE:
                 m_bHidden = sValue.equalsAscii("false");
@@ -152,7 +151,7 @@ void OXMLColumn::EndElement()
                         pAutoStyle->FillPropertySet(xProp);
                     }
                 }
-            } // if ( m_sStyleName.getLength() )
+            }
             if ( m_sCellStyleName.getLength() )
             {
                 const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles();
@@ -169,7 +168,7 @@ void OXMLColumn::EndElement()
             }
             
         }
-    } // if ( xFac.is() && m_sName.getLength() )
+    }
     else if ( m_sCellStyleName.getLength() )
     {
         const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles();
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index 150ee8142..5c0b4c951 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -131,7 +131,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
                 aProperty.Name = INFO_THOUSANDSDELIMITER;
                 aProperty.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
                 rImport.addInfo(aProperty);
-            } // if ( !bFoundThousand )
+            }
         }
         if ( XML_TOK_FONT_CHARSET == _nToken && !bFoundCharset )
         {
diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx
index 4a16889a1..3e65218de 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.cxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.cxx
@@ -105,7 +105,6 @@ SvXMLImportContext* OXMLDocuments::CreateChildContext(
             GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
             pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName );
             break;
-        //	case XML_TOK_QUERY_COLLECTION:
         case XML_TOK_COMPONENT_COLLECTION:
             GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
             pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName );
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index ef65a415f..5a0ef3ac9 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -570,7 +570,7 @@ void ODBExport::exportConnectionData()
                         sURL.append(sal_Unicode('/'));
 
                     AddAttribute(XML_NAMESPACE_XLINK,XML_HREF,GetRelativeReference(sURL.makeStringAndClear()));
-                } // if ( sOrigUrl == sFileName )
+                }
                 else
                     AddAttribute(XML_NAMESPACE_XLINK,XML_HREF,sOrigUrl);
                 AddAttribute(XML_NAMESPACE_DB,XML_MEDIA_TYPE,m_aTypeCollection.getMediaType(sValue));
@@ -591,7 +591,6 @@ void ODBExport::exportConnectionData()
                 }
                 catch(const Exception&)
                 {
-                    // nii
                 }
                 SvXMLElementExport aFileBasedDB(*this,XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, sal_True, sal_True);
             }
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 3b3e31c1d..7d4adee8e 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -144,9 +144,6 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
 
     switch( rTokenMap.Get( nPrefix, rLocalName ) )
     {
-//		case XML_TOK_QUERY:
-//			pContext = new OXMLQuery( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer );
-//			break;
         case XML_TOK_COMPONENT:
             GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
             pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName );
@@ -155,7 +152,6 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
             GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
             pContext = new OXMLColumn( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_xTable);
             break;
-        //	case XML_TOK_QUERY_COLLECTION:
         case XML_TOK_COMPONENT_COLLECTION:
             GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
             pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName);
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index f0251878a..8609dc936 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -129,7 +129,6 @@ void OTableStyleContext::FillPropertySet(
                     uno::Any aNumberFormat;
                     m_nNumberFormat = pStyle->GetKey();
                     aNumberFormat <<= m_nNumberFormat;
-                    //rPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_NUMBERFORMAT)), aNumberFormat);
                     AddProperty(CTF_DB_NUMBERFORMAT, aNumberFormat);
                 }
             }
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx
index dc85ae5a8..0f5cb78fd 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.hxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx
@@ -51,7 +51,6 @@ namespace dbaxml
         ::rtl::OUString				sPageStyle;
         const rtl::OUString			sNumberFormat;
         SvXMLStylesContext*			pStyles;
-        //	std::vector<ScXMLMapContent>	aMaps;
         com::sun::star::uno::Any	aConditionalFormat;
         sal_Int32					m_nNumberFormat;
         sal_Bool					bConditionalFormatCreated : 1;
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index ae12214ff..a373e8f64 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -199,7 +199,7 @@ namespace dbaxml
                 if ( m_aTypeCollection.needsJVM(sURL) )
                 {
                     pCreatorThread = new FastLoader(m_xFactory,FastLoader::E_JAVA);
-                } // if ( m_aTypeCollection.needsJVM(sURL) )
+                }
                 else if ( sURL.matchIgnoreAsciiCaseAsciiL("sdbc:calc:",10,0) )
                 {
                     pCreatorThread = new FastLoader(m_xFactory,FastLoader::E_CALC);
@@ -846,10 +846,8 @@ SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const ::r
     {
         pContext = new OTableStylesContext(*this, _nPrefix, rLocalName, xAttrList, bIsAutoStyle);
         if (bIsAutoStyle)
-            //xAutoStyles = pContext;
             SetAutoStyles((SvXMLStylesContext*)pContext);
         else
-            //xStyles = pContext;
             SetStyles((SvXMLStylesContext*)pContext);
     }
     return pContext;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index ad45dd8e9..df0987676 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -1290,34 +1290,25 @@ void OAppDetailPageHelper::DataChanged( const DataChangedEvent& rDCEvt )
 void OAppDetailPageHelper::ImplInitSettings()
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-    if( true )
-    {
         Font aFont;
         aFont = rStyleSettings.GetFieldFont();
         aFont.SetColor( rStyleSettings.GetWindowTextColor() );
         SetPointFont( aFont );
         m_aTBPreview.SetPointFont( aFont );
-    }
 
-    if( true )
-    {
         SetTextColor( rStyleSettings.GetFieldTextColor() );
         SetTextFillColor();
         m_aBorder.SetTextColor( rStyleSettings.GetFieldTextColor() );
         m_aBorder.SetTextFillColor();
         m_aTBPreview.SetTextColor( rStyleSettings.GetFieldTextColor() );
         m_aTBPreview.SetTextFillColor();
-    } // if( true )
 
-    if( true )
-    {
         SetBackground( rStyleSettings.GetFieldColor() );
         m_aBorder.SetBackground( rStyleSettings.GetFieldColor() );
         m_aFL.SetBackground( rStyleSettings.GetFieldColor() );
         m_aDocumentInfo.SetBackground( rStyleSettings.GetFieldColor() );
         m_aTBPreview.SetBackground( rStyleSettings.GetFieldColor() );
         m_pTablePreview->SetBackground( rStyleSettings.GetFieldColor() );
-    } // if( true )
 }
 // -----------------------------------------------------------------------------
 OPreviewWindow::OPreviewWindow(Window* _pParent)
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 4c9e50b9a..4623aaa99 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -346,7 +346,7 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt )
         {
             InvalidateEntry( pNewCurrent );
             CallEventListeners( VCLEVENT_LISTBOX_SELECT, pNewCurrent );
-        } // if ( pNewCurrent )
+        }
         updateHelpText();
     }
 }
@@ -697,7 +697,6 @@ const TaskPaneData& OApplicationDetailView::impl_getTaskPaneData( ElementType _e
     OSL_ENSURE( ( _eType >= 0 ) && ( _eType < E_ELEMENT_TYPE_COUNT ), "OApplicationDetailView::impl_getTaskPaneData: illegal element type!" );
     TaskPaneData& rData = m_aTaskPaneData[ _eType ];
 
-//    if ( rData.aTasks.empty() )
     //oj: do not check, otherwise extensions will only be visible after a reload.
     impl_fillTaskPaneData( _eType, rData );
 
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index eee11b21d..fd984c86f 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -171,7 +171,6 @@ namespace dbaui
         OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode);
         virtual ~OApplicationDetailView();
         // window overloads
-        //	virtual void Resize();
         virtual void GetFocus();
 
         /** creates the tables page
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index fc508e2a4..0d1be9800 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -58,7 +58,6 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind
     ,m_rBorderWin( _rBorderWindow )
 {
     DBG_CTOR(OApplicationSwapWindow,NULL);
-//	SetCompoundControl( TRUE );
 
     ImplInitSettings( sal_True, sal_True, sal_True );
 
@@ -66,7 +65,6 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind
     m_aIconControl.setControlActionListener( &m_rBorderWin.getView()->getAppController() );
     m_aIconControl.SetHelpId(HID_APP_SWAP_ICONCONTROL);
     m_aIconControl.Show();
-    //m_aIconControl.Enable(TRUE);
 }
 // -----------------------------------------------------------------------------
 OApplicationSwapWindow::~OApplicationSwapWindow()