diff options
| author | Noel Grandin <noel@peralex.com> | 2014-05-13 13:46:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-05-14 10:00:03 +0200 |
| commit | ca86511a6eaa4de43cc9b498d5d8f140967224b3 (patch) | |
| tree | c9753d0db3d2949aa6915d6f4c7cbea21bd21a35 /dbaccess/source | |
| parent | 613b9fa442e26d21f512016108ed921eb9964fbb (diff) | |
dbaccess: remove SAL_INFO's that only make function entry
Change-Id: Ibdf92698446d0a7aed7c474ec7d3ea720cd2c2a6
Diffstat (limited to 'dbaccess/source')
28 files changed, 38 insertions, 816 deletions
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index 37958b0e1623..8cb6a4e2760a 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -38,7 +38,6 @@ using namespace ::osl; void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { - SAL_INFO("dbaccess", "OBookmarkSet::construct" ); OCacheSet::construct(_xDriverSet,i_sRowSetFilter); m_xRowLocate.set(_xDriverSet,UNO_QUERY); } @@ -50,44 +49,37 @@ void OBookmarkSet::reset(const Reference< XResultSet>& _xDriverSet) Any SAL_CALL OBookmarkSet::getBookmark() throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OBookmarkSet::getBookmark" ); return m_xRowLocate->getBookmark(); } bool SAL_CALL OBookmarkSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OBookmarkSet::moveToBookmark" ); return m_xRowLocate->moveToBookmark(bookmark); } bool SAL_CALL OBookmarkSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OBookmarkSet::moveRelativeToBookmark" ); return m_xRowLocate->moveRelativeToBookmark(bookmark,rows); } sal_Int32 SAL_CALL OBookmarkSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OBookmarkSet::compareBookmarks" ); return m_xRowLocate->compareBookmarks(_first,_second); } bool SAL_CALL OBookmarkSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OBookmarkSet::hasOrderedBookmarks" ); return m_xRowLocate->hasOrderedBookmarks(); } sal_Int32 SAL_CALL OBookmarkSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "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) { - SAL_INFO("dbaccess", "OBookmarkSet::deleteRows" ); Reference< ::com::sun::star::sdbcx::XDeleteRows> xDeleteRow(m_xRowLocate,UNO_QUERY); if(xDeleteRow.is()) { @@ -98,7 +90,6 @@ Sequence< sal_Int32 > SAL_CALL OBookmarkSet::deleteRows( const Sequence< Any >& void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OBookmarkSet::insertRow" ); Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY); if(!xUpdRow.is()) ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this ); @@ -123,7 +114,6 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OBookmarkSet::updateRow" ); Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY); if(!xUpdRow.is()) ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this ); @@ -147,7 +137,6 @@ void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowS void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OBookmarkSet::deleteRow" ); Reference<XResultSetUpdate> xUpd(m_xRowLocate,UNO_QUERY); xUpd->deleteRow(); @@ -155,12 +144,10 @@ void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const c void SAL_CALL OBookmarkSet::cancelRowUpdates( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OBookmarkSet::cancelRowUpdates" ); } void SAL_CALL OBookmarkSet::moveToInsertRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OBookmarkSet::moveToInsertRow" ); Reference<XResultSetUpdate> xUpd(m_xRowLocate,UNO_QUERY); if(xUpd.is()) xUpd->moveToInsertRow(); @@ -168,18 +155,15 @@ void SAL_CALL OBookmarkSet::moveToInsertRow( ) throw(SQLException, RuntimeExcep void SAL_CALL OBookmarkSet::moveToCurrentRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OBookmarkSet::moveToCurrentRow" ); } void OBookmarkSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) { - SAL_INFO("dbaccess", "OBookmarkSet::fillValueRow" ); OCacheSet::fillValueRow(_rRow,_nPosition); } void OBookmarkSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParameter,const ORowSetValue& _rValue) { - SAL_INFO("dbaccess", "OBookmarkSet::updateColumn" ); if(_rValue.isBound() && _rValue.isModified()) { if(_rValue.isNull()) diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 0523a641d8b7..83e28fc06d71 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -62,13 +62,11 @@ OCacheSet::OCacheSet(sal_Int32 i_nMaxRows) ,m_bUpdated(false) ,m_bDeleted(false) { - SAL_INFO("dbaccess", "OCacheSet::OCacheSet" ); } OUString OCacheSet::getIdentifierQuoteString() const { - SAL_INFO("dbaccess", "OCacheSet::getIdentifierQuoteString" ); OUString sQuote; Reference<XDatabaseMetaData> xMeta; if ( m_xConnection.is() && (xMeta = m_xConnection->getMetaData()).is() ) @@ -78,7 +76,6 @@ OUString OCacheSet::getIdentifierQuoteString() const void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const OUString &i_sRowSetFilter) { - SAL_INFO("dbaccess", "OCacheSet::construct" ); OSL_ENSURE(_xDriverSet.is(),"Invalid resultSet"); m_sRowSetFilter = i_sRowSetFilter; @@ -138,7 +135,6 @@ OCacheSet::~OCacheSet() void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::fillTableName" ); OSL_ENSURE(_xTable.is(),"OCacheSet::fillTableName: PropertySet is empty!"); if(m_aComposedTableName.isEmpty() && _xTable.is() ) { @@ -154,7 +150,6 @@ void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable) throw(SQL void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::insertRow" ); Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -203,7 +198,6 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow ,OUStringBuffer& _sParameter ,::std::list< sal_Int32>& _rOrgValues) { - SAL_INFO("dbaccess", "OCacheSet::fillParameters" ); // use keys and indexes for exact positioning // first the keys Reference<XPropertySet> xSet(_xTable,UNO_QUERY); @@ -284,7 +278,6 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::updateRow" ); Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -329,7 +322,6 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::deleteRow" ); Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -386,14 +378,12 @@ void OCacheSet::setParameter(sal_Int32 nPos ,sal_Int32 _nType ,sal_Int32 _nScale) const { - SAL_INFO("dbaccess", "OCacheSet::setParameter" ); sal_Int32 nType = ( _nType != DataType::OTHER ) ? _nType : _rValue.getTypeKind(); ::dbtools::setObjectWithInfo(_xParameter,nPos,_rValue,nType,_nScale); } void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) { - SAL_INFO("dbaccess", "OCacheSet::fillValueRow" ); Any aBookmark = getBookmark(); if(!aBookmark.hasValue()) aBookmark = makeAny(_nPosition); @@ -411,207 +401,174 @@ void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) sal_Bool SAL_CALL OCacheSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::wasNull" ); return m_xDriverRow->wasNull(); } OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getString" ); return m_xDriverRow->getString(columnIndex); } sal_Bool SAL_CALL OCacheSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getBoolean" ); return m_xDriverRow->getBoolean(columnIndex); } sal_Int8 SAL_CALL OCacheSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getByte" ); return m_xDriverRow->getByte(columnIndex); } sal_Int16 SAL_CALL OCacheSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getShort" ); return m_xDriverRow->getShort(columnIndex); } sal_Int32 SAL_CALL OCacheSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getInt" ); return m_xDriverRow->getInt(columnIndex); } sal_Int64 SAL_CALL OCacheSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getLong" ); return m_xDriverRow->getLong(columnIndex); } float SAL_CALL OCacheSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getFloat" ); return m_xDriverRow->getFloat(columnIndex); } double SAL_CALL OCacheSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getDouble" ); return m_xDriverRow->getDouble(columnIndex); } Sequence< sal_Int8 > SAL_CALL OCacheSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getBytes" ); return m_xDriverRow->getBytes(columnIndex); } ::com::sun::star::util::Date SAL_CALL OCacheSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getDate" ); return m_xDriverRow->getDate(columnIndex); } ::com::sun::star::util::Time SAL_CALL OCacheSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getTime" ); return m_xDriverRow->getTime(columnIndex); } ::com::sun::star::util::DateTime SAL_CALL OCacheSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getTimestamp" ); return m_xDriverRow->getTimestamp(columnIndex); } Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCacheSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getBinaryStream" ); return m_xDriverRow->getBinaryStream(columnIndex); } Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCacheSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "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, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getObject" ); return m_xDriverRow->getObject(columnIndex,typeMap); } Reference< XRef > SAL_CALL OCacheSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getRef" ); return m_xDriverRow->getRef(columnIndex); } Reference< XBlob > SAL_CALL OCacheSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getBlob" ); return m_xDriverRow->getBlob(columnIndex); } Reference< XClob > SAL_CALL OCacheSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getClob" ); return m_xDriverRow->getClob(columnIndex); } Reference< XArray > SAL_CALL OCacheSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCacheSet::getArray" ); return m_xDriverRow->getArray(columnIndex); } // XResultSet bool SAL_CALL OCacheSet::next( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::next" ); m_bInserted = m_bUpdated = m_bDeleted = false; return m_xDriverSet->next(); } bool SAL_CALL OCacheSet::isBeforeFirst( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::isBeforeFirst" ); return m_xDriverSet->isBeforeFirst(); } bool SAL_CALL OCacheSet::isAfterLast( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::isAfterLast" ); return m_xDriverSet->isAfterLast(); } bool SAL_CALL OCacheSet::isFirst( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::isFirst" ); return m_xDriverSet->isFirst(); } bool SAL_CALL OCacheSet::isLast( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::isLast" ); return m_xDriverSet->isLast(); } void SAL_CALL OCacheSet::beforeFirst( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::beforeFirst" ); m_bInserted = m_bUpdated = m_bDeleted = false; m_xDriverSet->beforeFirst(); } void SAL_CALL OCacheSet::afterLast( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::afterLast" ); m_bInserted = m_bUpdated = m_bDeleted = false; m_xDriverSet->afterLast(); } bool SAL_CALL OCacheSet::first( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::first" ); m_bInserted = m_bUpdated = m_bDeleted = false; return m_xDriverSet->first(); } bool SAL_CALL OCacheSet::last( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::last" ); m_bInserted = m_bUpdated = m_bDeleted = false; return m_xDriverSet->last(); } sal_Int32 SAL_CALL OCacheSet::getRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::getRow" ); return m_xDriverSet->getRow(); } bool SAL_CALL OCacheSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::absolute" ); m_bInserted = m_bUpdated = m_bDeleted = false; return m_xDriverSet->absolute(row); } bool SAL_CALL OCacheSet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::relative" ); m_bInserted = m_bUpdated = m_bDeleted = false; return m_xDriverSet->relative(rows); } bool SAL_CALL OCacheSet::previous( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::previous" ); m_bInserted = m_bUpdated = m_bDeleted = false; return m_xDriverSet->previous(); } @@ -633,31 +590,26 @@ bool OCacheSet::absolute_checked( sal_Int32 row,sal_Bool /*i_bFetchRow*/ ) void SAL_CALL OCacheSet::refreshRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::refreshRow" ); m_xDriverSet->refreshRow(); } bool SAL_CALL OCacheSet::rowUpdated( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::rowUpdated" ); return m_xDriverSet->rowUpdated(); } bool SAL_CALL OCacheSet::rowInserted( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::rowInserted" ); return m_xDriverSet->rowInserted(); } bool SAL_CALL OCacheSet::rowDeleted( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::rowDeleted" ); return m_xDriverSet->rowDeleted(); } Reference< XInterface > SAL_CALL OCacheSet::getStatement( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OCacheSet::getStatement" ); return m_xDriverSet->getStatement(); } diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 4264c7f3f24f..21c0b2a07f57 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -47,7 +47,6 @@ namespace dbaccess */ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut) { - SAL_INFO("dbaccess", "api OFilteredContainer::createWildCardVector" ); // for wildcard search : remove all table filters which are a wildcard expression and build a WilCard // for them OUString* pTableFilters = _rTableFilter.getArray(); @@ -411,7 +410,6 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto void OFilteredContainer::impl_refresh() throw(RuntimeException) { - SAL_INFO("dbaccess", "api OFilteredContainer::impl_refresh" ); if ( m_pRefreshListener ) { m_bConstructed = false; diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index d32b973e3150..21c01feff24d 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -123,8 +123,6 @@ OKeySet::OKeySet(const connectivity::OSQLTable& _xTable, ,m_rRowCount(o_nRowCount) ,m_bRowCountFinal(false) { - SAL_INFO("dbaccess", "OKeySet::OKeySet" ); - } OKeySet::~OKeySet() @@ -294,8 +292,6 @@ OUStringBuffer OKeySet::createKeyFilter() void OKeySet::construct(const Reference< XResultSet>& _xDriverSet, const OUString& i_sRowSetFilter) { - SAL_INFO("dbaccess", "OKeySet::construct" ); - OCacheSet::construct(_xDriverSet,i_sRowSetFilter); initColumns(); @@ -427,7 +423,6 @@ void OKeySet::invalidateRow() Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::getBookmark" ); OSL_ENSURE(m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(), "getBookmark is only possible when we stand on a valid row!"); return makeAny(m_aKeyIter->first); @@ -435,7 +430,6 @@ Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException) bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::moveToBookmark" ); m_bInserted = m_bUpdated = m_bDeleted = false; m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark)); invalidateRow(); @@ -444,7 +438,6 @@ bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLException, bool SAL_CALL OKeySet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::moveRelativeToBookmark" ); m_bInserted = m_bUpdated = m_bDeleted = false; m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark)); if(m_aKeyIter != m_aKeyMap.end()) @@ -458,7 +451,6 @@ bool SAL_CALL OKeySet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 ro sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::compareBookmarks" ); sal_Int32 nFirst = 0, nSecond = 0; _first >>= nFirst; _second >>= nSecond; @@ -468,20 +460,17 @@ sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _sec bool SAL_CALL OKeySet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::hasOrderedBookmarks" ); return true; } sal_Int32 SAL_CALL OKeySet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "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) { - SAL_INFO("dbaccess", "OKeySet::deleteRows" ); Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -569,7 +558,6 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::updateRow" ); Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -740,7 +728,6 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::insertRow" ); Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -944,7 +931,6 @@ void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch) void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sal_Int32 i_nBookmark) { - SAL_INFO("dbaccess", "OKeySet::copyRowValue" ); connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = _rKeyRow->get().begin(); // check the if the parameter values have been changed @@ -984,7 +970,6 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sa void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::deleteRow" ); Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -1087,23 +1072,19 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit void SAL_CALL OKeySet::cancelRowUpdates( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::cancelRowUpdates" ); m_bInserted = m_bUpdated = m_bDeleted = false; } void SAL_CALL OKeySet::moveToInsertRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::moveToInsertRow" ); } void SAL_CALL OKeySet::moveToCurrentRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::moveToCurrentRow" ); } Reference<XNameAccess> OKeySet::getKeyColumns() const { - SAL_INFO("dbaccess", "OKeySet::getKeyColumns" ); // use keys and indexes for exact postioning // first the keys @@ -1144,7 +1125,6 @@ Reference<XNameAccess> OKeySet::getKeyColumns() const bool SAL_CALL OKeySet::next( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::next" ); m_bInserted = m_bUpdated = m_bDeleted = false; if(isAfterLast()) @@ -1173,19 +1153,16 @@ bool SAL_CALL OKeySet::next( ) throw(SQLException, RuntimeException) bool SAL_CALL OKeySet::isBeforeFirst( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::isBeforeFirst" ); return m_aKeyIter == m_aKeyMap.begin(); } bool SAL_CALL OKeySet::isAfterLast( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::isAfterLast" ); return m_bRowCountFinal && m_aKeyIter == m_aKeyMap.end(); } bool SAL_CALL OKeySet::isFirst( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::isFirst" ); OKeySetMatrix::iterator aTemp = m_aKeyMap.begin(); ++aTemp; return m_aKeyIter == aTemp && m_aKeyIter != m_aKeyMap.end(); @@ -1193,7 +1170,6 @@ bool SAL_CALL OKeySet::isFirst( ) throw(SQLException, RuntimeException) bool SAL_CALL OKeySet::isLast( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::isLast" ); if(!m_bRowCountFinal) return false; @@ -1204,7 +1180,6 @@ bool SAL_CALL OKeySet::isLast( ) throw(SQLException, RuntimeException) void SAL_CALL OKeySet::beforeFirst( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::beforeFirst" ); m_bInserted = m_bUpdated = m_bDeleted = false; m_aKeyIter = m_aKeyMap.begin(); invalidateRow(); @@ -1212,7 +1187,6 @@ void SAL_CALL OKeySet::beforeFirst( ) throw(SQLException, RuntimeException) void SAL_CALL OKeySet::afterLast( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::afterLast" ); m_bInserted = m_bUpdated = m_bDeleted = false; fillAllRows(); m_aKeyIter = m_aKeyMap.end(); @@ -1221,7 +1195,6 @@ void SAL_CALL OKeySet::afterLast( ) throw(SQLException, RuntimeException) bool SAL_CALL OKeySet::first( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::first" ); m_bInserted = m_bUpdated = m_bDeleted = false; m_aKeyIter = m_aKeyMap.begin(); ++m_aKeyIter; @@ -1245,7 +1218,6 @@ bool SAL_CALL OKeySet::last( ) throw(SQLException, RuntimeException) bool OKeySet::last_checked( sal_Bool /* i_bFetchRow */ ) { - SAL_INFO("dbaccess", "OKeySet::last_checked" ); m_bInserted = m_bUpdated = m_bDeleted = false; bool fetchedRow = fillAllRows(); @@ -1260,7 +1232,6 @@ bool OKeySet::last_checked( sal_Bool /* i_bFetchRow */ ) sal_Int32 SAL_CALL OKeySet::getRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::getRow" ); OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!"); OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!"); @@ -1274,7 +1245,6 @@ bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, RuntimeExce bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ ) { - SAL_INFO("dbaccess", "OKeySet::absolute" ); m_bInserted = m_bUpdated = m_bDeleted = false; OSL_ENSURE(row,"absolute(0) isn't allowed!"); bool fetchedRow = false; @@ -1334,7 +1304,6 @@ bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ ) bool SAL_CALL OKeySet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::relative" ); if(!rows) { invalidateRow(); @@ -1345,7 +1314,6 @@ bool SAL_CALL OKeySet::relative( sal_Int32 rows ) throw(SQLException, RuntimeExc bool OKeySet::previous_checked( sal_Bool /* i_bFetchRow */ ) { - SAL_INFO("dbaccess", "OKeySet::previous" ); m_bInserted = m_bUpdated = m_bDeleted = false; if(m_aKeyIter != m_aKeyMap.begin()) { @@ -1406,8 +1374,6 @@ bool OKeySet::doTryRefetch_throw() throw(SQLException, RuntimeException) void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::refreshRow" ); - invalidateRow(); if(isBeforeFirst() || isAfterLast()) @@ -1464,7 +1430,6 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException) bool OKeySet::fetchRow() { - SAL_INFO("dbaccess", "OKeySet::fetchRow" ); // fetch the next row and append on the keyset bool bRet = false; if ( !m_bRowCountFinal && (!m_nMaxRows || sal_Int32(m_aKeyMap.size()) < m_nMaxRows) ) @@ -1502,7 +1467,6 @@ bool OKeySet::fetchRow() bool OKeySet::fillAllRows() { - SAL_INFO("dbaccess", "OKeySet::fillAllRows" ); if(m_bRowCountFinal) { return false; @@ -1518,7 +1482,6 @@ bool OKeySet::fillAllRows() // XRow sal_Bool SAL_CALL OKeySet::wasNull( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::wasNull" ); if ( ! m_xRow.is() ) throwGenericSQLException("Must call getFOO() for some FOO before wasNull()", *this); @@ -1538,152 +1501,130 @@ inline void OKeySet::ensureRowForData( ) throw(SQLException, RuntimeException) OUString SAL_CALL OKeySet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getString" ); ensureRowForData(); return m_xRow->getString(columnIndex); } sal_Bool SAL_CALL OKeySet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getBoolean" ); ensureRowForData(); return m_xRow->getBoolean(columnIndex); } sal_Int8 SAL_CALL OKeySet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getByte" ); ensureRowForData(); return m_xRow->getByte(columnIndex); } sal_Int16 SAL_CALL OKeySet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getShort" ); ensureRowForData(); return m_xRow->getShort(columnIndex); } sal_Int32 SAL_CALL OKeySet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getInt" ); ensureRowForData(); return m_xRow->getInt(columnIndex); } sal_Int64 SAL_CALL OKeySet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getLong" ); ensureRowForData(); return m_xRow->getLong(columnIndex); } float SAL_CALL OKeySet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getFloat" ); ensureRowForData(); return m_xRow->getFloat(columnIndex); } double SAL_CALL OKeySet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getDouble" ); ensureRowForData(); return m_xRow->getDouble(columnIndex); } Sequence< sal_Int8 > SAL_CALL OKeySet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getBytes" ); ensureRowForData(); return m_xRow->getBytes(columnIndex); } ::com::sun::star::util::Date SAL_CALL OKeySet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getDate" ); ensureRowForData(); return m_xRow->getDate(columnIndex); } ::com::sun::star::util::Time SAL_CALL OKeySet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getTime" ); ensureRowForData(); return m_xRow->getTime(columnIndex); } ::com::sun::star::util::DateTime SAL_CALL OKeySet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getTimestamp" ); ensureRowForData(); return m_xRow->getTimestamp(columnIndex); } Reference< ::com::sun::star::io::XInputStream > SAL_CALL OKeySet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getBinaryStream" ); ensureRowForData(); return m_xRow->getBinaryStream(columnIndex); } Reference< ::com::sun::star::io::XInputStream > SAL_CALL OKeySet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getCharacterStream" ); ensureRowForData(); return m_xRow->getCharacterStream(columnIndex); } Any SAL_CALL OKeySet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getObject" ); ensureRowForData(); return m_xRow->getObject(columnIndex,typeMap); } Reference< XRef > SAL_CALL OKeySet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getRef" ); ensureRowForData(); return m_xRow->getRef(columnIndex); } Reference< XBlob > SAL_CALL OKeySet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getBlob" ); ensureRowForData(); return m_xRow->getBlob(columnIndex); } Reference< XClob > SAL_CALL OKeySet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getClob" ); ensureRowForData(); return m_xRow->getClob(columnIndex); } Reference< XArray > SAL_CALL OKeySet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OKeySet::getArray" ); ensureRowForData(); return m_xRow->getArray(columnIndex); } bool SAL_CALL OKeySet::rowUpdated( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::rowUpdated" ); return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 2; } bool SAL_CALL OKeySet::rowInserted( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::rowInserted" ); return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 1; } bool SAL_CALL OKeySet::rowDeleted( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OKeySet::rowDeleted" ); bool bDeleted = m_bDeleted; m_bDeleted = false; return bDeleted; diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 84cbc7a0fad3..44e780725b55 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -94,7 +94,6 @@ OptimisticSet::OptimisticSet(const Reference<XComponentContext>& _rContext, ,m_aSqlIterator( i_xConnection, Reference<XTablesSupplier>(_xComposer,UNO_QUERY)->getTables(), m_aSqlParser, NULL ) ,m_bResultSetChanged(false) { - SAL_INFO("dbaccess", "OptimisticSet::OptimisticSet" ); } OptimisticSet::~OptimisticSet() @@ -103,8 +102,6 @@ OptimisticSet::~OptimisticSet() void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { - SAL_INFO("dbaccess", "OptimisticSet::construct" ); - OCacheSet::construct(_xDriverSet,i_sRowSetFilter); initColumns(); @@ -183,7 +180,6 @@ Sequence< sal_Int32 > SAL_CALL OptimisticSet::deleteRows( const Sequence< Any >& void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OptimisticSet::updateRow" ); if ( m_aJoinedKeyColumns.empty() ) throw SQLException(); // list all cloumns that should be set @@ -258,7 +254,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) { - SAL_INFO("dbaccess", "OptimisticSet::insertRow" ); TSQLStatements aSql; TSQLStatements aParameter; TSQLStatements aKeyConditions; @@ -392,8 +387,6 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const OUString& i_sSQL,const OUString& i_sTableName) { - SAL_INFO("dbaccess", "OptimisticSet::executeDelete" ); - // now create and execute the prepared statement Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(i_sSQL)); Reference< XParameters > xParameter(xPrep,UNO_QUERY); diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index ed0471e427f4..644b937183d7 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -1801,8 +1801,6 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotification) { - SAL_INFO("dbaccess", "ORowSet::execute_NoApprove_NoNewConn" ); - // now we can dispose our old connection ::comphelper::disposeComponent(m_xOldConnection); m_xOldConnection = NULL; diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 204e37e947d2..5d9438e16fa7 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -94,8 +94,6 @@ ORowSetBase::ORowSetBase( const Reference<XComponentContext>& _rContext, ::cppu: ,m_bAfterLast(false) ,m_bIsInsertRow(false) { - SAL_INFO("dbaccess", "ORowSetBase::ORowSetBase" ); - sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; sal_Int32 nInitialRowCountValue = 0; @@ -137,7 +135,6 @@ Any ORowSetBase::queryInterface( const Type & rType ) throw (RuntimeException, s void SAL_CALL ORowSetBase::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const { - //SAL_INFO("dbaccess", "ORowSetBase::getFastPropertyValue" ); if(m_pCache) { switch(nHandle) @@ -159,7 +156,6 @@ void SAL_CALL ORowSetBase::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) c // OComponentHelper void SAL_CALL ORowSetBase::disposing(void) { - SAL_INFO("dbaccess", "ORowSetBase::disposing" ); MutexGuard aGuard(*m_pMutex); if ( m_pColumns ) @@ -178,7 +174,6 @@ void SAL_CALL ORowSetBase::disposing(void) // comphelper::OPropertyArrayUsageHelper ::cppu::IPropertyArrayHelper* ORowSetBase::createArrayHelper( ) const { - SAL_INFO("dbaccess", "ORowSetBase::createArrayHelper" ); Sequence< Property > aProps; describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); @@ -187,14 +182,12 @@ void SAL_CALL ORowSetBase::disposing(void) // cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& SAL_CALL ORowSetBase::getInfoHelper() { - SAL_INFO("dbaccess", "ORowSetBase::getInfoHelper" ); return *const_cast<ORowSetBase*>(this)->getArrayHelper(); } // XRow sal_Bool SAL_CALL ORowSetBase::wasNull( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::wasNull" ); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); return impl_wasNull(); @@ -202,20 +195,17 @@ sal_Bool SAL_CALL ORowSetBase::wasNull( ) throw(SQLException, RuntimeException, bool ORowSetBase::impl_wasNull() { - SAL_INFO("dbaccess", "ORowSetBase::impl_wasNull" ); return ((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is()) ? ((*m_aCurrentRow)->get())[m_nLastColumnIndex].isNull() : sal_True; } const ORowSetValue& ORowSetBase::getValue(sal_Int32 columnIndex) { - SAL_INFO("dbaccess", "ORowSetBase::getValue" ); checkCache(); return impl_getValue(columnIndex); } const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) { - SAL_INFO("dbaccess", "ORowSetBase::impl_getValue" ); if ( m_bBeforeFirst || m_bAfterLast ) { SAL_WARN("dbaccess", "ORowSetBase::getValue: Illegal call here (we're before first or after last)!"); @@ -269,91 +259,78 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getString" ); ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } sal_Bool SAL_CALL ORowSetBase::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getBoolean" ); ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } sal_Int8 SAL_CALL ORowSetBase::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getByte" ); ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } sal_Int16 SAL_CALL ORowSetBase::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getShort" ); ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } sal_Int32 SAL_CALL ORowSetBase::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getInt" ); ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } sal_Int64 SAL_CALL ORowSetBase::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getLong" ); ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } float SAL_CALL ORowSetBase::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getFloat" ); ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } double SAL_CALL ORowSetBase::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getDouble" ); ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } Sequence< sal_Int8 > SAL_CALL ORowSetBase::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "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, std::exception) { - SAL_INFO("dbaccess", "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, std::exception) { - SAL_INFO("dbaccess", "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, std::exception) { - SAL_INFO("dbaccess", "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, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getBinaryStream" ); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -388,13 +365,11 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getCharacterStream" ); return getBinaryStream(columnIndex); } Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getObject" ); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -403,26 +378,22 @@ Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNa Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getRef" ); ::dbtools::throwFeatureNotImplementedException( "XRow::getRef", *m_pMySelf ); return NULL; } Reference< XBlob > SAL_CALL ORowSetBase::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getBlob" ); return Reference< XBlob >(getValue(columnIndex).makeAny(),UNO_QUERY); } Reference< XClob > SAL_CALL ORowSetBase::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getClob" ); return Reference< XClob >(getValue(columnIndex).makeAny(),UNO_QUERY); } Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getArray" ); ::dbtools::throwFeatureNotImplementedException( "XRow::getArray", *m_pMySelf ); return NULL; } @@ -430,8 +401,7 @@ Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ ) // ::com::sun::star::sdbcx::XRowLocate Any SAL_CALL ORowSetBase::getBookmark( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getBookmark" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::getBookmark() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::getBookmark() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -448,8 +418,7 @@ Any SAL_CALL ORowSetBase::getBookmark( ) throw(SQLException, RuntimeException, sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::moveToBookmark" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::moveToBookmark(Any) Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::moveToBookmark(Any) Clone = " << m_bClone); OSL_ENSURE(bookmark.hasValue(),"ORowSetBase::moveToBookmark bookmark has no value!"); ::osl::ResettableMutexGuard aGuard( *m_pMutex ); @@ -493,14 +462,13 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx // - IsNew aNotifier.fire( ); } - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::moveToBookmark(Any) = " << bRet << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::moveToBookmark(Any) = " << bRet << " Clone = " << m_bClone); return bRet; } sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::moveRelativeToBookmark" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::moveRelativeToBookmark(Any," << rows << ") Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::moveRelativeToBookmark(Any," << rows << ") Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::ResettableMutexGuard aGuard( *m_pMutex ); @@ -537,13 +505,12 @@ sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_ // RowCount/IsRowCountFinal fireRowcount(); } - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::moveRelativeToBookmark(Any," << rows << ") = " << bRet << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::moveRelativeToBookmark(Any," << rows << ") = " << bRet << " Clone = " << m_bClone); return bRet; } sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::compareBookmarks" ); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); return m_pCache->compareBookmarks(_first,_second); @@ -551,7 +518,6 @@ sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& _first, const Any& sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::hasOrderedBookmarks" ); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); return m_pCache->hasOrderedBookmarks(); @@ -559,7 +525,6 @@ sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks( ) throw(SQLException, Runti sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::hashBookmark" ); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); return m_pCache->hashBookmark(bookmark); @@ -568,7 +533,6 @@ sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) throw(SQLExc // XResultSetMetaDataSupplier Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getMetaData" ); ::connectivity::checkDisposed(m_rBHelper.bDisposed); Reference< XResultSetMetaData > xMeta; @@ -581,7 +545,6 @@ Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData( ) throw(SQLE // XColumnLocate sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::findColumn" ); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aColumnsMutex ); @@ -592,7 +555,6 @@ sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) throw(S // ::com::sun::star::sdbcx::XColumnsSupplier Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getColumns" ); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aColumnsMutex ); @@ -609,8 +571,7 @@ Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns( ) throw(RuntimeExcep // XResultSet sal_Bool SAL_CALL ORowSetBase::next( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::next" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::next() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::next() Clone = " << m_bClone); ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkCache(); @@ -652,43 +613,39 @@ sal_Bool SAL_CALL ORowSetBase::next( ) throw(SQLException, RuntimeException, st // - RowCount/IsRowCountFinal fireRowcount(); } - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::next() = " << bRet << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::next() = " << bRet << " Clone = " << m_bClone); return bRet; } sal_Bool SAL_CALL ORowSetBase::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::isBeforeFirst" ); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isBeforeFirst() = " << m_bBeforeFirst << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::isBeforeFirst() = " << m_bBeforeFirst << " Clone = " << m_bClone); return m_bBeforeFirst; } sal_Bool SAL_CALL ORowSetBase::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::isAfterLast" ); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isAfterLast() = " << m_bAfterLast << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::isAfterLast() = " << m_bAfterLast << " Clone = " << m_bClone); return m_bAfterLast; } bool ORowSetBase::isOnFirst() { - SAL_INFO("dbaccess", "ORowSetBase::isOnFirst" ); return isFirst(); } sal_Bool SAL_CALL ORowSetBase::isFirst( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::isFirst" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isFirst() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::isFirst() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -702,20 +659,18 @@ sal_Bool SAL_CALL ORowSetBase::isFirst( ) throw(SQLException, RuntimeException, bool bIsFirst = m_pCache->isFirst(); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isFirst() = " << bIsFirst << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::isFirst() = " << bIsFirst << " Clone = " << m_bClone); return bIsFirst; } bool ORowSetBase::isOnLast() { - SAL_INFO("dbaccess", "ORowSetBase::isOnLast" ); return isLast(); } sal_Bool SAL_CALL ORowSetBase::isLast( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::isLast" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isLast() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::isLast() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -733,14 +688,13 @@ sal_Bool SAL_CALL ORowSetBase::isLast( ) throw(SQLException, RuntimeException, bool bIsLast = m_pCache->isLast(); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isLast() = " << bIsLast << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::isLast() = " << bIsLast << " Clone = " << m_bClone); return bIsLast; } void SAL_CALL ORowSetBase::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::beforeFirst" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::beforeFirst() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::beforeFirst() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::ResettableMutexGuard aGuard( *m_pMutex ); @@ -776,13 +730,12 @@ void SAL_CALL ORowSetBase::beforeFirst( ) throw(SQLException, RuntimeException, // to be done _after_ the notifications! m_aOldRow->clearRow(); } - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::beforeFirst() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::beforeFirst() Clone = " << m_bClone); } void SAL_CALL ORowSetBase::afterLast( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::afterLast" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::afterLast() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::afterLast() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::ResettableMutexGuard aGuard( *m_pMutex ); @@ -816,14 +769,13 @@ void SAL_CALL ORowSetBase::afterLast( ) throw(SQLException, RuntimeException, s fireRowcount(); } } - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::afterLast() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::afterLast() Clone = " << m_bClone); } bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<bool,ORowSetBase>& _aCheckFunctor, ::std::mem_fun_t<bool,ORowSetCache>& _aMovementFunctor) { - SAL_INFO("dbaccess", "ORowSetBase::move" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::move() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::move() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkPositioningAllowed(); @@ -863,14 +815,13 @@ bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<bool,ORowSetBase>& _aCheckF // - RowCount/IsRowCountFinal fireRowcount(); } - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::move() = " << bRet << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::move() = " << bRet << " Clone = " << m_bClone); return bRet; } sal_Bool SAL_CALL ORowSetBase::first( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::first" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::first() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::first() Clone = " << m_bClone); ::std::mem_fun_t<bool,ORowSetBase> ioF_tmp(&ORowSetBase::isOnFirst); ::std::mem_fun_t<bool,ORowSetCache> F_tmp(&ORowSetCache::first); return move(ioF_tmp,F_tmp); @@ -878,8 +829,7 @@ sal_Bool SAL_CALL ORowSetBase::first( ) throw(SQLException, RuntimeException, s sal_Bool SAL_CALL ORowSetBase::last( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::last" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::last() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::last() Clone = " << m_bClone); ::std::mem_fun_t<bool,ORowSetBase> ioL_tmp(&ORowSetBase::isOnLast); ::std::mem_fun_t<bool,ORowSetCache> L_tmp(&ORowSetCache::last); return move(ioL_tmp,L_tmp); @@ -887,8 +837,7 @@ sal_Bool SAL_CALL ORowSetBase::last( ) throw(SQLException, RuntimeException, st sal_Int32 SAL_CALL ORowSetBase::getRow( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getRow" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::getRow() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::getRow() Clone = " << m_bClone); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -897,7 +846,6 @@ sal_Int32 SAL_CALL ORowSetBase::getRow( ) throw(SQLException, RuntimeException, sal_Int32 ORowSetBase::impl_getRow() { - SAL_INFO("dbaccess", "ORowSetBase::impl_getRow" ); sal_Int32 nPos = 0; if ( m_bBeforeFirst ) nPos = 0; @@ -918,14 +866,13 @@ sal_Int32 ORowSetBase::impl_getRow() } nPos = m_pCache->getRow(); } - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::impl_getRow() = " << nPos << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::impl_getRow() = " << nPos << " Clone = " << m_bClone); return nPos; } sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::absolute" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::absolute(" << row << ") Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::absolute(" << row << ") Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkPositioningAllowed(); @@ -964,14 +911,13 @@ sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, Run // - RowCount/IsRowCountFinal fireRowcount(); } - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::absolute(" << row << ") = " << bRet << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::absolute(" << row << ") = " << bRet << " Clone = " << m_bClone); return bRet; } sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::relative" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::relative(" << rows << ") Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::relative(" << rows << ") Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::ResettableMutexGuard aGuard( *m_pMutex ); @@ -1020,14 +966,13 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, Ru // - RowCount/IsRowCountFinal fireRowcount(); } - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::relative(" << rows << ") = " << bRet << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::relative(" << rows << ") = " << bRet << " Clone = " << m_bClone); return bRet; } sal_Bool SAL_CALL ORowSetBase::previous( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::previous" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::previous() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::previous() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::ResettableMutexGuard aGuard( *m_pMutex ); @@ -1073,14 +1018,13 @@ sal_Bool SAL_CALL ORowSetBase::previous( ) throw(SQLException, RuntimeException // - RowCount/IsRowCountFinal fireRowcount(); } - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::previous() = " << bRet << " Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::previous() = " << bRet << " Clone = " << m_bClone); return bRet; } void ORowSetBase::setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow& _rOldValues, ::osl::ResettableMutexGuard& _rGuard ) { - SAL_INFO("dbaccess", "ORowSetBase::setCurrentRow" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::setCurrentRow() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::setCurrentRow() Clone = " << m_bClone); m_bBeforeFirst = m_pCache->isBeforeFirst(); m_bAfterLast = m_pCache->isAfterLast(); @@ -1133,25 +1077,22 @@ void ORowSetBase::setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow // - cursorMoved notifyAllListenersCursorMoved( _rGuard ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::setCurrentRow() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::setCurrentRow() Clone = " << m_bClone); } void ORowSetBase::checkPositioningAllowed() throw( SQLException, RuntimeException ) { - SAL_INFO("dbaccess", "ORowSetBase::checkPositioningAllowed" ); if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY) throwFunctionSequenceException(*m_pMySelf); } Reference< XInterface > ORowSetBase::getStatement(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "ORowSetBase::getStatement" ); return NULL; } void SAL_CALL ORowSetBase::refreshRow( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::refreshRow" ); ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -1170,7 +1111,6 @@ void SAL_CALL ORowSetBase::refreshRow( ) throw(SQLException, RuntimeException, sal_Bool SAL_CALL ORowSetBase::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::rowUpdated" ); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -1182,7 +1122,6 @@ sal_Bool SAL_CALL ORowSetBase::rowUpdated( ) throw(SQLException, RuntimeExcepti sal_Bool SAL_CALL ORowSetBase::rowInserted( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::rowInserted" ); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -1195,7 +1134,6 @@ sal_Bool SAL_CALL ORowSetBase::rowInserted( ) throw(SQLException, RuntimeExcept sal_Bool SAL_CALL ORowSetBase::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::rowDeleted" ); ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); return impl_rowDeleted(); @@ -1209,7 +1147,6 @@ bool ORowSetBase::impl_rowDeleted( ) // XWarningsSupplier Any SAL_CALL ORowSetBase::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::getWarnings" ); ::osl::MutexGuard aGuard( *m_pMutex ); if ( m_pCache ) @@ -1224,7 +1161,6 @@ Any SAL_CALL ORowSetBase::getWarnings( ) throw(SQLException, RuntimeException, void SAL_CALL ORowSetBase::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ORowSetBase::clearWarnings" ); ::osl::MutexGuard aGuard( *m_pMutex ); if ( m_pCache ) @@ -1241,7 +1177,7 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow) return; SAL_INFO("dbaccess", "ORowSetBase::firePropertyChange" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::firePropertyChange() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::firePropertyChange() Clone = " << m_bClone); OSL_ENSURE(m_pColumns,"Columns can not be NULL here!"); sal_Int32 i=0; try @@ -1254,7 +1190,7 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow) { SAL_WARN("dbaccess", "firePropertyChange: Exception"); } - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::firePropertyChange() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::firePropertyChange() Clone = " << m_bClone); } void ORowSetBase::firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rOldValue) @@ -1265,23 +1201,19 @@ void ORowSetBase::firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowS void ORowSetBase::fireRowcount() { - SAL_INFO("dbaccess", "ORowSetBase::fireRowcount" ); } bool ORowSetBase::notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& /*_rGuard*/) { - SAL_INFO("dbaccess", "ORowSetBase::notifyAllListenersCursorBeforeMove" ); return true; } void ORowSetBase::notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& /*_rGuard*/) { - SAL_INFO("dbaccess", "ORowSetBase::notifyAllListenersCursorMoved" ); } void ORowSetBase::notifyAllListeners(::osl::ResettableMutexGuard& /*_rGuard*/) { - SAL_INFO("dbaccess", "ORowSetBase::notifyAllListeners" ); } bool ORowSetBase::isPropertyChangeNotificationEnabled() const @@ -1291,7 +1223,6 @@ bool ORowSetBase::isPropertyChangeNotificationEnabled() const void ORowSetBase::fireProperty( sal_Int32 _nProperty, bool _bNew, bool _bOld ) { - SAL_INFO("dbaccess", "ORowSetBase::fireProperty" ); Any aNew = css::uno::makeAny( _bNew ); Any aOld = css::uno::makeAny( _bOld ); fire( &_nProperty, &aNew, &aOld, 1, sal_False ); @@ -1299,8 +1230,7 @@ void ORowSetBase::fireProperty( sal_Int32 _nProperty, bool _bNew, bool _bOld ) void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection ) { - SAL_INFO("dbaccess", "ORowSetBase::positionCache" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::positionCache() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::positionCache() Clone = " << m_bClone); bool bSuccess = false; if ( m_aBookmark.hasValue() ) @@ -1355,12 +1285,11 @@ void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection ) OSL_ENSURE( bSuccess, "ORowSetBase::positionCache: failed!" ); (void)bSuccess; - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::positionCache() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::positionCache() Clone = " << m_bClone); } void ORowSetBase::checkCache() { - SAL_INFO("dbaccess", "ORowSetBase::checkCache" ); ::connectivity::checkDisposed(m_rBHelper.bDisposed); if(!m_pCache) throwFunctionSequenceException(*m_pMySelf); @@ -1368,8 +1297,7 @@ void ORowSetBase::checkCache() void ORowSetBase::movementFailed() { - SAL_INFO("dbaccess", "ORowSetBase::movementFailed" ); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::movementFailed() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::movementFailed() Clone = " << m_bClone); m_aOldRow->clearRow(); m_aCurrentRow = m_pCache->getEnd(); m_bBeforeFirst = m_pCache->isBeforeFirst(); @@ -1377,12 +1305,11 @@ void ORowSetBase::movementFailed() m_aBookmark = Any(); m_aCurrentRow.setBookmark(m_aBookmark); OSL_ENSURE(m_bBeforeFirst || m_bAfterLast,"BeforeFirst or AfterLast is wrong!"); - SAL_INFO("dbaccess", "DBACCESS ORowSetBase::movementFailed() Clone = " << m_bClone); + SAL_INFO("dbaccess", "ORowSetBase::movementFailed() Clone = " << m_bClone); } ORowSetRow ORowSetBase::getOldRow(bool _bWasNew) { - SAL_INFO("dbaccess", "ORowSetBase::getOldRow" ); OSL_ENSURE(m_aOldRow.is(),"RowSetRowHElper isn't valid!"); ORowSetRow aOldValues; if ( !_bWasNew && m_aOldRow->getRow().is() ) @@ -1392,13 +1319,11 @@ ORowSetRow ORowSetBase::getOldRow(bool _bWasNew) void ORowSetBase::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any& _rDefault ) const { - SAL_INFO("dbaccess", "ORowSetBase::getPropertyDefaultByHandle" ); _rDefault.clear(); } void ORowSetBase::onDeleteRow( const Any& _rBookmark ) { - SAL_INFO("dbaccess", "ORowSetBase::onDeleteRow" ); if ( rowDeleted() ) // not interested in return; @@ -1414,7 +1339,6 @@ void ORowSetBase::onDeleteRow( const Any& _rBookmark ) void ORowSetBase::onDeletedRow( const Any& _rBookmark, sal_Int32 _nPos ) { - SAL_INFO("dbaccess", "ORowSetBase::onDeletedRow" ); if ( rowDeleted() ) { // if we're a clone, and on a deleted row, and the main RowSet deleted another @@ -1437,7 +1361,6 @@ void ORowSetBase::onDeletedRow( const Any& _rBookmark, sal_Int32 _nPos ) sal_Int32 ORowSetBase::impl_getRowCount() const { - SAL_INFO("dbaccess", "ORowSetBase::impl_getRowCount" ); sal_Int32 nRowCount( m_pCache->m_nRowCount ); if ( const_cast< ORowSetBase* >( this )->rowDeleted() && !m_pCache->m_bNew ) ++nRowCount; @@ -1489,7 +1412,6 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet,const ORowSetValueVector ORowSetNotifier::~ORowSetNotifier( ) { - SAL_INFO("dbaccess", "ORowSetNotifier::~ORowSetNotifier" ); } void ORowSetNotifier::fire() diff --git a/dbaccess/source/core/api/RowSetCacheIterator.cxx b/dbaccess/source/core/api/RowSetCacheIterator.cxx index 72ad03f7aca6..555d28b60a77 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.cxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx @@ -27,7 +27,6 @@ ORowSetCacheIterator::ORowSetCacheIterator(const ORowSetCacheIterator& _rRH) , m_pCache(_rRH.m_pCache) ,m_pRowSet(_rRH.m_pRowSet) { - SAL_INFO("dbaccess", "ORowSetCacheIterator::ORowSetCacheIterator" ); } ORowSetCacheIterator::operator ORowSetMatrix::iterator() @@ -107,13 +106,11 @@ bool ORowSetCacheIterator::operator ==(const ORowSetMatrix::iterator& _rRH) cons void ORowSetCacheIterator::setBookmark(const ::com::sun::star::uno::Any& _rBookmark) { - SAL_INFO("dbaccess", "ORowSetCacheIterator::setBookmark" ); m_aIter->second.aBookmark = _rBookmark; } bool ORowSetCacheIterator::isNull() const { - SAL_INFO("dbaccess", "ORowSetCacheIterator::isNull" ); bool bRet = !m_pCache || !m_pRowSet || m_aIter == m_pCache->m_aCacheIterators.end(); if ( !bRet ) { @@ -129,7 +126,6 @@ bool ORowSetCacheIterator::isNull() const ::osl::Mutex* ORowSetCacheIterator::getMutex() const { - SAL_INFO("dbaccess", "ORowSetCacheIterator::getMutex" ); return m_pRowSet ? m_pRowSet->getMutex() : NULL; } diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 4d7999ee7c5f..7f4efb2720ce 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -101,7 +101,6 @@ namespace */ const OSQLParseNode* parseStatement_throwError( OSQLParser& _rParser, const OUString& _rStatement, const Reference< XInterface >& _rxContext ) { - SAL_INFO("dbaccess", "SingleSelectQueryComposer.cxx::parseStatement_throwError" ); OUString aErrorMsg; const OSQLParseNode* pNewSqlParseNode = _rParser.parseTree( aErrorMsg, _rStatement ); if ( !pNewSqlParseNode ) @@ -146,7 +145,6 @@ namespace void parseAndCheck_throwError( OSQLParser& _rParser, const OUString& _rStatement, OSQLParseTreeIterator& _rIterator, const Reference< XInterface >& _rxContext ) { - SAL_INFO("dbaccess", "SingleSelectQueryComposer.cxx::parseAndCheck_throwError" ); const OSQLParseNode* pNode = parseStatement_throwError( _rParser, _rStatement, _rxContext ); checkForSingleSelect_throwError( pNode, _rIterator, _rxContext, _rStatement ); } @@ -233,8 +231,6 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc ,m_nBoolCompareMode( BooleanComparisonMode::EQUAL_INTEGER ) ,m_nCommandType(CommandType::COMMAND) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::OSingleSelectQueryComposer" ); - if ( !m_aContext.is() || !m_xConnection.is() || !m_xConnectionTables.is() ) throw IllegalArgumentException(); @@ -281,7 +277,6 @@ OSingleSelectQueryComposer::~OSingleSelectQueryComposer() // OComponentHelper void SAL_CALL OSingleSelectQueryComposer::disposing(void) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::disposing" ); OSubComponent::disposing(); MutexGuard aGuard(m_aMutex); @@ -310,7 +305,6 @@ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OSingleSelectQueryComposer) // XSingleSelectQueryAnalyzer OUString SAL_CALL OSingleSelectQueryComposer::getQuery( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -320,7 +314,6 @@ OUString SAL_CALL OSingleSelectQueryComposer::getQuery( ) throw(RuntimeExceptio void SAL_CALL OSingleSelectQueryComposer::setQuery( const OUString& command ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -409,7 +402,6 @@ void SAL_CALL OSingleSelectQueryComposer::setCommand( const OUString& Command,sa void OSingleSelectQueryComposer::setQuery_Impl( const OUString& command ) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setQuery_Impl" ); // parse this parseAndCheck_throwError( m_aSqlParser, command, m_aSqlIterator, *this ); @@ -422,28 +414,24 @@ void OSingleSelectQueryComposer::setQuery_Impl( const OUString& command ) Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredHavingClause( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getStructuredHavingClause" ); TGetParseNode F_tmp(&OSQLParseTreeIterator::getSimpleHavingTree); return getStructuredCondition(F_tmp); } Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredFilter( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "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, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::appendHavingClauseByColumn" ); ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const 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, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::appendFilterByColumn" ); ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetFilter); setConditionByColumn(column,andCriteria,F_tmp,filterOperator); } @@ -560,7 +548,6 @@ OUString OSingleSelectQueryComposer::impl_getColumnName_throw(const Reference< X void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::appendOrderByColumn" ); ::osl::MutexGuard aGuard( m_aMutex ); OUString sColumnName( impl_getColumnName_throw(column, true) ); OUString sOrder = getOrder(); @@ -575,7 +562,6 @@ void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference< void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference< XPropertySet >& column) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::appendGroupByColumn" ); ::osl::MutexGuard aGuard( m_aMutex ); OUString sColumnName( impl_getColumnRealName_throw(column, true) ); OrderCreator aComposer; @@ -586,7 +572,6 @@ void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference< OUString OSingleSelectQueryComposer::composeStatementFromParts( const ::std::vector< OUString >& _rParts ) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::composeStatementFromParts" ); OSL_ENSURE( _rParts.size() == (size_t)SQLPartCount, "OSingleSelectQueryComposer::composeStatementFromParts: invalid parts array!" ); OUStringBuffer aSql( m_aPureSelectSQL ); @@ -602,13 +587,11 @@ OUString OSingleSelectQueryComposer::composeStatementFromParts( const ::std::vec OUString SAL_CALL OSingleSelectQueryComposer::getElementaryQuery() throw (::com::sun::star::uno::RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getElementaryQuery" ); return composeStatementFromParts( m_aElementaryParts ); } void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const OUString& _rElementary ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setElementaryQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -658,7 +641,6 @@ namespace void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const OUString& _rClause ) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setSingleAdditiveClause" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -721,32 +703,27 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const void SAL_CALL OSingleSelectQueryComposer::setFilter( const OUString& filter ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setFilter" ); setSingleAdditiveClause( Where, filter ); } void SAL_CALL OSingleSelectQueryComposer::setOrder( const OUString& order ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setOrder" ); setSingleAdditiveClause( Order, order ); } void SAL_CALL OSingleSelectQueryComposer::setGroup( const OUString& group ) throw (SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setGroup" ); setSingleAdditiveClause( Group, group ); } void SAL_CALL OSingleSelectQueryComposer::setHavingClause( const OUString& filter ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setHavingClause" ); setSingleAdditiveClause( Having, filter ); } // XTablesSupplier Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getTables" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -767,7 +744,6 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables( ) thro // XColumnsSupplier Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getColumns" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); if ( !!m_aCurrentColumns[SelectColumns] ) @@ -986,7 +962,6 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OSQLParseTreeIterator& _rIterator, ::std::vector< ::std::vector < PropertyValue > >& rFilters, const Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter) const { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setORCriteria" ); // Round brackets around the expression if (pCondition->count() == 3 && SQL_ISPUNCTUATION(pCondition->getChild(0),"(") && @@ -1023,7 +998,6 @@ bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OSQLPa bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition, OSQLParseTreeIterator& _rIterator, ::std::vector < PropertyValue >& rFilter, const Reference< XNumberFormatter > & xFormatter) const { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setANDCriteria" ); // Round brackets if (SQL_ISRULE(pCondition,boolean_primary)) { @@ -1110,7 +1084,6 @@ bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition, sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredicate) const { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getPredicateType" ); sal_Int32 nPredicate = SQLFilterOperator::EQUAL; switch (_pPredicate->getNodeType()) { @@ -1141,7 +1114,6 @@ sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredica bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCondition, OSQLParseTreeIterator& _rIterator, ::std::vector < PropertyValue >& rFilter, const Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter) const { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setComparsionPredicate" ); OSL_ENSURE(SQL_ISRULE(pCondition, comparison_predicate),"setComparsionPredicate: pCondition ist kein ComparsionPredicate"); if (SQL_ISRULE(pCondition->getChild(0), column_ref) || SQL_ISRULE(pCondition->getChild(pCondition->count()-1), column_ref)) @@ -1264,7 +1236,6 @@ bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pConditi // Functions for analysing SQL OUString OSingleSelectQueryComposer::getColumnName( ::connectivity::OSQLParseNode* pColumnRef, OSQLParseTreeIterator& _rIterator ) const { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getColumnName" ); OUString aTableRange, aColumnName; _rIterator.getColumnRange(pColumnRef,aColumnName,aTableRange); return aColumnName; @@ -1272,7 +1243,6 @@ OUString OSingleSelectQueryComposer::getColumnName( ::connectivity::OSQLParseNod OUString SAL_CALL OSingleSelectQueryComposer::getFilter( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getFilter" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); return getSQLPart(Where,m_aAdditiveIterator,false); @@ -1280,7 +1250,6 @@ OUString SAL_CALL OSingleSelectQueryComposer::getFilter( ) throw(RuntimeExcepti OUString SAL_CALL OSingleSelectQueryComposer::getOrder( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getOrder" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); return getSQLPart(Order,m_aAdditiveIterator,false); @@ -1288,7 +1257,6 @@ OUString SAL_CALL OSingleSelectQueryComposer::getOrder( ) throw(RuntimeExceptio OUString SAL_CALL OSingleSelectQueryComposer::getGroup( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getGroup" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); return getSQLPart(Group,m_aAdditiveIterator,false); @@ -1296,7 +1264,6 @@ OUString SAL_CALL OSingleSelectQueryComposer::getGroup( ) throw (RuntimeExcepti OUString OSingleSelectQueryComposer::getHavingClause() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getHavingClause" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); return getSQLPart(Having,m_aAdditiveIterator,false); @@ -1304,7 +1271,6 @@ OUString OSingleSelectQueryComposer::getHavingClause() throw (RuntimeException, OUString OSingleSelectQueryComposer::getTableAlias(const Reference< XPropertySet >& column) const { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getTableAlias" ); OUString sReturn; if(m_pTables && m_pTables->getCount() > 1) { @@ -1378,7 +1344,6 @@ OUString OSingleSelectQueryComposer::getTableAlias(const Reference< XPropertySet Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getParameters" ); // now set the Parameters if ( !m_aCurrentColumns[ParameterColumns] ) { @@ -1395,7 +1360,6 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters( ) void OSingleSelectQueryComposer::clearColumns( const EColumnType _eType ) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::clearColumns" ); OPrivateColumns* pColumns = m_aCurrentColumns[ _eType ]; if ( pColumns != NULL ) { @@ -1407,7 +1371,6 @@ void OSingleSelectQueryComposer::clearColumns( const EColumnType _eType ) void OSingleSelectQueryComposer::clearCurrentCollections() { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::clearCurrentCollections" ); ::std::vector<OPrivateColumns*>::iterator aIter = m_aCurrentColumns.begin(); ::std::vector<OPrivateColumns*>::iterator aEnd = m_aCurrentColumns.end(); for (;aIter != aEnd;++aIter) @@ -1431,7 +1394,6 @@ void OSingleSelectQueryComposer::clearCurrentCollections() Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumnType _eType, const ::rtl::Reference< OSQLColumns >& _rCols ) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setCurrentColumns" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -1450,19 +1412,16 @@ Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumn Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getGroupColumns( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getGroupColumns" ); return setCurrentColumns( GroupByColumns, m_aAdditiveIterator.getGroupColumns() ); } Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getOrderColumns( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getOrderColumns" ); return setCurrentColumns( OrderColumns, m_aAdditiveIterator.getOrderColumns() ); } OUString SAL_CALL OSingleSelectQueryComposer::getQueryWithSubstitution( ) throw (SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getQueryWithSubstitution" ); ::osl::MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -1481,7 +1440,6 @@ OUString SAL_CALL OSingleSelectQueryComposer::getQueryWithSubstitution( ) throw OUString OSingleSelectQueryComposer::getStatementPart( TGetParseNode& _aGetFunctor, OSQLParseTreeIterator& _rIterator ) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getStatementPart" ); OUString sResult; const OSQLParseNode* pNode = _aGetFunctor( &_rIterator ); @@ -1536,21 +1494,18 @@ namespace void SAL_CALL OSingleSelectQueryComposer::setStructuredFilter( const Sequence< Sequence< PropertyValue > >& filter ) throw (SQLException, ::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setStructuredFilter" ); OPredicateInputController aPredicateInput(m_aContext, m_xConnection, &m_aParseContext); setFilter(lcl_getCondition(filter,aPredicateInput,getColumns())); } void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const Sequence< Sequence< PropertyValue > >& filter ) throw (SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setStructuredHavingClause" ); OPredicateInputController aPredicateInput(m_aContext, m_xConnection); setHavingClause(lcl_getCondition(filter,aPredicateInput,getColumns())); } void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropertySet >& column, bool andCriteria ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString& >& _aSetFunctor,sal_Int32 filterOperator) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setConditionByColumn" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); if ( !column.is() @@ -1716,7 +1671,6 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredCondition( TGetParseNode& _aGetFunctor ) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getStructuredCondition" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); @@ -1801,7 +1755,6 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC OUString OSingleSelectQueryComposer::getKeyword( SQLPart _ePart ) const { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getKeyword" ); OUString sKeyword; switch(_ePart) { @@ -1826,7 +1779,6 @@ OUString OSingleSelectQueryComposer::getKeyword( SQLPart _ePart ) const OUString OSingleSelectQueryComposer::getSQLPart( SQLPart _ePart, OSQLParseTreeIterator& _rIterator, bool _bWithKeyword ) { - SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getSQLPart" ); TGetParseNode F_tmp(&OSQLParseTreeIterator::getSimpleWhereTree); OUString sKeyword( getKeyword( _ePart ) ); switch(_ePart) diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx index f4a4609f7b19..aea9c4d8ed11 100644 --- a/dbaccess/source/core/api/StaticSet.cxx +++ b/dbaccess/source/core/api/StaticSet.cxx @@ -40,34 +40,29 @@ using namespace ::osl; void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/) { - SAL_INFO("dbaccess", "OStaticSet::fillValueRow" ); _rRow = *m_aSetIter; } // ::com::sun::star::sdbcx::XRowLocate Any SAL_CALL OStaticSet::getBookmark() throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::getBookmark" ); return makeAny(getRow()); } bool SAL_CALL OStaticSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::moveToBookmark" ); m_bInserted = m_bUpdated = m_bDeleted = false; return absolute(::comphelper::getINT32(bookmark)); } bool SAL_CALL OStaticSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::moveRelativeToBookmark" ); m_bInserted = m_bUpdated = m_bDeleted = false; return absolute(::comphelper::getINT32(bookmark)+rows); } sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::compareBookmarks" ); sal_Int32 nFirst = 0, nSecond = 0; _first >>= nFirst; _second >>= nSecond; @@ -76,19 +71,16 @@ sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _ bool SAL_CALL OStaticSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::hasOrderedBookmarks" ); return true; } sal_Int32 SAL_CALL OStaticSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::hashBookmark" ); return ::comphelper::getINT32(bookmark); } bool OStaticSet::fetchRow() { - SAL_INFO("dbaccess", "OStaticSet::fetchRow" ); bool bRet = false; if ( !m_bEnd && (!m_nMaxRows || sal_Int32(m_aSet.size()) < m_nMaxRows) ) bRet = m_xDriverSet->next(); @@ -106,7 +98,6 @@ bool OStaticSet::fetchRow() void OStaticSet::fillAllRows() { - SAL_INFO("dbaccess", "OStaticSet::fillAllRows" ); if(!m_bEnd) { sal_Int32 nColumnCount = m_xSetMetaData->getColumnCount(); @@ -125,7 +116,6 @@ void OStaticSet::fillAllRows() // XResultSet bool SAL_CALL OStaticSet::next( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::next" ); m_bInserted = m_bUpdated = m_bDeleted = false; if(isAfterLast()) @@ -143,38 +133,32 @@ bool SAL_CALL OStaticSet::next( ) throw(SQLException, RuntimeException) bool SAL_CALL OStaticSet::isBeforeFirst( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::isBeforeFirst" ); return m_aSetIter == m_aSet.begin(); } bool SAL_CALL OStaticSet::isAfterLast( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::isAfterLast" ); return m_aSetIter == m_aSet.end() && m_bEnd; } bool SAL_CALL OStaticSet::isFirst( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::isFirst" ); return m_aSetIter == m_aSet.begin()+1; } bool SAL_CALL OStaticSet::isLast( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::isLast" ); return m_aSetIter == m_aSet.end()-1 && m_bEnd; } void SAL_CALL OStaticSet::beforeFirst( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::beforeFirst" ); m_bInserted = m_bUpdated = m_bDeleted = false; m_aSetIter = m_aSet.begin(); } void SAL_CALL OStaticSet::afterLast( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::afterLast" ); m_bInserted = m_bUpdated = m_bDeleted = false; fillAllRows(); m_aSetIter = m_aSet.end(); @@ -182,7 +166,6 @@ void SAL_CALL OStaticSet::afterLast( ) throw(SQLException, RuntimeException) bool SAL_CALL OStaticSet::first( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::first" ); m_bInserted = m_bUpdated = m_bDeleted = false; m_aSetIter = m_aSet.begin()+1; if(m_aSetIter == m_aSet.end() && !fetchRow()) @@ -193,7 +176,6 @@ bool SAL_CALL OStaticSet::first( ) throw(SQLException, RuntimeException) bool SAL_CALL OStaticSet::last( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::last" ); m_bInserted = m_bUpdated = m_bDeleted = false; fillAllRows(); m_aSetIter = m_aSet.end()-1; @@ -203,7 +185,6 @@ bool SAL_CALL OStaticSet::last( ) throw(SQLException, RuntimeException) sal_Int32 SAL_CALL OStaticSet::getRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::getRow" ); OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!"); OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!"); @@ -214,7 +195,6 @@ sal_Int32 SAL_CALL OStaticSet::getRow( ) throw(SQLException, RuntimeException) bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::absolute" ); m_bInserted = m_bUpdated = m_bDeleted = false; OSL_ENSURE(row,"OStaticSet::absolute: INVALID row number!"); // if row greater 0 than count from end - row means last @@ -255,7 +235,6 @@ bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeE bool SAL_CALL OStaticSet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::relative" ); if(!rows) return true; @@ -265,7 +244,6 @@ bool SAL_CALL OStaticSet::relative( sal_Int32 rows ) throw(SQLException, Runtime bool SAL_CALL OStaticSet::previous( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::previous" ); m_bInserted = m_bUpdated = m_bDeleted = false; if(m_aSetIter != m_aSet.begin()) @@ -276,30 +254,25 @@ bool SAL_CALL OStaticSet::previous( ) throw(SQLException, RuntimeException) void SAL_CALL OStaticSet::refreshRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::refreshRow" ); } bool SAL_CALL OStaticSet::rowUpdated( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::rowUpdated" ); return m_bUpdated; } bool SAL_CALL OStaticSet::rowInserted( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::rowInserted" ); return m_bInserted; } bool SAL_CALL OStaticSet::rowDeleted( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::rowDeleted" ); return m_bDeleted; } Sequence< sal_Int32 > SAL_CALL OStaticSet::deleteRows( const Sequence< Any >& rows,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::deleteRows" ); Sequence< sal_Int32 > aRet(rows.getLength()); const Any* pBegin = rows.getConstArray(); const Any* pEnd = pBegin + rows.getLength(); @@ -313,7 +286,6 @@ Sequence< sal_Int32 > SAL_CALL OStaticSet::deleteRows( const Sequence< Any >& ro void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::insertRow" ); OCacheSet::insertRow( _rInsertRow,_xTable); if(m_bInserted) { @@ -326,13 +298,11 @@ void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connect void SAL_CALL OStaticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::updateRow" ); OCacheSet::updateRow( _rInsertRow,_rOriginalRow,_xTable); } void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::deleteRow" ); OCacheSet::deleteRow(_rDeleteRow,_xTable); if(m_bDeleted) { @@ -345,17 +315,14 @@ void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connect void SAL_CALL OStaticSet::cancelRowUpdates( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::cancelRowUpdates" ); } void SAL_CALL OStaticSet::moveToInsertRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::moveToInsertRow" ); } void SAL_CALL OStaticSet::moveToCurrentRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "OStaticSet::moveToCurrentRow" ); } void OStaticSet::reset(const Reference< XResultSet> &_xDriverSet) diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index ccaadc6d2ea1..b228b653a760 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -70,7 +70,6 @@ ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnect ,m_nPrivileges(-1) ,m_pColumns(NULL) { - SAL_INFO("dbaccess", "ODBTableDecorator::ODBTableDecorator" ); ODataSettings::registerPropertiesFor(this); } @@ -88,7 +87,6 @@ Sequence< sal_Int8 > ODBTableDecorator::getImplementationId() throw (RuntimeExce // OComponentHelper void SAL_CALL ODBTableDecorator::disposing() { - SAL_INFO("dbaccess", "ODBTableDecorator::disposing" ); OPropertySetHelper::disposing(); OTableDescriptor_BASE::disposing(); @@ -154,7 +152,6 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue( void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::setFastPropertyValue_NoBroadcast" ); switch(_nHandle) { case PROPERTY_ID_PRIVILEGES: @@ -304,7 +301,6 @@ void ODBTableDecorator::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) c void ODBTableDecorator::construct() { - SAL_INFO("dbaccess", "ODBTableDecorator::construct" ); bool bNotFound = true; Reference<XPropertySet> xProp(m_xTable,UNO_QUERY); if ( xProp.is() ) @@ -394,7 +390,6 @@ Sequence< Type > SAL_CALL ODBTableDecorator::getTypes( ) throw(RuntimeException // XRename, void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::rename" ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); Reference<XRename> xRename(m_xTable,UNO_QUERY); @@ -409,7 +404,6 @@ void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) throw(SQLEx // XAlterTable, void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::alterColumnByName" ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); Reference<XAlterTable> xAlter(m_xTable,UNO_QUERY); @@ -425,7 +419,6 @@ void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, cons void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, IndexOutOfBoundsException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::alterColumnByIndex" ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); Reference<XAlterTable> xAlter(m_xTable,UNO_QUERY); @@ -441,7 +434,6 @@ void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Re Reference< XNameAccess> ODBTableDecorator::getIndexes() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::getIndexes" ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); return Reference< XIndexesSupplier>(m_xTable,UNO_QUERY)->getIndexes(); @@ -449,7 +441,6 @@ Reference< XNameAccess> ODBTableDecorator::getIndexes() throw (RuntimeException, Reference< XIndexAccess> ODBTableDecorator::getKeys() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::getKeys" ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); return Reference< XKeysSupplier>(m_xTable,UNO_QUERY)->getKeys(); @@ -457,7 +448,6 @@ Reference< XIndexAccess> ODBTableDecorator::getKeys() throw (RuntimeException, s Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::getColumns" ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -469,7 +459,6 @@ Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException, OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::getName" ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); Reference<XNamed> xName(m_xTable,UNO_QUERY); @@ -479,7 +468,6 @@ OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException, std::exce sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::getSomething" ); if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast<sal_Int64>(this); @@ -492,7 +480,6 @@ sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >& Sequence< sal_Int8 > ODBTableDecorator::getUnoTunnelImplementationId() { - SAL_INFO("dbaccess", "ODBTableDecorator::getUnoTunnelImplementationId" ); static ::cppu::OImplementationId * pId = 0; if (! pId) { @@ -508,7 +495,6 @@ Sequence< sal_Int8 > ODBTableDecorator::getUnoTunnelImplementationId() void ODBTableDecorator::fillPrivileges() const { - SAL_INFO("dbaccess", "ODBTableDecorator::fillPrivileges" ); // somebody is asking for the privileges and we do not know them, yet m_nPrivileges = 0; try @@ -539,7 +525,6 @@ void ODBTableDecorator::fillPrivileges() const Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::createDataDescriptor" ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -559,13 +544,11 @@ Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor( ) t Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODBTableDecorator::getPropertySetInfo( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::getPropertySetInfo" ); return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } void ODBTableDecorator::refreshColumns() { - SAL_INFO("dbaccess", "ODBTableDecorator::refreshColumns" ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -603,7 +586,6 @@ void ODBTableDecorator::refreshColumns() OColumn* ODBTableDecorator::createColumn(const OUString& _rName) const { - SAL_INFO("dbaccess", "ODBTableDecorator::createColumn" ); OColumn* pReturn = NULL; Reference<XNameAccess> xNames; @@ -627,13 +609,11 @@ OColumn* ODBTableDecorator::createColumn(const OUString& _rName) const void ODBTableDecorator::columnAppended( const Reference< XPropertySet >& /*_rxSourceDescriptor*/ ) { - SAL_INFO("dbaccess", "ODBTableDecorator::columnAppended" ); // not interested in } void ODBTableDecorator::columnDropped(const OUString& _sName) { - SAL_INFO("dbaccess", "ODBTableDecorator::columnDropped" ); Reference<XDrop> xDrop(m_xColumnDefinitions,UNO_QUERY); if ( xDrop.is() && m_xColumnDefinitions->hasByName(_sName) ) xDrop->dropByName(_sName); @@ -641,7 +621,6 @@ void ODBTableDecorator::columnDropped(const OUString& _sName) Reference< XPropertySet > ODBTableDecorator::createColumnDescriptor() { - SAL_INFO("dbaccess", "ODBTableDecorator::createColumnDescriptor" ); Reference<XDataDescriptorFactory> xNames; if(m_xTable.is()) xNames.set(m_xTable->getColumns(),UNO_QUERY); @@ -663,7 +642,6 @@ void SAL_CALL ODBTableDecorator::release() throw() void SAL_CALL ODBTableDecorator::setName( const OUString& /*aName*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTableDecorator::setName" ); throwFunctionNotSupportedException( "XNamed::setName", *this ); } diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index a1c41100503d..354ab1c7ab35 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -38,7 +38,6 @@ using namespace ::osl; void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { - SAL_INFO("dbaccess", "WrappedResultSet::construct" ); OCacheSet::construct(_xDriverSet,i_sRowSetFilter); m_xUpd.set(_xDriverSet,UNO_QUERY_THROW); m_xRowLocate.set(_xDriverSet,UNO_QUERY_THROW); @@ -52,7 +51,6 @@ void WrappedResultSet::reset(const Reference< XResultSet>& _xDriverSet) Any SAL_CALL WrappedResultSet::getBookmark() throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "WrappedResultSet::getBookmark" ); if ( m_xRowLocate.is() ) { return m_xRowLocate->getBookmark( ); @@ -62,38 +60,32 @@ Any SAL_CALL WrappedResultSet::getBookmark() throw(SQLException, RuntimeExceptio bool SAL_CALL WrappedResultSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "WrappedResultSet::moveToBookmark" ); return m_xRowLocate->moveToBookmark( bookmark ); } bool SAL_CALL WrappedResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "WrappedResultSet::moveRelativeToBookmark" ); return m_xRowLocate->moveRelativeToBookmark( bookmark,rows ); } sal_Int32 SAL_CALL WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "WrappedResultSet::compareBookmarks" ); return m_xRowLocate->compareBookmarks( _first,_second ); } bool SAL_CALL WrappedResultSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "WrappedResultSet::hasOrderedBookmarks" ); return m_xRowLocate->hasOrderedBookmarks(); } sal_Int32 SAL_CALL WrappedResultSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "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) { - SAL_INFO("dbaccess", "WrappedResultSet::deleteRows" ); Reference< ::com::sun::star::sdbcx::XDeleteRows> xDeleteRow(m_xRowLocate,UNO_QUERY); if(xDeleteRow.is()) { @@ -104,8 +96,6 @@ Sequence< sal_Int32 > SAL_CALL WrappedResultSet::deleteRows( const Sequence< Any void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "WrappedResultSet::insertRow" ); - m_xUpd->moveToInsertRow(); sal_Int32 i = 1; connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end(); @@ -120,7 +110,6 @@ void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const c void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "WrappedResultSet::updateRow" ); sal_Int32 i = 1; connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->get().begin()+1; connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end(); @@ -134,37 +123,31 @@ void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const O void SAL_CALL WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "WrappedResultSet::deleteRow" ); m_xUpd->deleteRow(); } void SAL_CALL WrappedResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "WrappedResultSet::cancelRowUpdates" ); m_xUpd->cancelRowUpdates(); } void SAL_CALL WrappedResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "WrappedResultSet::moveToInsertRow" ); m_xUpd->moveToInsertRow(); } void SAL_CALL WrappedResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "WrappedResultSet::moveToCurrentRow" ); m_xUpd->moveToCurrentRow(); } void WrappedResultSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) { - SAL_INFO("dbaccess", "WrappedResultSet::fillValueRow" ); OCacheSet::fillValueRow(_rRow,_nPosition); } void WrappedResultSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParameter,const ORowSetValue& _rValue) { - SAL_INFO("dbaccess", "WrappedResultSet::updateColumn" ); if(_rValue.isBound() && _rValue.isModified()) { if(_rValue.isNull()) diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index d4d42b32db72..988726e0ccc9 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -35,7 +35,6 @@ using namespace ::osl; // com::sun::star::lang::XTypeProvider Sequence< Type > OCallableStatement::getTypes() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getTypes" ); OTypeCollection aTypes(::getCppuType( (const Reference< XRow > *)0 ), ::getCppuType( (const Reference< XOutParameters > *)0 ), OPreparedStatement::getTypes() ); @@ -51,7 +50,6 @@ Sequence< sal_Int8 > OCallableStatement::getImplementationId() throw (RuntimeExc // com::sun::star::uno::XInterface Any OCallableStatement::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) { - //SAL_INFO("dbaccess", "OCallableStatement::queryInterface" ); Any aIface = OPreparedStatement::queryInterface( rType ); if (!aIface.hasValue()) aIface = ::cppu::queryInterface( @@ -74,13 +72,11 @@ void OCallableStatement::release() throw () // XServiceInfo OUString OCallableStatement::getImplementationName( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getImplementationName" ); return OUString("com.sun.star.sdb.OCallableStatement"); } Sequence< OUString > OCallableStatement::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getSupportedServiceNames" ); Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = SERVICE_SDBC_CALLABLESTATEMENT; aSNS.getArray()[1] = SERVICE_SDB_CALLABLESTATEMENT; @@ -90,7 +86,6 @@ Sequence< OUString > OCallableStatement::getSupportedServiceNames( ) throw (Run // XOutParameters void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::registerOutParameter" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -100,7 +95,6 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::registerNumericOutParameter" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -110,7 +104,6 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet // XRow sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::wasNull" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -119,7 +112,6 @@ sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeExc OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getString" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -128,7 +120,6 @@ OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(S sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getBoolean" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -137,7 +128,6 @@ sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw( sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getByte" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -146,7 +136,6 @@ sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQL sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getShort" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getShort( columnIndex ); @@ -154,7 +143,6 @@ sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(S sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getInt" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getInt( columnIndex ); @@ -162,7 +150,6 @@ sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQL sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getLong" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getLong( columnIndex ); @@ -170,7 +157,6 @@ sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQ float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getFloat" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getFloat( columnIndex ); @@ -178,7 +164,6 @@ float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLEx double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getDouble" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getDouble( columnIndex ); @@ -186,7 +171,6 @@ double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQL Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getBytes" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBytes( columnIndex ); @@ -194,7 +178,6 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde ::com::sun::star::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getDate" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getDate( columnIndex ); @@ -202,7 +185,6 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde ::com::sun::star::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getTime" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getTime( columnIndex ); @@ -210,7 +192,6 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde ::com::sun::star::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getTimestamp" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -219,7 +200,6 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getBinaryStream" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -228,7 +208,6 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::get Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getCharacterStream" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -237,7 +216,6 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::get Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getObject" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -246,7 +224,6 @@ Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Referen Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getRef" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getRef( columnIndex ); @@ -254,7 +231,6 @@ Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 columnIndex ) t Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getBlob" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBlob( columnIndex ); @@ -262,7 +238,6 @@ Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 columnIndex ) Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getClob" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getClob( columnIndex ); @@ -270,7 +245,6 @@ Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 columnIndex ) Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OCallableStatement::getArray" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getArray( columnIndex ); diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index adb2c8f629bc..1fdb99b6c4c9 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -66,7 +66,6 @@ using namespace ::utl; OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection) : OSubComponent(m_aMutex,_xConnection) { - SAL_INFO("dbaccess", "OQueryComposer::OQueryComposer" ); OSL_ENSURE(_xConnection.is()," Connection can't be null!"); Reference<XMultiServiceFactory> xFac( _xConnection, UNO_QUERY_THROW ); @@ -80,7 +79,6 @@ OQueryComposer::~OQueryComposer() void SAL_CALL OQueryComposer::disposing() { - SAL_INFO("dbaccess", "OQueryComposer::disposing" ); ::comphelper::disposeComponent(m_xComposerHelper); ::comphelper::disposeComponent(m_xComposer); } @@ -88,7 +86,6 @@ void SAL_CALL OQueryComposer::disposing() // ::com::sun::star::lang::XTypeProvider Sequence< Type > SAL_CALL OQueryComposer::getTypes() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::getTypes" ); return ::comphelper::concatSequences(OSubComponent::getTypes(),OQueryComposer_BASE::getTypes()); } @@ -99,7 +96,6 @@ Sequence< sal_Int8 > SAL_CALL OQueryComposer::getImplementationId() throw (Runti Any SAL_CALL OQueryComposer::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { - //SAL_INFO("dbaccess", "OQueryComposer::queryInterface" ); Any aRet = OSubComponent::queryInterface(rType); if(!aRet.hasValue()) aRet = OQueryComposer_BASE::queryInterface(rType); @@ -109,7 +105,6 @@ Any SAL_CALL OQueryComposer::queryInterface( const Type & rType ) throw(RuntimeE // XServiceInfo OUString OQueryComposer::getImplementationName( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::getImplementationName" ); return OUString("com.sun.star.sdb.dbaccess.OQueryComposer"); } @@ -120,7 +115,6 @@ sal_Bool OQueryComposer::supportsService( const OUString& _rServiceName ) throw Sequence< OUString > OQueryComposer::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::getSupportedServiceNames" ); Sequence< OUString > aSNS( 1 ); aSNS[0] = SERVICE_SDB_SQLQUERYCOMPOSER; return aSNS; @@ -129,7 +123,6 @@ Sequence< OUString > OQueryComposer::getSupportedServiceNames( ) throw (Runtime // XSQLQueryComposer OUString SAL_CALL OQueryComposer::getQuery( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::getQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -142,7 +135,6 @@ OUString SAL_CALL OQueryComposer::getQuery( ) throw(RuntimeException, std::exce void SAL_CALL OQueryComposer::setQuery( const OUString& command ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::setQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -154,7 +146,6 @@ void SAL_CALL OQueryComposer::setQuery( const OUString& command ) throw(SQLExcep OUString SAL_CALL OQueryComposer::getComposedQuery( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::getComposedQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); @@ -164,7 +155,6 @@ OUString SAL_CALL OQueryComposer::getComposedQuery( ) throw(RuntimeException, s OUString SAL_CALL OQueryComposer::getFilter( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::getFilter" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); FilterCreator aFilterCreator; @@ -174,7 +164,6 @@ OUString SAL_CALL OQueryComposer::getFilter( ) throw(RuntimeException, std::exc Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilter( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::getStructuredFilter" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); @@ -183,7 +172,6 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilt OUString SAL_CALL OQueryComposer::getOrder( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::getOrder" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -194,7 +182,6 @@ OUString SAL_CALL OQueryComposer::getOrder( ) throw(RuntimeException, std::exce void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::appendFilterByColumn" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -211,7 +198,6 @@ void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySe void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::appendOrderByColumn" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -228,7 +214,6 @@ void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::setFilter" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -245,7 +230,6 @@ void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) throw(SQLExcep void SAL_CALL OQueryComposer::setOrder( const OUString& order ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::setOrder" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -264,7 +248,6 @@ void SAL_CALL OQueryComposer::setOrder( const OUString& order ) throw(SQLExcepti // XTablesSupplier Reference< XNameAccess > SAL_CALL OQueryComposer::getTables( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::getTables" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -274,7 +257,6 @@ Reference< XNameAccess > SAL_CALL OQueryComposer::getTables( ) throw(RuntimeExc // XColumnsSupplier Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::getColumns" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -283,7 +265,6 @@ Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns( ) throw(RuntimeEx Reference< XIndexAccess > SAL_CALL OQueryComposer::getParameters( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OQueryComposer::getParameters" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index ed356f915079..158c3ede8b85 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -60,8 +60,6 @@ OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star: ,m_nResultSetConcurrency(0) ,m_bIsBookmarkable(false) { - SAL_INFO("dbaccess", "OResultSet::OResultSet" ); - m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< OUString>(), NULL,NULL); try @@ -104,7 +102,6 @@ OResultSet::~OResultSet() // com::sun::star::lang::XTypeProvider Sequence< Type > OResultSet::getTypes() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OResultSet::getTypes" ); OTypeCollection aTypes(::getCppuType( (const Reference< XPropertySet > *)0 ), OResultSetBase::getTypes()); @@ -142,7 +139,6 @@ void OResultSet::release() throw () // OResultSetBase void OResultSet::disposing() { - SAL_INFO("dbaccess", "OResultSet::disposing" ); OPropertySetHelper::disposing(); MutexGuard aGuard(m_aMutex); @@ -163,7 +159,6 @@ void OResultSet::disposing() // XCloseable void OResultSet::close(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::close" ); { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -174,7 +169,6 @@ void OResultSet::close(void) throw( SQLException, RuntimeException, std::excepti // XServiceInfo OUString OResultSet::getImplementationName( ) throw(RuntimeException, std::exception) { - //SAL_INFO("dbaccess", "OResultSet::getImplementationName" ); return OUString("com.sun.star.sdb.OResultSet"); } @@ -185,7 +179,6 @@ sal_Bool OResultSet::supportsService( const OUString& _rServiceName ) throw (Run Sequence< OUString > OResultSet::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { - //SAL_INFO("dbaccess", "OResultSet::getSupportedServiceNames" ); Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBC_RESULTSET; aSNS[1] = SERVICE_SDB_RESULTSET; @@ -195,14 +188,12 @@ Sequence< OUString > OResultSet::getSupportedServiceNames( ) throw (RuntimeExce // com::sun::star::beans::XPropertySet Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeException, std::exception) { - //SAL_INFO("dbaccess", "OResultSet::getPropertySetInfo" ); return createPropertySetInfo( getInfoHelper() ) ; } // comphelper::OPropertyArrayUsageHelper ::cppu::IPropertyArrayHelper* OResultSet::createArrayHelper( ) const { - //SAL_INFO("dbaccess", "OResultSet::createArrayHelper" ); BEGIN_PROPERTY_HELPER(6) DECL_PROP1(CURSORNAME, OUString, READONLY); DECL_PROP0(FETCHDIRECTION, sal_Int32); @@ -216,13 +207,11 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc // cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& OResultSet::getInfoHelper() { - //SAL_INFO("dbaccess", "OResultSet::getInfoHelper" ); return *getArrayHelper(); } sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException ) { - //SAL_INFO("dbaccess", "OResultSet::convertFastPropertyValue" ); // be lazy ... rConvertedValue = rValue; getFastPropertyValue( rOldValue, nHandle ); @@ -231,7 +220,6 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldV void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) { - //SAL_INFO("dbaccess", "OResultSet::setFastPropertyValue_NoBroadcast" ); // set it for the driver result set Reference< XPropertySet > xSet(m_xDelegatorResultSet, UNO_QUERY); switch (nHandle) @@ -249,7 +237,6 @@ void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const { - //SAL_INFO("dbaccess", "OResultSet::getFastPropertyValue" ); switch (nHandle) { case PROPERTY_ID_ISBOOKMARKABLE: @@ -275,7 +262,6 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const // XWarningsSupplier Any OResultSet::getWarnings(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getWarnings" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); return m_aWarnings.getWarnings(); @@ -283,7 +269,6 @@ Any OResultSet::getWarnings(void) throw( SQLException, RuntimeException, std::ex void OResultSet::clearWarnings(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::clearWarnings" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); m_aWarnings.clearWarnings(); @@ -292,7 +277,6 @@ void OResultSet::clearWarnings(void) throw( SQLException, RuntimeException, std: // ::com::sun::star::sdbc::XResultSetMetaDataSupplier Reference< XResultSetMetaData > OResultSet::getMetaData(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getMetaData" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -302,7 +286,6 @@ Reference< XResultSetMetaData > OResultSet::getMetaData(void) throw( SQLExceptio // ::com::sun::star::sdbc::XColumnLocate sal_Int32 OResultSet::findColumn(const OUString& columnName) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::findColumn" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -337,7 +320,6 @@ namespace // ::com::sun::star::sdbcx::XColumnsSupplier Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(void) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getColumns" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -408,7 +390,6 @@ Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(voi // ::com::sun::star::sdbc::XRow sal_Bool OResultSet::wasNull(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::wasNull" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -417,7 +398,6 @@ sal_Bool OResultSet::wasNull(void) throw( SQLException, RuntimeException, std::e OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - //SAL_INFO("dbaccess", "OResultSet::getString" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -426,7 +406,6 @@ OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, Runti sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - //SAL_INFO("dbaccess", "OResultSet::getBoolean" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -435,7 +414,6 @@ sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) throw( SQLException, Runt sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getByte" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -444,7 +422,6 @@ sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) throw( SQLException, Runtime sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getShort" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -453,7 +430,6 @@ sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) throw( SQLException, Runti sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getInt" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -462,7 +438,6 @@ sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) throw( SQLException, Runtime sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getLong" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -471,7 +446,6 @@ sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) throw( SQLException, Runtim float OResultSet::getFloat(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getFloat" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -480,7 +454,6 @@ float OResultSet::getFloat(sal_Int32 columnIndex) throw( SQLException, RuntimeEx double OResultSet::getDouble(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getDouble" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -489,7 +462,6 @@ double OResultSet::getDouble(sal_Int32 columnIndex) throw( SQLException, Runtime Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getBytes" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -498,7 +470,6 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep ::com::sun::star::util::Date OResultSet::getDate(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getDate" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -507,7 +478,6 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep ::com::sun::star::util::Time OResultSet::getTime(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getTime" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -516,7 +486,6 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep ::com::sun::star::util::DateTime OResultSet::getTimestamp(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getTimestamp" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -525,7 +494,6 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep Reference< ::com::sun::star::io::XInputStream > OResultSet::getBinaryStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getBinaryStream" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -534,7 +502,6 @@ Reference< ::com::sun::star::io::XInputStream > OResultSet::getBinaryStream(sal Reference< ::com::sun::star::io::XInputStream > OResultSet::getCharacterStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getCharacterStream" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -543,7 +510,6 @@ Reference< ::com::sun::star::io::XInputStream > OResultSet::getCharacterStream( Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess > & typeMap) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getObject" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -552,7 +518,6 @@ Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< ::com::sun::st Reference< XRef > OResultSet::getRef(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getRef" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -561,7 +526,6 @@ Reference< XRef > OResultSet::getRef(sal_Int32 columnIndex) throw( SQLException Reference< XBlob > OResultSet::getBlob(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getBlob" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -570,7 +534,6 @@ Reference< XBlob > OResultSet::getBlob(sal_Int32 columnIndex) throw( SQLExcepti Reference< XClob > OResultSet::getClob(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getClob" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -579,7 +542,6 @@ Reference< XClob > OResultSet::getClob(sal_Int32 columnIndex) throw( SQLExcepti Reference< XArray > OResultSet::getArray(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getArray" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -589,7 +551,6 @@ Reference< XArray > OResultSet::getArray(sal_Int32 columnIndex) throw( SQLExcep // ::com::sun::star::sdbc::XRowUpdate void OResultSet::updateNull(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateNull" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -600,7 +561,6 @@ void OResultSet::updateNull(sal_Int32 columnIndex) throw( SQLException, RuntimeE void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateBoolean" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -611,7 +571,6 @@ void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( SQLExce void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateByte" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -622,8 +581,7 @@ void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLExcepti void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateShort" ); - MutexGuard aGuard(m_aMutex); + MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); checkReadOnly(); @@ -633,7 +591,6 @@ void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLExcep void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateInt" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -644,7 +601,6 @@ void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLExcepti void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateLong" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -655,7 +611,6 @@ void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLExcept void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateFloat" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -666,7 +621,6 @@ void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateDouble" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -677,7 +631,6 @@ void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLExcepti void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateString" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -688,7 +641,6 @@ void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) throw( S void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateBytes" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -699,7 +651,6 @@ void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& void OResultSet::updateDate(sal_Int32 columnIndex, const ::com::sun::star::util::Date& x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateDate" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -710,7 +661,6 @@ void OResultSet::updateDate(sal_Int32 columnIndex, const ::com::sun::star::util: void OResultSet::updateTime(sal_Int32 columnIndex, const ::com::sun::star::util::Time& x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateTime" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -721,7 +671,6 @@ void OResultSet::updateTime(sal_Int32 columnIndex, const ::com::sun::star::util: void OResultSet::updateTimestamp(sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateTimestamp" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -732,7 +681,6 @@ void OResultSet::updateTimestamp(sal_Int32 columnIndex, const ::com::sun::star:: void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateBinaryStream" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -743,7 +691,6 @@ void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< ::co void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateCharacterStream" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -754,7 +701,6 @@ void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< : void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateNumericObject" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -765,7 +711,6 @@ void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_In void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateObject" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -777,7 +722,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, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::next" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -786,7 +730,6 @@ sal_Bool OResultSet::next(void) throw( SQLException, RuntimeException, std::exce sal_Bool OResultSet::isBeforeFirst(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::isBeforeFirst" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -795,7 +738,6 @@ sal_Bool OResultSet::isBeforeFirst(void) throw( SQLException, RuntimeException, sal_Bool OResultSet::isAfterLast(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::isAfterLast" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -804,7 +746,6 @@ sal_Bool OResultSet::isAfterLast(void) throw( SQLException, RuntimeException, st sal_Bool OResultSet::isFirst(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::isFirst" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -813,7 +754,6 @@ sal_Bool OResultSet::isFirst(void) throw( SQLException, RuntimeException, std::e sal_Bool OResultSet::isLast(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::isLast" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -822,7 +762,6 @@ sal_Bool OResultSet::isLast(void) throw( SQLException, RuntimeException, std::ex void OResultSet::beforeFirst(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::beforeFirst" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -831,7 +770,6 @@ void OResultSet::beforeFirst(void) throw( SQLException, RuntimeException, std::e void OResultSet::afterLast(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::afterLast" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -840,7 +778,6 @@ void OResultSet::afterLast(void) throw( SQLException, RuntimeException, std::exc sal_Bool OResultSet::first(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::first" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -849,7 +786,6 @@ sal_Bool OResultSet::first(void) throw( SQLException, RuntimeException, std::exc sal_Bool OResultSet::last(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::last" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -858,7 +794,6 @@ sal_Bool OResultSet::last(void) throw( SQLException, RuntimeException, std::exce sal_Int32 OResultSet::getRow(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getRow" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -867,7 +802,6 @@ sal_Int32 OResultSet::getRow(void) throw( SQLException, RuntimeException, std::e sal_Bool OResultSet::absolute(sal_Int32 row) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::absolute" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -876,7 +810,6 @@ sal_Bool OResultSet::absolute(sal_Int32 row) throw( SQLException, RuntimeExcepti sal_Bool OResultSet::relative(sal_Int32 rows) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::relative" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -885,7 +818,6 @@ sal_Bool OResultSet::relative(sal_Int32 rows) throw( SQLException, RuntimeExcept sal_Bool OResultSet::previous(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::previous" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -894,7 +826,6 @@ sal_Bool OResultSet::previous(void) throw( SQLException, RuntimeException, std:: void OResultSet::refreshRow(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::refreshRow" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -903,7 +834,6 @@ void OResultSet::refreshRow(void) throw( SQLException, RuntimeException, std::ex sal_Bool OResultSet::rowUpdated(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::rowUpdated" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -912,7 +842,6 @@ sal_Bool OResultSet::rowUpdated(void) throw( SQLException, RuntimeException, std sal_Bool OResultSet::rowInserted(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::rowInserted" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -921,7 +850,6 @@ sal_Bool OResultSet::rowInserted(void) throw( SQLException, RuntimeException, st sal_Bool OResultSet::rowDeleted(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::rowDeleted" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -930,7 +858,6 @@ sal_Bool OResultSet::rowDeleted(void) throw( SQLException, RuntimeException, std Reference< XInterface > OResultSet::getStatement(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getStatement" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -940,7 +867,6 @@ Reference< XInterface > OResultSet::getStatement(void) throw( SQLException, Runt // ::com::sun::star::sdbcx::XRowLocate Any OResultSet::getBookmark(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::getBookmark" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -951,7 +877,6 @@ Any OResultSet::getBookmark(void) throw( SQLException, RuntimeException, std::ex sal_Bool OResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::moveToBookmark" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -962,7 +887,6 @@ sal_Bool OResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, Ru sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::moveRelativeToBookmark" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -973,7 +897,6 @@ sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::compareBookmarks" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -984,7 +907,6 @@ sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) th sal_Bool OResultSet::hasOrderedBookmarks(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::hasOrderedBookmarks" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -995,7 +917,6 @@ sal_Bool OResultSet::hasOrderedBookmarks(void) throw( SQLException, RuntimeExcep sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::hashBookmark" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -1007,7 +928,6 @@ sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, Run // ::com::sun::star::sdbc::XResultSetUpdate void OResultSet::insertRow(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::insertRow" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -1018,7 +938,6 @@ void OResultSet::insertRow(void) throw( SQLException, RuntimeException, std::exc void OResultSet::updateRow(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::updateRow" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -1029,7 +948,6 @@ void OResultSet::updateRow(void) throw( SQLException, RuntimeException, std::exc void OResultSet::deleteRow(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::deleteRow" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -1040,7 +958,6 @@ void OResultSet::deleteRow(void) throw( SQLException, RuntimeException, std::exc void OResultSet::cancelRowUpdates(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::cancelRowUpdates" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -1051,7 +968,6 @@ void OResultSet::cancelRowUpdates(void) throw( SQLException, RuntimeException, s void OResultSet::moveToInsertRow(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::moveToInsertRow" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -1062,7 +978,6 @@ void OResultSet::moveToInsertRow(void) throw( SQLException, RuntimeException, st void OResultSet::moveToCurrentRow(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OResultSet::moveToCurrentRow" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -1073,7 +988,6 @@ void OResultSet::moveToCurrentRow(void) throw( SQLException, RuntimeException, s void OResultSet::checkReadOnly() const { - //SAL_INFO("dbaccess", "OResultSet::checkReadOnly" ); if ( ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY ) || !m_xDelegatorResultSetUpdate.is() ) @@ -1082,7 +996,6 @@ void OResultSet::checkReadOnly() const void OResultSet::checkBookmarkable() const { - //SAL_INFO("dbaccess", "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 afb9bc3fa2d1..07a48c198fb8 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -50,7 +50,6 @@ OStatementBase::OStatementBase(const Reference< XConnection > & _xConn, ,m_bEscapeProcessing( true ) { - SAL_INFO("dbaccess", "OStatementBase::OStatementBase" ); OSL_ENSURE(_xStatement.is() ,"Statement is NULL!"); m_xAggregateAsSet.set(_xStatement,UNO_QUERY); m_xAggregateAsCancellable = Reference< ::com::sun::star::util::XCancellable > (m_xAggregateAsSet, UNO_QUERY); @@ -63,7 +62,6 @@ OStatementBase::~OStatementBase() // com::sun::star::lang::XTypeProvider Sequence< Type > OStatementBase::getTypes() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OStatementBase::getTypes" ); OTypeCollection aTypes(::getCppuType( (const Reference< XPropertySet > *)0 ), ::getCppuType( (const Reference< XWarningsSupplier > *)0 ), ::getCppuType( (const Reference< XCloseable > *)0 ), @@ -121,7 +119,6 @@ void OStatementBase::release() throw () void OStatementBase::disposeResultSet() { - SAL_INFO("dbaccess", "OStatementBase::disposeResultSet" ); // free the cursor if alive Reference< XComponent > xComp(m_aResultSet.get(), UNO_QUERY); if (xComp.is()) @@ -132,7 +129,6 @@ void OStatementBase::disposeResultSet() // OComponentHelper void OStatementBase::disposing() { - SAL_INFO("dbaccess", "OStatementBase::disposing" ); OPropertySetHelper::disposing(); MutexGuard aGuard(m_aMutex); @@ -165,7 +161,6 @@ void OStatementBase::disposing() // XCloseable void OStatementBase::close(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OStatementBase::close" ); { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -176,14 +171,12 @@ void OStatementBase::close(void) throw( SQLException, RuntimeException, std::exc // OPropertySetHelper Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OStatementBase::getPropertySetInfo" ); return createPropertySetInfo( getInfoHelper() ) ; } // comphelper::OPropertyArrayUsageHelper ::cppu::IPropertyArrayHelper* OStatementBase::createArrayHelper( ) const { - //SAL_INFO("dbaccess", "OStatementBase::createArrayHelper" ); BEGIN_PROPERTY_HELPER(10) DECL_PROP0(CURSORNAME, OUString); DECL_PROP0_BOOL(ESCAPE_PROCESSING); @@ -201,13 +194,11 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim // cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& OStatementBase::getInfoHelper() { - //SAL_INFO("dbaccess", "OStatementBase::getInfoHelper" ); return *getArrayHelper(); } sal_Bool OStatementBase::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException ) { - //SAL_INFO("dbaccess", "OStatementBase::convertFastPropertyValue" ); bool bModified(false); switch (nHandle) { @@ -242,7 +233,6 @@ sal_Bool OStatementBase::convertFastPropertyValue( Any & rConvertedValue, Any & void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) { - //SAL_INFO("dbaccess", "OStatementBase::setFastPropertyValue_NoBroadcast" ); switch ( nHandle ) { case PROPERTY_ID_USEBOOKMARKS: @@ -272,7 +262,6 @@ void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const { - //SAL_INFO("dbaccess", "OStatementBase::getFastPropertyValue" ); switch (nHandle) { case PROPERTY_ID_USEBOOKMARKS: @@ -299,7 +288,6 @@ void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons // XWarningsSupplier Any OStatementBase::getWarnings(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OStatementBase::getWarnings" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -308,7 +296,6 @@ Any OStatementBase::getWarnings(void) throw( SQLException, RuntimeException, std void OStatementBase::clearWarnings(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OStatementBase::clearWarnings" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -318,7 +305,6 @@ void OStatementBase::clearWarnings(void) throw( SQLException, RuntimeException, // ::com::sun::star::util::XCancellable void OStatementBase::cancel(void) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OStatementBase::cancel" ); // no blocking as cancel is typically called from a different thread ClearableMutexGuard aCancelGuard(m_aCancelMutex); if (m_xAggregateAsCancellable.is()) @@ -329,7 +315,6 @@ void OStatementBase::cancel(void) throw( RuntimeException, std::exception ) // XMultipleResults Reference< XResultSet > SAL_CALL OStatementBase::getResultSet( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OStatementBase::getResultSet" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -343,7 +328,6 @@ Reference< XResultSet > SAL_CALL OStatementBase::getResultSet( ) throw(SQLExcep sal_Int32 SAL_CALL OStatementBase::getUpdateCount( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OStatementBase::getUpdateCount" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -357,7 +341,6 @@ sal_Int32 SAL_CALL OStatementBase::getUpdateCount( ) throw(SQLException, Runtim sal_Bool SAL_CALL OStatementBase::getMoreResults( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OStatementBase::getMoreResults" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -375,7 +358,6 @@ sal_Bool SAL_CALL OStatementBase::getMoreResults( ) throw(SQLException, Runtime // XPreparedBatchExecution void SAL_CALL OStatementBase::addBatch( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OStatementBase::addBatch" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -389,7 +371,6 @@ void SAL_CALL OStatementBase::addBatch( ) throw(SQLException, RuntimeException, void SAL_CALL OStatementBase::clearBatch( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OStatementBase::clearBatch" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -403,7 +384,6 @@ void SAL_CALL OStatementBase::clearBatch( ) throw(SQLException, RuntimeExceptio Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OStatementBase::executeBatch" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -420,7 +400,6 @@ Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch( ) throw(SQLExcepti Reference< XResultSet > SAL_CALL OStatementBase::getGeneratedValues( ) throw (SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OStatementBase::getGeneratedValues" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); Reference< XGeneratedResultSet > xGRes(m_xAggregateAsSet, UNO_QUERY); @@ -437,7 +416,6 @@ OStatement::OStatement( const Reference< XConnection >& _xConn, const Reference< :OStatementBase( _xConn, _xStatement ) ,m_bAttemptedComposerCreation( false ) { - SAL_INFO("dbaccess", "OStatement::OStatement" ); m_xAggregateStatement.set( _xStatement, UNO_QUERY_THROW ); } @@ -447,7 +425,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OStatementBase, OStatement_IFACE ) // XServiceInfo OUString OStatement::getImplementationName( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OStatement::getImplementationName" ); return OUString("com.sun.star.sdb.OStatement"); } @@ -458,7 +435,6 @@ sal_Bool OStatement::supportsService( const OUString& _rServiceName ) throw (Run Sequence< OUString > OStatement::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OStatement::getSupportedServiceNames" ); Sequence< OUString > aSNS( 1 ); aSNS.getArray()[0] = SERVICE_SDBC_STATEMENT; return aSNS; @@ -467,7 +443,6 @@ Sequence< OUString > OStatement::getSupportedServiceNames( ) throw (RuntimeExce // XStatement Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OStatement::executeQuery" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -494,7 +469,6 @@ Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) throw( sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OStatement::executeUpdate" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -506,7 +480,6 @@ sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) throw( SQLException sal_Bool OStatement::execute( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OStatement::execute" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -518,7 +491,6 @@ sal_Bool OStatement::execute( const OUString& _rSQL ) throw( SQLException, Runti void OStatement::addBatch( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OStatement::execute" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -533,7 +505,6 @@ void OStatement::addBatch( const OUString& _rSQL ) throw( SQLException, RuntimeE void OStatement::clearBatch( ) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OStatement::execute" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); // first check the meta data @@ -546,7 +517,6 @@ void OStatement::clearBatch( ) throw( SQLException, RuntimeException, std::excep Sequence< sal_Int32 > OStatement::executeBatch( ) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OStatement::execute" ); MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); // first check the meta data @@ -559,13 +529,11 @@ Sequence< sal_Int32 > OStatement::executeBatch( ) throw( SQLException, RuntimeEx Reference< XConnection > OStatement::getConnection(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OStatement::getConnection" ); return Reference< XConnection >( m_xParent, UNO_QUERY ); } void SAL_CALL OStatement::disposing() { - SAL_INFO("dbaccess", "OStatement::disposing" ); OStatementBase::disposing(); m_xComposer.clear(); m_xAggregateStatement.clear(); @@ -573,7 +541,6 @@ void SAL_CALL OStatement::disposing() OUString OStatement::impl_doEscapeProcessing_nothrow( const OUString& _rSQL ) const { - SAL_INFO("dbaccess", "OStatement::impl_doEscapeProcessing_nothrow" ); if ( !m_bEscapeProcessing ) return _rSQL; try @@ -602,7 +569,6 @@ OUString OStatement::impl_doEscapeProcessing_nothrow( const OUString& _rSQL ) co bool OStatement::impl_ensureComposer_nothrow() const { - SAL_INFO("dbaccess", "OStatement::impl_ensureComposer_nothrow" ); if ( m_bAttemptedComposerCreation ) return m_xComposer.is(); diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 9f1661033516..9fef736143d6 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -74,7 +74,6 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables ,m_xColumnDefinitions(_xColumnDefinitions) ,m_nPrivileges(0) { - SAL_INFO("dbaccess", "ODBTable::ODBTable" ); OSL_ENSURE(getMetaData().is(), "ODBTable::ODBTable : invalid conn !"); OSL_ENSURE(!_rName.isEmpty(), "ODBTable::ODBTable : name !"); // TODO : think about collecting the privileges here, as we can't ensure that in getFastPropertyValue, where @@ -89,7 +88,6 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables :OTable_Base(_pTables,_rxConn, _rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers()) ,m_nPrivileges(-1) { - SAL_INFO("dbaccess", "ODBTable::ODBTable" ); } ODBTable::~ODBTable() @@ -100,7 +98,6 @@ IMPLEMENT_FORWARD_REFCOUNT(ODBTable,OTable_Base) OColumn* ODBTable::createColumn(const OUString& _rName) const { - SAL_INFO("dbaccess", "ODBTable::createColumn" ); OColumn* pReturn = NULL; Reference<XPropertySet> xProp; @@ -124,13 +121,11 @@ OColumn* ODBTable::createColumn(const OUString& _rName) const void ODBTable::columnAppended( const Reference< XPropertySet >& /*_rxSourceDescriptor*/ ) { - SAL_INFO("dbaccess", "ODBTable::columnAppended" ); // not interested in } void ODBTable::columnDropped(const OUString& _sName) { - SAL_INFO("dbaccess", "ODBTable::columnDropped" ); Reference<XDrop> xDrop(m_xColumnDefinitions,UNO_QUERY); if ( xDrop.is() && m_xColumnDefinitions->hasByName(_sName) ) { @@ -146,7 +141,6 @@ Sequence< sal_Int8 > ODBTable::getImplementationId() throw (RuntimeException, st // OComponentHelper void SAL_CALL ODBTable::disposing() { - SAL_INFO("dbaccess", "ODBTable::disposing" ); OPropertySetHelper::disposing(); OTable_Base::disposing(); m_xColumnDefinitions = NULL; @@ -156,7 +150,6 @@ void SAL_CALL ODBTable::disposing() void ODBTable::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const { - SAL_INFO("dbaccess", "ODBTable::getFastPropertyValue" ); if ((PROPERTY_ID_PRIVILEGES == _nHandle) && (-1 == m_nPrivileges)) { // somebody is asking for the privileges an we do not know them, yet const_cast<ODBTable*>(this)->m_nPrivileges = ::dbtools::getTablePrivileges(getMetaData(),m_CatalogName,m_SchemaName, m_Name); @@ -167,7 +160,6 @@ void ODBTable::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const void ODBTable::construct() { - SAL_INFO("dbaccess", "ODBTable::construct" ); ::osl::MutexGuard aGuard(m_aMutex); // we don't collect the privileges here, this is potentially expensive. Instead we determine them on request. @@ -228,7 +220,6 @@ void ODBTable::construct() ::cppu::IPropertyArrayHelper* ODBTable::createArrayHelper( sal_Int32 _nId) const { - SAL_INFO("dbaccess", "ODBTable::createArrayHelper" ); Sequence< Property > aProps; describeProperties(aProps); if(!_nId) @@ -261,7 +252,6 @@ IMPLEMENT_SERVICE_INFO1(ODBTable, "com.sun.star.sdb.dbaccess.ODBTable", SERVICE_ Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTable::getInfoHelper" ); if(rType == getCppuType( (Reference<XRename>*)0) && !getRenameService().is() ) return Any(); if(rType == getCppuType( (Reference<XAlterTable>*)0) && !getAlterService().is() ) @@ -271,7 +261,6 @@ Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeExcepti Sequence< Type > SAL_CALL ODBTable::getTypes( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTable::getTypes" ); Type aRenameType = getCppuType( (Reference<XRename>*)0); Type aAlterType = getCppuType( (Reference<XAlterTable>*)0); @@ -294,7 +283,6 @@ Sequence< Type > SAL_CALL ODBTable::getTypes( ) throw(RuntimeException, std::ex // XRename, void SAL_CALL ODBTable::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTable::rename" ); ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed); if ( !getRenameService().is() ) @@ -308,7 +296,6 @@ void SAL_CALL ODBTable::rename( const OUString& _rNewName ) throw(SQLException, // XAlterTable, void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTable::alterColumnByName" ); ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed); if ( !getAlterService().is() ) @@ -324,7 +311,6 @@ void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Referen sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODBTable::getSomething" ); sal_Int64 nRet(0); if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) nRet = reinterpret_cast<sal_Int64>(this); @@ -336,7 +322,6 @@ sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) thr Sequence< sal_Int8 > ODBTable::getUnoTunnelImplementationId() { - SAL_INFO("dbaccess", "ODBTable::getUnoTunnelImplementationId" ); static ::cppu::OImplementationId * pId = 0; if (! pId) { @@ -352,13 +337,11 @@ Sequence< sal_Int8 > ODBTable::getUnoTunnelImplementationId() Reference< XPropertySet > ODBTable::createColumnDescriptor() { - SAL_INFO("dbaccess", "ODBTable::createColumnDescriptor" ); return new OTableColumnDescriptor( true ); } sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames) { - SAL_INFO("dbaccess", "ODBTable::createColumns" ); Reference<XDatabaseMetaData> xMeta = getMetaData(); OColumns* pCol = new OColumns(*this, m_aMutex, NULL, isCaseSensitive(), _rNames, this,this, getAlterService().is() || (xMeta.is() && xMeta->supportsAlterTableWithAddColumn()), @@ -372,13 +355,11 @@ sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames) sdbcx::OCollection* ODBTable::createKeys(const TStringVector& _rNames) { - SAL_INFO("dbaccess", "ODBTable::createKeys" ); return new connectivity::OKeysHelper(this,m_aMutex,_rNames); } sdbcx::OCollection* ODBTable::createIndexes(const TStringVector& _rNames) { - SAL_INFO("dbaccess", "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 438902d41c1b..8af70e9c46c1 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -112,12 +112,10 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent, OTableContainer::~OTableContainer() { - SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::OTableContainer" ); } void OTableContainer::removeMasterContainerListener() { - SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::removeMasterContainerListener" ); try { Reference<XContainer> xCont( m_xMasterContainer, UNO_QUERY_THROW ); @@ -165,7 +163,6 @@ void lcl_createDefintionObject(const OUString& _rName connectivity::sdbcx::ObjectType OTableContainer::createObject(const OUString& _rName) { - SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::createObject" ); Reference<XColumnsSupplier > xSup; if(m_xMasterContainer.is() && m_xMasterContainer->hasByName(_rName)) xSup.set(m_xMasterContainer->getByName(_rName),UNO_QUERY); @@ -237,7 +234,6 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const OUString& _r Reference< XPropertySet > OTableContainer::createDescriptor() { - SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::createDescriptor" ); Reference< XPropertySet > xRet; // first we have to look if the master tables support this @@ -263,7 +259,6 @@ Reference< XPropertySet > OTableContainer::createDescriptor() // XAppend ObjectType OTableContainer::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::appendObject" ); // append the new table with a create stmt OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME)); if(m_xMasterContainer.is() && m_xMasterContainer->hasByName(aName)) @@ -350,7 +345,6 @@ ObjectType OTableContainer::appendObject( const OUString& _rForName, const Refer // XDrop void OTableContainer::dropObject(sal_Int32 _nPos, const OUString& _sElementName) { - SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::dropObject" ); m_bInDrop = true; try { @@ -414,7 +408,6 @@ void OTableContainer::dropObject(sal_Int32 _nPos, const OUString& _sElementName) void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::elementInserted" ); ::osl::MutexGuard aGuard(m_rMutex); OUString sName; Event.Accessor >>= sName; @@ -433,12 +426,10 @@ void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) th void SAL_CALL OTableContainer::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::elementRemoved" ); } void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::elementReplaced" ); // create a new config entry { OUString sOldComposedName,sNewComposedName; @@ -451,7 +442,6 @@ void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) th void SAL_CALL OTableContainer::disposing() { - SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::disposing" ); OFilteredContainer::disposing(); // say goodbye to our listeners m_xTableDefinitions = NULL; @@ -460,7 +450,6 @@ void SAL_CALL OTableContainer::disposing() void SAL_CALL OTableContainer::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) { - SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::disposing" ); } void OTableContainer::addMasterContainerListener() diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 0802c16344e0..811db40ea8c4 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -78,7 +78,6 @@ namespace dbaccess // XServiceInfo OUString OConnection::getImplementationName( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getImplementationName" ); return OUString("com.sun.star.comp.dbaccess.Connection"); } @@ -89,7 +88,6 @@ sal_Bool OConnection::supportsService( const OUString& _rServiceName ) throw (Ru Sequence< OUString > OConnection::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getSupportedServiceNames" ); Sequence< OUString > aSupported = OConnectionWrapper::getSupportedServiceNames(); if ( 0 == findValue( aSupported, SERVICE_SDB_CONNECTION, true ).getLength() ) @@ -105,14 +103,12 @@ Sequence< OUString > OConnection::getSupportedServiceNames( ) throw (RuntimeExc // XCloseable void OConnection::close(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::close" ); // being closed is the same as being disposed dispose(); } sal_Bool OConnection::isClosed(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::isClosed" ); MutexGuard aGuard(m_aMutex); return !m_xMasterConnection.is(); } @@ -120,7 +116,6 @@ sal_Bool OConnection::isClosed(void) throw( SQLException, RuntimeException, std: // XConnection Reference< XStatement > OConnection::createStatement(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::createStatement" ); MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -136,7 +131,6 @@ Reference< XStatement > OConnection::createStatement(void) throw( SQLException, Reference< XPreparedStatement > OConnection::prepareStatement(const OUString& sql) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::prepareStatement" ); MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -153,7 +147,6 @@ Reference< XPreparedStatement > OConnection::prepareStatement(const OUString& s Reference< XPreparedStatement > OConnection::prepareCall(const OUString& sql) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::prepareCall" ); MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -169,7 +162,6 @@ Reference< XPreparedStatement > OConnection::prepareCall(const OUString& sql) t OUString OConnection::nativeSQL(const OUString& sql) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::nativeSQL" ); MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->nativeSQL(sql); @@ -177,7 +169,6 @@ OUString OConnection::nativeSQL(const OUString& sql) throw( SQLException, Runtim void OConnection::setAutoCommit(sal_Bool autoCommit) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::setAutoCommit" ); MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->setAutoCommit(autoCommit); @@ -185,7 +176,6 @@ void OConnection::setAutoCommit(sal_Bool autoCommit) throw( SQLException, Runtim sal_Bool OConnection::getAutoCommit(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::getAutoCommit" ); MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getAutoCommit(); @@ -193,7 +183,6 @@ sal_Bool OConnection::getAutoCommit(void) throw( SQLException, RuntimeException, void OConnection::commit(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::commit" ); MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->commit(); @@ -201,7 +190,6 @@ void OConnection::commit(void) throw( SQLException, RuntimeException, std::excep void OConnection::rollback(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::rollback" ); MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->rollback(); @@ -209,7 +197,6 @@ void OConnection::rollback(void) throw( SQLException, RuntimeException, std::exc Reference< XDatabaseMetaData > OConnection::getMetaData(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::getMetaData" ); MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getMetaData(); @@ -217,7 +204,6 @@ Reference< XDatabaseMetaData > OConnection::getMetaData(void) throw( SQLExcepti void OConnection::setReadOnly(sal_Bool readOnly) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::setReadOnly" ); MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->setReadOnly(readOnly); @@ -225,7 +211,6 @@ void OConnection::setReadOnly(sal_Bool readOnly) throw( SQLException, RuntimeExc sal_Bool OConnection::isReadOnly(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::isReadOnly" ); MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->isReadOnly(); @@ -233,7 +218,6 @@ sal_Bool OConnection::isReadOnly(void) throw( SQLException, RuntimeException, st void OConnection::setCatalog(const OUString& catalog) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::setCatalog" ); MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->setCatalog(catalog); @@ -241,7 +225,6 @@ void OConnection::setCatalog(const OUString& catalog) throw( SQLException, Runti OUString OConnection::getCatalog(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::getCatalog" ); MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getCatalog(); @@ -249,7 +232,6 @@ OUString OConnection::getCatalog(void) throw( SQLException, RuntimeException, st void OConnection::setTransactionIsolation(sal_Int32 level) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::setTransactionIsolation" ); MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->setTransactionIsolation(level); @@ -257,7 +239,6 @@ void OConnection::setTransactionIsolation(sal_Int32 level) throw( SQLException, sal_Int32 OConnection::getTransactionIsolation(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::getTransactionIsolation" ); MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getTransactionIsolation(); @@ -265,7 +246,6 @@ sal_Int32 OConnection::getTransactionIsolation(void) throw( SQLException, Runtim Reference< XNameAccess > OConnection::getTypeMap(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::getTypeMap" ); MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getTypeMap(); @@ -273,7 +253,6 @@ Reference< XNameAccess > OConnection::getTypeMap(void) throw( SQLException, Run void OConnection::setTypeMap(const Reference< XNameAccess > & typeMap) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::setTypeMap" ); MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->setTypeMap(typeMap); @@ -300,7 +279,6 @@ OConnection::OConnection(ODatabaseSource& _rDB ,m_bSupportsUsers(false) ,m_bSupportsGroups(false) { - SAL_INFO("dbaccess", "OConnection::OConnection" ); osl_atomic_increment(&m_refCount); try @@ -388,7 +366,6 @@ OConnection::~OConnection() // XWarningsSupplier Any SAL_CALL OConnection::getWarnings() throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getWarnings" ); MutexGuard aGuard(m_aMutex); checkDisposed(); return m_aWarnings.getWarnings(); @@ -396,7 +373,6 @@ Any SAL_CALL OConnection::getWarnings() throw(SQLException, RuntimeException, st void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::clearWarnings" ); MutexGuard aGuard(m_aMutex); checkDisposed(); m_aWarnings.clearWarnings(); @@ -423,7 +399,6 @@ namespace // com::sun::star::lang::XTypeProvider Sequence< Type > OConnection::getTypes() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getTypes" ); TypeBag aNormalizedTypes; lcl_copyTypes( aNormalizedTypes, OSubComponent::getTypes() ); @@ -481,7 +456,6 @@ void OConnection::release() throw () // OSubComponent void OConnection::disposing() { - SAL_INFO("dbaccess", "OConnection::disposing" ); MutexGuard aGuard(m_aMutex); OSubComponent::disposing(); @@ -526,7 +500,6 @@ void OConnection::disposing() // XChild Reference< XInterface > OConnection::getParent(void) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::getParent" ); MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xParent; @@ -534,14 +507,12 @@ Reference< XInterface > OConnection::getParent(void) throw( RuntimeException, s void OConnection::setParent(const Reference< XInterface > & /*Parent*/) throw( NoSupportException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::setParent" ); throw NoSupportException(); } // XSQLQueryComposerFactory Reference< XSQLQueryComposer > OConnection::createQueryComposer(void) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::createQueryComposer" ); MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -563,7 +534,6 @@ void OConnection::impl_fillTableFilter() void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed) { - SAL_INFO("dbaccess", "OConnection::refresh" ); if ( _rToBeRefreshed == Reference< XNameAccess >(m_pTables) ) { if (m_pTables && !m_pTables->isInitialized()) @@ -601,7 +571,6 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed) // XTablesSupplier Reference< XNameAccess > OConnection::getTables() throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::getTables" ); MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -612,7 +581,6 @@ Reference< XNameAccess > OConnection::getTables() throw( RuntimeException, std: Reference< XNameAccess > SAL_CALL OConnection::getViews( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getViews" ); MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -624,7 +592,6 @@ Reference< XNameAccess > SAL_CALL OConnection::getViews( ) throw(RuntimeExcepti // XQueriesSupplier Reference< XNameAccess > OConnection::getQueries(void) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "OConnection::getQueries" ); MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -634,7 +601,6 @@ Reference< XNameAccess > OConnection::getQueries(void) throw( RuntimeException, // ::com::sun::star::sdb::XCommandPreparation Reference< XPreparedStatement > SAL_CALL OConnection::prepareCommand( const OUString& command, sal_Int32 commandType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::prepareCommand" ); MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -666,7 +632,6 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCommand( const OUS Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _sServiceSpecifier ) throw (Exception, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::createInstance" ); Reference< XServiceInfo > xRet; if ( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER == _sServiceSpecifier || _sServiceSpecifier == "com.sun.star.sdb.SingleSelectQueryAnalyzer" ) { @@ -697,13 +662,11 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _s Reference< XInterface > SAL_CALL OConnection::createInstanceWithArguments( const OUString& _sServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) throw (Exception, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::createInstanceWithArguments" ); return createInstance(_sServiceSpecifier); } Sequence< OUString > SAL_CALL OConnection::getAvailableServiceNames( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getAvailableServiceNames" ); Sequence< OUString > aRet(1); aRet[0] = SERVICE_NAME_SINGLESELECTQUERYCOMPOSER; return aRet; @@ -711,7 +674,6 @@ Sequence< OUString > SAL_CALL OConnection::getAvailableServiceNames( ) throw (R Reference< XTablesSupplier > OConnection::getMasterTables() { - SAL_INFO("dbaccess", "OConnection::getMasterTables" ); // check if out "master connection" can supply tables if(!m_xMasterTables.is()) { @@ -731,7 +693,6 @@ Reference< XTablesSupplier > OConnection::getMasterTables() // XUsersSupplier Reference< XNameAccess > SAL_CALL OConnection::getUsers( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getUsers" ); MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -742,7 +703,6 @@ Reference< XNameAccess > SAL_CALL OConnection::getUsers( ) throw(RuntimeExcepti // XGroupsSupplier Reference< XNameAccess > SAL_CALL OConnection::getGroups( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getGroups" ); MutexGuard aGuard(m_aMutex); checkDisposed(); Reference<XGroupsSupplier> xGrp(getMasterTables(),UNO_QUERY); @@ -751,14 +711,11 @@ Reference< XNameAccess > SAL_CALL OConnection::getGroups( ) throw(RuntimeExcept void OConnection::impl_loadConnectionTools_throw() { - SAL_INFO("dbaccess", "OConnection::impl_loadConnectionTools_throw" ); - m_xConnectionTools = css::sdb::tools::ConnectionTools::createWithConnection( m_aContext, this ); } Reference< XTableName > SAL_CALL OConnection::createTableName( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::createTableName" ); MutexGuard aGuard(m_aMutex); checkDisposed(); impl_loadConnectionTools_throw(); @@ -768,7 +725,6 @@ Reference< XTableName > SAL_CALL OConnection::createTableName( ) throw (Runtime Reference< XObjectNames > SAL_CALL OConnection::getObjectNames( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getObjectNames" ); MutexGuard aGuard(m_aMutex); checkDisposed(); impl_loadConnectionTools_throw(); @@ -778,7 +734,6 @@ Reference< XObjectNames > SAL_CALL OConnection::getObjectNames( ) throw (Runtim Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getDataSourceMetaData" ); MutexGuard aGuard(m_aMutex); checkDisposed(); impl_loadConnectionTools_throw(); @@ -788,7 +743,6 @@ Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData( ) Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getFieldsByCommandDescriptor" ); MutexGuard aGuard(m_aMutex); checkDisposed(); impl_loadConnectionTools_throw(); @@ -798,7 +752,6 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getF Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getComposer" ); MutexGuard aGuard(m_aMutex); checkDisposed(); impl_loadConnectionTools_throw(); @@ -808,7 +761,6 @@ Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal void OConnection::impl_checkTableQueryNames_nothrow() { - SAL_INFO("dbaccess", "OConnection::impl_checkTableQueryNames_nothrow" ); DatabaseMetaData aMeta( static_cast< XConnection* >( this ) ); if ( !aMeta.supportsSubqueriesInFrom() ) // nothing to do @@ -843,7 +795,6 @@ void OConnection::impl_checkTableQueryNames_nothrow() Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& _TableName, ::sal_Int32 _ColorMode ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getTableIcon" ); Reference< XGraphic > xReturn; // ask our aggregate @@ -860,7 +811,6 @@ Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& _Table Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "OConnection::getTableEditor" ); Reference< XInterface > xReturn; // ask our aggregate diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index a533fa6c68cc..85f070955393 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -510,7 +510,6 @@ ODatabaseSource::~ODatabaseSource() void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocument, const OUString& _rNewName, DBContextAccess ) { - SAL_INFO("dbaccess", "ODatabaseSource::setName" ); ODatabaseSource& rModelImpl = dynamic_cast< ODatabaseSource& >( *_rxDocument.get() ); ::osl::MutexGuard aGuard( rModelImpl.m_aMutex ); @@ -521,7 +520,6 @@ void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocume // com::sun::star::lang::XTypeProvider Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::getTypes" ); OTypeCollection aPropertyHelperTypes( ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 ), ::getCppuType( (const Reference< XMultiPropertySet > *)0 )); @@ -565,32 +563,27 @@ void SAL_CALL ODatabaseSource::disposing( const ::com::sun::star::lang::EventObj // XServiceInfo OUString ODatabaseSource::getImplementationName( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::getImplementationName" ); return getImplementationName_static(); } OUString ODatabaseSource::getImplementationName_static( ) throw(RuntimeException) { - SAL_INFO("dbaccess", "ODatabaseSource::getImplementationName_static" ); return OUString("com.sun.star.comp.dba.ODatabaseSource"); } Sequence< OUString > ODatabaseSource::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::getSupportedServiceNames" ); return getSupportedServiceNames_static(); } Reference< XInterface > ODatabaseSource::Create( const Reference< XComponentContext >& _rxContext ) { - SAL_INFO("dbaccess", "ODatabaseSource::Create" ); Reference< XDatabaseContext > xDBContext( DatabaseContext::create(_rxContext) ); return xDBContext->createInstance(); } Sequence< OUString > ODatabaseSource::getSupportedServiceNames_static( ) throw (RuntimeException) { - SAL_INFO("dbaccess", "ODatabaseSource::getSupportedServiceNames_static" ); Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDB_DATASOURCE; aSNS[1] = "com.sun.star.sdb.DocumentDataSource"; @@ -619,7 +612,6 @@ void ODatabaseSource::disposing() Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString& _rUid, const OUString& _rPwd) { - SAL_INFO("dbaccess", "ODatabaseSource::buildLowLevelConnection" ); Reference< XConnection > xReturn; Reference< XDriverManager > xManager; @@ -738,14 +730,12 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString // OPropertySetHelper Reference< XPropertySetInfo > ODatabaseSource::getPropertySetInfo() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::getPropertySetInfo" ); return createPropertySetInfo( getInfoHelper() ) ; } // comphelper::OPropertyArrayUsageHelper ::cppu::IPropertyArrayHelper* ODatabaseSource::createArrayHelper( ) const { - SAL_INFO("dbaccess", "ODatabaseSource::createArrayHelper" ); BEGIN_PROPERTY_HELPER(13) DECL_PROP1(INFO, Sequence< PropertyValue >, BOUND); DECL_PROP1_BOOL(ISPASSWORDREQUIRED, BOUND); @@ -914,7 +904,6 @@ namespace void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::setFastPropertyValue_NoBroadcast" ); if ( m_pImpl.is() ) { switch(nHandle) @@ -1046,14 +1035,12 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con // XDataSource void ODatabaseSource::setLoginTimeout(sal_Int32 seconds) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "ODatabaseSource::setLoginTimeout" ); ModelMethodGuard aGuard( *this ); m_pImpl->m_nLoginTimeout = seconds; } sal_Int32 ODatabaseSource::getLoginTimeout(void) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "ODatabaseSource::getLoginTimeout" ); ModelMethodGuard aGuard( *this ); return m_pImpl->m_nLoginTimeout; } @@ -1061,31 +1048,26 @@ sal_Int32 ODatabaseSource::getLoginTimeout(void) throw( SQLException, RuntimeExc // XCompletedConnection Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::connectWithCompletion" ); return connectWithCompletion(_rxHandler,false); } Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password) throw( SQLException, RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "ODatabaseSource::getConnection" ); return getConnection(user,password,false); } Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnection( const OUString& user, const OUString& password ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::getIsolatedConnection" ); return getConnection(user,password,true); } Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnectionWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::getIsolatedConnectionWithCompletion" ); return connectWithCompletion(_rxHandler,true); } Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler,bool _bIsolated ) throw(SQLException, RuntimeException) { - SAL_INFO("dbaccess", "ODatabaseSource::connectWithCompletion" ); ModelMethodGuard aGuard( *this ); if (!_rxHandler.is()) @@ -1172,7 +1154,6 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const OUString& user, const OUString& password) { - SAL_INFO("dbaccess", "ODatabaseSource::buildIsolatedConnection" ); Reference< XConnection > xConn; Reference< XConnection > xSdbcConn = buildLowLevelConnection(user, password); OSL_ENSURE( xSdbcConn.is(), "ODatabaseSource::buildIsolatedConnection: invalid return value of buildLowLevelConnection!" ); @@ -1187,7 +1168,6 @@ Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const OUString Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password,bool _bIsolated) throw( SQLException, RuntimeException ) { - SAL_INFO("dbaccess", "ODatabaseSource::getConnection" ); ModelMethodGuard aGuard( *this ); Reference< XConnection > xConn; @@ -1219,14 +1199,12 @@ Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, co Reference< XNameAccess > SAL_CALL ODatabaseSource::getBookmarks( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::getBookmarks" ); ModelMethodGuard aGuard( *this ); return static_cast< XNameContainer* >(&m_aBookmarks); } Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::getQueryDefinitions" ); ModelMethodGuard aGuard( *this ); Reference< XNameAccess > xContainer = m_pImpl->m_xCommandDefinitions; @@ -1258,7 +1236,6 @@ Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw( // XTablesSupplier Reference< XNameAccess > ODatabaseSource::getTables() throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess", "ODatabaseSource::getTables" ); ModelMethodGuard aGuard( *this ); Reference< XNameAccess > xContainer = m_pImpl->m_xTableDefinitions; @@ -1273,7 +1250,6 @@ Reference< XNameAccess > ODatabaseSource::getTables() throw( RuntimeException, void SAL_CALL ODatabaseSource::flush( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::flush" ); try { // SYNCHRONIZED -> @@ -1302,7 +1278,6 @@ void SAL_CALL ODatabaseSource::flush( ) throw (RuntimeException, std::exception void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::flushed" ); ModelMethodGuard aGuard( *this ); // Okay, this is some hack. @@ -1335,19 +1310,16 @@ void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (R void SAL_CALL ODatabaseSource::addFlushListener( const Reference< ::com::sun::star::util::XFlushListener >& _xListener ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::addFlushListener" ); m_aFlushListeners.addInterface(_xListener); } void SAL_CALL ODatabaseSource::removeFlushListener( const Reference< ::com::sun::star::util::XFlushListener >& _xListener ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::removeFlushListener" ); m_aFlushListeners.removeInterface(_xListener); } void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::elementInserted" ); ModelMethodGuard aGuard( *this ); if ( m_pImpl.is() ) m_pImpl->setModified(true); @@ -1355,7 +1327,6 @@ void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& /*Event*/ void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::elementRemoved" ); ModelMethodGuard aGuard( *this ); if ( m_pImpl.is() ) m_pImpl->setModified(true); @@ -1363,7 +1334,6 @@ void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& /*Event*/ ) void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::elementReplaced" ); ModelMethodGuard aGuard( *this ); if ( m_pImpl.is() ) m_pImpl->setModified(true); @@ -1372,7 +1342,6 @@ void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/ // XDocumentDataSource Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocument() throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess", "ODatabaseSource::getDatabaseDocument" ); ModelMethodGuard aGuard( *this ); Reference< XModel > xModel( m_pImpl->getModel_noCreate() ); @@ -1384,7 +1353,6 @@ Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocume Reference< XInterface > ODatabaseSource::getThis() const { - SAL_INFO("dbaccess", "ODatabaseSource::getThis" ); return *const_cast< ODatabaseSource* >( this ); } diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 39d946130d90..c16ecf7efcae 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -230,8 +230,6 @@ sal_Int32 ReadThroughComponent( OSL_ENSURE(xModelComponent.is(), "document missing"); OSL_ENSURE(rxContext.is(), "factory missing"); - SAL_INFO("dbaccess", "dbaxml ReadThroughComponent" ); - // prepare ParserInputSrouce InputSource aParserInput; aParserInput.aInputStream = xInputStream; diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 3c98652ae366..cae373c54c82 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -506,7 +506,6 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const ::c // SbaXDataBrowserController Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getTypes" ); return ::comphelper::concatSequences( SbaXDataBrowserController_Base::getTypes(), m_pFormControllerImpl->getTypes() @@ -545,8 +544,6 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun ,m_bLoadCanceled( false ) ,m_bCannotSelectUnfiltered( true ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SbaXDataBrowserController" ); - // create the form controller aggregate ::comphelper::increment(m_refCount); { @@ -562,7 +559,6 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun SbaXDataBrowserController::~SbaXDataBrowserController() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::~SbaXDataBrowserController" ); // deleteView(); // release the aggregated form controller if (m_xFormControllerImpl.is()) @@ -575,7 +571,6 @@ SbaXDataBrowserController::~SbaXDataBrowserController() void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >& _rxFrame ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::startFrameListening" ); SbaXDataBrowserController_Base::startFrameListening( _rxFrame ); Reference< XFrameActionListener > xAggListener; @@ -588,7 +583,6 @@ void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >& void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _rxFrame ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::stopFrameListening" ); SbaXDataBrowserController_Base::stopFrameListening( _rxFrame ); Reference< XFrameActionListener > xAggListener; @@ -622,7 +616,6 @@ void SbaXDataBrowserController::impl_checkForCannotSelectUnfiltered( const SQLEx bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _rxLoadable ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloadForm" ); WaitObject aWO(getBrowserView()); onStartLoading( _rxLoadable ); @@ -682,7 +675,6 @@ bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _rxLoa void SbaXDataBrowserController::initFormatter() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::initFormatter" ); // create a formatter working with the connections format supplier Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), true, getORB())); @@ -699,7 +691,6 @@ void SbaXDataBrowserController::initFormatter() void SbaXDataBrowserController::describeSupportedFeatures() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::describeSupportedFeatures" ); SbaXDataBrowserController_Base::describeSupportedFeatures(); implDescribeSupportedFeature( ".uno:FormSlots/undoRecord", ID_BROWSER_UNDORECORD, CommandGroup::CONTROLS ); implDescribeSupportedFeature( ".uno:FormController/undoRecord", ID_BROWSER_UNDORECORD, CommandGroup::CONTROLS ); @@ -723,7 +714,6 @@ void SbaXDataBrowserController::describeSupportedFeatures() bool SbaXDataBrowserController::Construct(Window* pParent) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::Construct" ); // create/initialize the form and the grid model m_xRowSet = CreateForm(); if (!m_xRowSet.is()) @@ -835,25 +825,21 @@ bool SbaXDataBrowserController::Construct(Window* pParent) bool SbaXDataBrowserController::LoadForm() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::LoadForm" ); reloadForm( m_xLoadable ); return true; } void SbaXDataBrowserController::AddColumnListener(const Reference< XPropertySet > & /*xCol*/) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::AddColumnListener" ); // we're not interested in any column properties ... } void SbaXDataBrowserController::RemoveColumnListener(const Reference< XPropertySet > & /*xCol*/) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::RemoveColumnListener" ); } Reference< XRowSet > SbaXDataBrowserController::CreateForm() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CreateForm" ); return Reference< XRowSet > ( getORB()->getServiceManager()->createInstanceWithContext("com.sun.star.form.component.Form", getORB()), UNO_QUERY); @@ -861,7 +847,6 @@ Reference< XRowSet > SbaXDataBrowserController::CreateForm() Reference< ::com::sun::star::form::XFormComponent > SbaXDataBrowserController::CreateGridModel() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CreateGridModel" ); return Reference< ::com::sun::star::form::XFormComponent > ( getORB()->getServiceManager()->createInstanceWithContext("com.sun.star.form.component.GridControl", getORB()), UNO_QUERY); @@ -869,7 +854,6 @@ Reference< ::com::sun::star::form::XFormComponent > SbaXDataBrowserController:: void SbaXDataBrowserController::addModelListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addModelListeners" ); // ... all the grid columns addColumnListeners(_xGridControlModel); @@ -885,7 +869,6 @@ void SbaXDataBrowserController::addModelListeners(const Reference< ::com::sun::s void SbaXDataBrowserController::removeModelListeners(const Reference< XControlModel > & _xGridControlModel) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::removeModelListeners" ); // every single column model Reference< XIndexContainer > xColumns(_xGridControlModel, UNO_QUERY); if (xColumns.is()) @@ -909,7 +892,6 @@ void SbaXDataBrowserController::removeModelListeners(const Reference< XControlMo void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun::star::awt::XControl > & _xGridControl) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addControlListeners" ); // to ge the 'modified' for the current cell Reference< XModifyBroadcaster > xBroadcaster(getBrowserView()->getGridControl(), UNO_QUERY); if (xBroadcaster.is()) @@ -928,7 +910,6 @@ void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun: void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::sun::star::awt::XControl > & _xGridControl) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::removeControlListeners" ); Reference< XModifyBroadcaster > xBroadcaster(_xGridControl, UNO_QUERY); if (xBroadcaster.is()) xBroadcaster->removeModifyListener(static_cast<XModifyListener*>(this)); @@ -944,7 +925,6 @@ void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::s void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::focusGained" ); // notify our activate listeners (registered on the form controller aggregate) EventObject aEvt(*this); ::cppu::OInterfaceIteratorHelper aIter(m_pFormControllerImpl->m_aActivateListeners); @@ -954,7 +934,6 @@ void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/) th void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::focusLost" ); // some general checks if (!getBrowserView() || !getBrowserView()->getGridControl().is()) return; @@ -988,19 +967,16 @@ void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e) throw( R void SbaXDataBrowserController::disposingGridControl(const ::com::sun::star::lang::EventObject& /*Source*/) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingGridControl" ); removeControlListeners(getBrowserView()->getGridControl()); } void SbaXDataBrowserController::disposingGridModel(const ::com::sun::star::lang::EventObject& /*Source*/) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingGridModel" ); removeModelListeners(getControlModel()); } void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang::EventObject& Source) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingFormModel" ); Reference< XPropertySet > xSourceSet(Source.Source, UNO_QUERY); if (xSourceSet.is()) { @@ -1028,13 +1004,11 @@ void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang: void SbaXDataBrowserController::disposingColumnModel(const ::com::sun::star::lang::EventObject& Source) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingColumnModel" ); RemoveColumnListener(Reference< XPropertySet > (Source.Source, UNO_QUERY)); } void SbaXDataBrowserController::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposing" ); // if it's a component other than our aggregate, forward it to the aggregate if ( m_xFormControllerImpl != Source.Source ) { @@ -1074,21 +1048,18 @@ void SbaXDataBrowserController::disposing(const EventObject& Source) throw( Runt void SAL_CALL SbaXDataBrowserController::setIdentifier( const OUString& _Identifier ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setIdentifier" ); ::osl::MutexGuard aGuard( getMutex() ); m_sModuleIdentifier = _Identifier; } OUString SAL_CALL SbaXDataBrowserController::getIdentifier( ) throw (RuntimeException, std::exception) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getIdentifier" ); ::osl::MutexGuard aGuard( getMutex() ); return m_sModuleIdentifier; } void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) throw ( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::propertyChange" ); Reference< XPropertySet > xSource(evt.Source, UNO_QUERY); if (!xSource.is()) return; @@ -1139,13 +1110,11 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t void SbaXDataBrowserController::modified(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::modified" ); setCurrentModified( true ); } void SbaXDataBrowserController::elementInserted(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementInserted" ); OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(), "SbaXDataBrowserController::elementInserted: where did this come from (not from the grid model)?!"); Reference< XPropertySet > xNewColumn(evt.Element,UNO_QUERY); @@ -1155,7 +1124,6 @@ void SbaXDataBrowserController::elementInserted(const ::com::sun::star::containe void SbaXDataBrowserController::elementRemoved(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementRemoved" ); OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(), "SbaXDataBrowserController::elementRemoved: where did this come from (not from the grid model)?!"); Reference< XPropertySet > xOldColumn(evt.Element,UNO_QUERY); @@ -1165,7 +1133,6 @@ void SbaXDataBrowserController::elementRemoved(const ::com::sun::star::container void SbaXDataBrowserController::elementReplaced(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementReplaced" ); OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(), "SbaXDataBrowserController::elementReplaced: where did this come from (not from the grid model)?!"); Reference< XPropertySet > xOldColumn(evt.ReplacedElement,UNO_QUERY); @@ -1179,8 +1146,6 @@ void SbaXDataBrowserController::elementReplaced(const ::com::sun::star::containe sal_Bool SbaXDataBrowserController::suspend(sal_Bool /*bSuspend*/) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::suspend" ); - m_aAsyncGetCellFocus.CancelCall(); m_aAsyncDisplayError.CancelCall(); m_aAsyncInvalidateAll.CancelCall(); @@ -1258,7 +1223,6 @@ void SbaXDataBrowserController::disposing() void SbaXDataBrowserController::frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::frameAction" ); ::osl::MutexGuard aGuard( getMutex() ); SbaXDataBrowserController_Base::frameAction( aEvent ); @@ -1305,7 +1269,6 @@ IMPL_LINK( SbaXDataBrowserController, OnAsyncDisplayError, void*, /* _pNotIntere void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::errorOccurred" ); ::osl::MutexGuard aGuard( getMutex() ); SQLExceptionInfo aInfo( aEvent.Reason ); @@ -1326,7 +1289,6 @@ void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErr sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::approveParameter" ); if (aEvent.Source != getRowSet()) { // not my data source -> allow anything @@ -1402,13 +1364,11 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for sal_Bool SbaXDataBrowserController::approveReset(const ::com::sun::star::lang::EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::approveReset" ); return sal_True; } void SbaXDataBrowserController::resetted(const ::com::sun::star::lang::EventObject& rEvent) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::resetted" ); OSL_ENSURE(rEvent.Source == getControlModel(), "SbaXDataBrowserController::resetted : where did this come from ?"); (void)rEvent; setCurrentModified( false ); @@ -1416,7 +1376,6 @@ void SbaXDataBrowserController::resetted(const ::com::sun::star::lang::EventObje sal_Bool SbaXDataBrowserController::confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& /*aEvent*/) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::confirmDelete" ); if (QueryBox(getBrowserView(), ModuleRes(QUERY_BRW_DELETE_ROWS)).Execute() != RET_YES) return sal_False; @@ -1425,7 +1384,6 @@ sal_Bool SbaXDataBrowserController::confirmDelete(const ::com::sun::star::sdb::R FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::GetState" ); FeatureState aReturn; // (disabled automatically) @@ -1651,7 +1609,6 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const void SbaXDataBrowserController::applyParserOrder(const OUString& _rOldOrder,const Reference< XSingleSelectQueryComposer >& _xParser) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::applyParserOrder" ); Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); if (!m_xLoadable.is()) { @@ -1692,7 +1649,6 @@ void SbaXDataBrowserController::applyParserOrder(const OUString& _rOldOrder,cons void SbaXDataBrowserController::applyParserFilter(const OUString& _rOldFilter, bool _bOldFilterApplied,const ::OUString& _sOldHaving,const Reference< XSingleSelectQueryComposer >& _xParser) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::applyParserFilter" ); Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); if (!m_xLoadable.is()) { @@ -1784,7 +1740,6 @@ Reference< XSingleSelectQueryComposer > SbaXDataBrowserController::createParser_ void SbaXDataBrowserController::ExecuteFilterSortCrit(bool bFilter) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ExecuteFilterSortCrit" ); if (!SaveModified()) return; @@ -1847,7 +1802,6 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(bool bFilter) void SbaXDataBrowserController::ExecuteSearch() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ExecuteSearch" ); // calculate the control source of the active field Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); OSL_ENSURE(xGrid.is(), "SbaXDataBrowserController::ExecuteSearch : the control should have an ::com::sun::star::form::XGrid interface !"); @@ -1905,7 +1859,6 @@ void SbaXDataBrowserController::ExecuteSearch() void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< PropertyValue >& _rArgs) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::Execute" ); bool bSortUp = true; switch (nId) @@ -2205,7 +2158,6 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SaveModified" ); if ( bAskFor && GetState(ID_BROWSER_SAVERECORD).bEnabled ) { getBrowserView()->getVclControl()->GrabFocus(); @@ -2255,7 +2207,6 @@ bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor) bool SbaXDataBrowserController::CommitCurrent() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CommitCurrent" ); if (!getBrowserView()) return true; @@ -2276,7 +2227,6 @@ bool SbaXDataBrowserController::CommitCurrent() void SbaXDataBrowserController::setCurrentModified( bool _bSet ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setCurrentModified" ); m_bCurrentlyModified = _bSet; InvalidateFeature( ID_BROWSER_SAVERECORD ); InvalidateFeature( ID_BROWSER_UNDORECORD ); @@ -2284,13 +2234,11 @@ void SbaXDataBrowserController::setCurrentModified( bool _bSet ) void SbaXDataBrowserController::RowChanged() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::RowChanged" ); setCurrentModified( false ); } void SbaXDataBrowserController::ColumnChanged() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ColumnChanged" ); InvalidateFeature(ID_BROWSER_SORTUP); InvalidateFeature(ID_BROWSER_SORTDOWN); InvalidateFeature(ID_BROWSER_ORDERCRIT); @@ -2303,20 +2251,17 @@ void SbaXDataBrowserController::ColumnChanged() void SbaXDataBrowserController::SelectionChanged() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SelectionChanged" ); // not interested in } void SbaXDataBrowserController::CellActivated() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CellActivated" ); m_aInvalidateClipboard.Start(); OnInvalidateClipboard( NULL ); } void SbaXDataBrowserController::CellDeactivated() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CellDeactivated" ); m_aInvalidateClipboard.Stop(); OnInvalidateClipboard( NULL ); } @@ -2345,7 +2290,6 @@ IMPL_LINK(SbaXDataBrowserController, OnInvalidateClipboard, AutoTimer*, _pTimer) Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 nViewPos) const { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SaveData" ); Reference< XPropertySet > xEmptyReturn; // get the current column from the grid @@ -2503,14 +2447,12 @@ IMPL_LINK_NOARG(SbaXDataBrowserController, OnAsyncGetCellFocus) void SbaXDataBrowserController::criticalFail() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::criticalFail" ); InvalidateAll(); m_nRowSetPrivileges = 0; } void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::LoadFinished" ); m_nRowSetPrivileges = 0; if (isValid() && !loadingCancelled()) @@ -2539,7 +2481,6 @@ void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/) void SbaXDataBrowserController::initializeParser() const { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::initializeParser" ); if ( !m_xParser.is() ) { // create a parser (needed for filtering/sorting) @@ -2563,20 +2504,17 @@ void SbaXDataBrowserController::initializeParser() const void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::loaded" ); // not interested in // we're loading within an separate thread and have a handling for it's "finished event" } void SbaXDataBrowserController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::unloading" ); // not interested in } void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::unloaded" ); m_xParser.clear(); InvalidateAll(); // do this asynchronously, there are other listeners reacting on this message ... @@ -2588,13 +2526,11 @@ void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( R void SbaXDataBrowserController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloading" ); // not interested in } void SbaXDataBrowserController::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloaded" ); InvalidateAll(); // do this asynchronously, there are other listeners reacting on this message ... // (it's a little hack : the grid columns are listening to this event, too, and their bound field may @@ -2626,13 +2562,11 @@ void SbaXDataBrowserController::leaveFormAction() bool SbaXDataBrowserController::isLoaded() const { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::isLoaded" ); return m_xLoadable.is() && m_xLoadable->isLoaded(); } bool SbaXDataBrowserController::isValidCursor() const { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::isValidCursor" ); if (!m_xColumnsSupplier.is()) return false; Reference< ::com::sun::star::container::XNameAccess > xCols = m_xColumnsSupplier->getColumns(); @@ -2654,7 +2588,6 @@ bool SbaXDataBrowserController::isValidCursor() const sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getCurrentColumnPosition" ); Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); sal_Int16 nViewPos = -1; try @@ -2668,7 +2601,6 @@ sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos ) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setCurrentColumnPosition" ); Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); try { @@ -2680,7 +2612,6 @@ void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos ) void SbaXDataBrowserController::BeforeDrop() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::BeforeDrop" ); Reference< ::com::sun::star::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY); if (xFormError.is()) xFormError->removeSQLErrorListener((::com::sun::star::sdb::XSQLErrorListener*)this); @@ -2688,7 +2619,6 @@ void SbaXDataBrowserController::BeforeDrop() void SbaXDataBrowserController::AfterDrop() { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::AfterDrop" ); Reference< ::com::sun::star::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY); if (xFormError.is()) xFormError->addSQLErrorListener((::com::sun::star::sdb::XSQLErrorListener*)this); @@ -2696,7 +2626,6 @@ void SbaXDataBrowserController::AfterDrop() void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addColumnListeners" ); // ... all the grid columns Reference< ::com::sun::star::container::XIndexContainer > xColumns(_xGridControlModel, UNO_QUERY); if (xColumns.is()) @@ -2712,7 +2641,6 @@ void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun:: bool SbaXDataBrowserController::InitializeGridModel(const Reference< ::com::sun::star::form::XFormComponent > & /*xGrid*/) { - SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::InitializeGridModel" ); return true; } diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index cadd83d753b6..fa757a0dd97f 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -111,8 +111,6 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows, ,m_bCheckOnly(false) ,m_bAppendFirstLine(false) { - SAL_INFO("dbaccess.ui", "ODatabaseExport::ODatabaseExport" ); - m_nRows += nRows; sal_Int32 nCount = 0; for(sal_Int32 j=0;j < (sal_Int32)m_vColumns.size();++j) @@ -167,7 +165,6 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, ,m_bCheckOnly(false) ,m_bAppendFirstLine(false) { - SAL_INFO("dbaccess.ui", "ODatabaseExport::ODatabaseExport" ); try { SvtSysLocale aSysLocale; @@ -300,7 +297,6 @@ ODatabaseExport::~ODatabaseExport() void ODatabaseExport::insertValueIntoColumn() { - SAL_INFO("dbaccess.ui", "ODatabaseExport::insertValueIntoColumn" ); if(m_nColumnPos < sal_Int32(m_vDestVector.size())) { OFieldDescription* pField = m_vDestVector[m_nColumnPos]->second; @@ -414,7 +410,6 @@ void ODatabaseExport::insertValueIntoColumn() sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _nOldNumberFormat) { - SAL_INFO("dbaccess.ui", "ODatabaseExport::CheckString" ); double fOutNumber = 0.0; sal_Int16 nNumberFormat = 0; @@ -561,7 +556,6 @@ sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _n void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfoMap* _pInfoMap) { - SAL_INFO("dbaccess.ui", "ODatabaseExport::SetColumnTypes" ); if(_pList && _pInfoMap) { OSL_ENSURE(m_vNumberFormat.size() == m_vColumnSize.size() && m_vColumnSize.size() == _pList->size(),"Illegal columns in list"); @@ -633,7 +627,6 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName) { - SAL_INFO("dbaccess.ui", "ODatabaseExport::CreateDefaultColumn" ); Reference< XDatabaseMetaData> xDestMetaData(m_xConnection->getMetaData()); sal_Int32 nMaxNameLen(xDestMetaData->getMaxColumnNameLength()); OUString aAlias = _rColumnName; @@ -685,7 +678,6 @@ void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName) bool ODatabaseExport::createRowSet() { - SAL_INFO("dbaccess.ui", "ODatabaseExport::createRowSet" ); m_pUpdateHelper.reset(new OParameterUpdateHelper(createPreparedStatment(m_xConnection->getMetaData(),m_xTable,m_vColumns))); return m_pUpdateHelper.get() != NULL; @@ -693,8 +685,6 @@ bool ODatabaseExport::createRowSet() bool ODatabaseExport::executeWizard(const OUString& _rTableName, const Any& _aTextColor, const FontDescriptor& _rFont) { - SAL_INFO("dbaccess.ui", "ODatabaseExport::executeWizard" ); - bool bHaveDefaultTable = !m_sDefaultTableName.isEmpty(); OUString sTableName( bHaveDefaultTable ? m_sDefaultTableName : _rTableName ); OCopyTableWizard aWizard( @@ -759,7 +749,6 @@ bool ODatabaseExport::executeWizard(const OUString& _rTableName, const Any& _aTe void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException& e) { - SAL_INFO("dbaccess.ui", "ODatabaseExport::showErrorDialog" ); if(!m_bDontAskAgain) { OUString aMsg(e.Message); @@ -776,7 +765,6 @@ void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException void ODatabaseExport::adjustFormat() { - SAL_INFO("dbaccess.ui", "ODatabaseExport::adjustFormat" ); if ( !m_sTextToken.isEmpty() ) { sal_Int32 nNewPos = m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos; @@ -799,7 +787,6 @@ void ODatabaseExport::adjustFormat() void ODatabaseExport::eraseTokens() { - SAL_INFO("dbaccess.ui", "ODatabaseExport::eraseTokens" ); m_sTextToken = ""; m_sNumToken = ""; m_sValToken = ""; @@ -807,7 +794,6 @@ void ODatabaseExport::eraseTokens() void ODatabaseExport::ensureFormatter() { - SAL_INFO("dbaccess.ui", "ODatabaseExport::ensureFormatter" ); if ( !m_pFormatter ) { Reference< XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier(); @@ -823,7 +809,6 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R ,const Reference<XPropertySet>& _xDestTable ,const TPositions& _rvColumns) { - SAL_INFO("dbaccess.ui", "ODatabaseExport::createPreparedStatment" ); OUString aSql("INSERT INTO "); OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true ); diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 67391db8641d..c57a85250314 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -81,7 +81,6 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection, , m_bMetaOptions(false) , m_bSDNum(false) { - SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" ); SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) ); // If the file starts with a BOM, switch to UCS2. SetSwitchToUCS2( true ); @@ -103,7 +102,6 @@ OHTMLReader::OHTMLReader(SvStream& rIn, , m_bMetaOptions(false) , m_bSDNum(false) { - SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" ); SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) ); // If the file starts with a BOM, switch to UCS2. SetSwitchToUCS2( true ); @@ -115,7 +113,6 @@ OHTMLReader::~OHTMLReader() SvParserState OHTMLReader::CallParser() { - SAL_INFO("dbaccess.ui", "OHTMLReader::CallParser" ); rInput.Seek(STREAM_SEEK_TO_BEGIN); rInput.ResetError(); SvParserState eParseState = HTMLParser::CallParser(); @@ -125,7 +122,6 @@ SvParserState OHTMLReader::CallParser() void OHTMLReader::NextToken( int nToken ) { - SAL_INFO("dbaccess.ui", "OHTMLReader::NextToken" ); if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly return; if ( nToken == HTML_META ) @@ -293,7 +289,6 @@ void OHTMLReader::NextToken( int nToken ) void OHTMLReader::fetchOptions() { - SAL_INFO("dbaccess.ui", "OHTMLReader::fetchOptions" ); m_bInTbl = true; const HTMLOptions& options = GetOptions(); for (size_t i = 0, n = options.size(); i < n; ++i) @@ -316,7 +311,6 @@ void OHTMLReader::fetchOptions() void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal) { - SAL_INFO("dbaccess.ui", "OHTMLReader::TableDataOn" ); const HTMLOptions& rHtmlOptions = GetOptions(); for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i) { @@ -345,7 +339,6 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal) void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor) { - SAL_INFO("dbaccess.ui", "OHTMLReader::TableFontOn" ); const HTMLOptions& rHtmlOptions = GetOptions(); for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i) { @@ -394,7 +387,6 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor) sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption ) { - SAL_INFO("dbaccess.ui", "OHTMLReader::GetWidthPixel" ); const OUString& rOptVal = rOption.GetString(); if ( rOptVal.indexOf('%') != -1 ) { // percentage @@ -415,7 +407,6 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption ) bool OHTMLReader::CreateTable(int nToken) { - SAL_INFO("dbaccess.ui", "OHTMLReader::CreateTable" ); OUString aTempName(ModuleRes(STR_TBL_TITLE)); aTempName = aTempName.getToken(0,' '); aTempName = ::dbtools::createUniqueName(m_xTables, aTempName); @@ -525,20 +516,17 @@ bool OHTMLReader::CreateTable(int nToken) void OHTMLReader::setTextEncoding() { - SAL_INFO("dbaccess.ui", "OHTMLReader::setTextEncoding" ); m_bMetaOptions = true; ParseMetaOptions(NULL, NULL); } void OHTMLReader::release() { - SAL_INFO("dbaccess.ui", "OHTMLReader::release" ); ReleaseRef(); } TypeSelectionPageFactory OHTMLReader::getTypeSelectionPageFactory() { - SAL_INFO("dbaccess.ui", "OHTMLReader::getTypeSelectionPageFactory" ); return &OWizHTMLExtend::Create; } diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index b7c0be6e525a..6f374f003933 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -50,13 +50,11 @@ ORowSetImportExport::ORowSetImportExport( Window* _pParent, ,m_pParent(_pParent) ,m_bAlreadyAsked(false) { - SAL_INFO("dbaccess.ui", "ORowSetImportExport::ORowSetImportExport" ); OSL_ENSURE(_pParent,"Window can't be null!"); } void ORowSetImportExport::initialize() { - SAL_INFO("dbaccess.ui", "ORowSetImportExport::initialize" ); ODatabaseImportExport::initialize(); // do namemapping Reference<XColumnLocate> xColumnLocate(m_xResultSet,UNO_QUERY); @@ -96,13 +94,11 @@ void ORowSetImportExport::initialize() bool ORowSetImportExport::Write() { - SAL_INFO("dbaccess.ui", "ORowSetImportExport::Write" ); return true; } bool ORowSetImportExport::Read() { - SAL_INFO("dbaccess.ui", "ORowSetImportExport::Read" ); // check if there is any column to copy if(::std::find_if(m_aColumnMapping.begin(),m_aColumnMapping.end(), ::std::bind2nd(::std::greater<sal_Int32>(),0)) == m_aColumnMapping.end()) @@ -157,7 +153,6 @@ bool ORowSetImportExport::Read() bool ORowSetImportExport::insertNewRow() { - SAL_INFO("dbaccess.ui", "ORowSetImportExport::insertNewRow" ); try { m_xTargetResultSetUpdate->moveToInsertRow(); diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 30366adf803c..8bdce574b878 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -66,7 +66,6 @@ ORTFReader::ORTFReader( SvStream& rIn, :SvRTFParser(rIn) ,ODatabaseExport( _rxConnection, _rxNumberF, _rxContext, pList, _pInfoMap, rIn ) { - SAL_INFO("dbaccess.ui", "ORTFReader::ORTFReader" ); m_bAppendFirstLine = false; } @@ -81,7 +80,6 @@ ORTFReader::ORTFReader(SvStream& rIn, :SvRTFParser(rIn) ,ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rxContext, pList, _pInfoMap, _bAutoIncrementEnabled, rIn ) { - SAL_INFO("dbaccess.ui", "ORTFReader::ORTFReader" ); m_bAppendFirstLine = false; } @@ -91,7 +89,6 @@ ORTFReader::~ORTFReader() SvParserState ORTFReader::CallParser() { - SAL_INFO("dbaccess.ui", "ORTFReader::CallParser" ); rInput.Seek(STREAM_SEEK_TO_BEGIN); rInput.ResetError(); SvParserState eParseState = SvRTFParser::CallParser(); @@ -101,7 +98,6 @@ SvParserState ORTFReader::CallParser() void ORTFReader::NextToken( int nToken ) { - SAL_INFO("dbaccess.ui", "ORTFReader::NextToken" ); if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly return; @@ -253,7 +249,6 @@ void ORTFReader::NextToken( int nToken ) bool ORTFReader::CreateTable(int nToken) { - SAL_INFO("dbaccess.ui", "ORTFReader::CreateTable" ); OUString aTableName(ModuleRes(STR_TBL_TITLE)); aTableName = aTableName.getToken(0,' '); aTableName = ::dbtools::createUniqueName(m_xTables, aTableName); @@ -336,13 +331,11 @@ bool ORTFReader::CreateTable(int nToken) void ORTFReader::release() { - SAL_INFO("dbaccess.ui", "ORTFReader::release" ); ReleaseRef(); } TypeSelectionPageFactory ORTFReader::getTypeSelectionPageFactory() { - SAL_INFO("dbaccess.ui", "ORTFReader::getTypeSelectionPageFactory" ); return &OWizRTFExtend::Create; } diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index e6a3a9628fbd..601ef11b7930 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -96,8 +96,6 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor& ,m_bInInitialize(false) ,m_bCheckOnly(false) { - SAL_INFO("dbaccess.ui", "ODatabaseImportExport::ODatabaseImportExport" ); - m_eDestEnc = osl_getThreadTextEncoding(); osl_atomic_increment( &m_refCount ); @@ -128,7 +126,6 @@ ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection& ,m_bInInitialize(false) ,m_bCheckOnly(false) { - SAL_INFO("dbaccess.ui", "ODatabaseImportExport::ODatabaseImportExport" ); m_eDestEnc = osl_getThreadTextEncoding(); try { @@ -153,7 +150,6 @@ ODatabaseImportExport::~ODatabaseImportExport() void ODatabaseImportExport::dispose() { - SAL_INFO("dbaccess.ui", "ODatabaseImportExport::disposing" ); // remove me as listener Reference< XComponent > xComponent(m_xConnection, UNO_QUERY); if (xComponent.is()) @@ -175,7 +171,6 @@ void ODatabaseImportExport::dispose() void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) { - SAL_INFO("dbaccess.ui", "ODatabaseImportExport::disposing" ); Reference<XConnection> xCon(Source.Source,UNO_QUERY); if(m_xConnection.is() && m_xConnection == xCon) { @@ -187,13 +182,11 @@ void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) thro void ODatabaseImportExport::initialize( const ODataAccessDescriptor& _aDataDescriptor ) { - SAL_INFO("dbaccess.ui", "ODatabaseImportExport::initialize" ); impl_initFromDescriptor( _aDataDescriptor, true ); } void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit) { - SAL_INFO("dbaccess.ui", "ODatabaseImportExport::impl_initFromDescriptor" ); if ( !_bPlusDefaultInit ) { m_sDataSourceName = _aDataDescriptor.getDataSource(); @@ -255,7 +248,6 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor void ODatabaseImportExport::initialize() { - SAL_INFO("dbaccess.ui", "ODatabaseImportExport::initialize" ); m_bInInitialize = true; m_bNeedToReInitialize = false; @@ -361,7 +353,6 @@ bool ODatabaseImportExport::Read() void ODatabaseImportExport::impl_initializeRowMember_throw() { - SAL_INFO("dbaccess.ui", "ODatabaseImportExport::impl_initializeRowMember_throw" ); if ( !m_xRow.is() && m_xResultSet.is() ) { m_xRow.set( m_xResultSet, UNO_QUERY ); @@ -374,7 +365,6 @@ void ODatabaseImportExport::impl_initializeRowMember_throw() bool ORTFImportExport::Write() { - SAL_INFO("dbaccess.ui", "ORTFImportExport::Write" ); ODatabaseImportExport::Write(); m_pStream->WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF ); m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING ); @@ -612,7 +602,6 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_ bool ORTFImportExport::Read() { - SAL_INFO("dbaccess.ui", "ORTFImportExport::Read" ); ODatabaseImportExport::Read(); SvParserState eState = SVPAR_ERROR; if ( m_pStream ) @@ -657,7 +646,6 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD ,m_bCheckFont(false) #endif { - SAL_INFO("dbaccess.ui", "OHTMLImportExport::OHTMLImportExport" ); // set HTML configuration SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get(); m_eDestEnc = rHtmlOptions.GetTextEncoding(); @@ -667,7 +655,6 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD bool OHTMLImportExport::Write() { - SAL_INFO("dbaccess.ui", "OHTMLImportExport::Write" ); ODatabaseImportExport::Write(); if(m_xObject.is()) { @@ -686,7 +673,6 @@ bool OHTMLImportExport::Write() bool OHTMLImportExport::Read() { - SAL_INFO("dbaccess.ui", "OHTMLImportExport::Read" ); ODatabaseImportExport::Read(); SvParserState eState = SVPAR_ERROR; if ( m_pStream ) @@ -706,7 +692,6 @@ bool OHTMLImportExport::Read() void OHTMLImportExport::WriteHeader() { - SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteHeader" ); uno::Reference<document::XDocumentProperties> xDocProps( document::DocumentProperties::create( m_xContext ) ); if (xDocProps.is()) { @@ -723,8 +708,6 @@ void OHTMLImportExport::WriteHeader() void OHTMLImportExport::WriteBody() { - SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteBody" ); - IncIndent(1); m_pStream->WriteCharPtr( "<" ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_style ).WriteCharPtr( " " ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_type ).WriteCharPtr( "=\"text/css\">" ); @@ -760,7 +743,6 @@ void OHTMLImportExport::WriteBody() void OHTMLImportExport::WriteTables() { - SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteTables" ); OString aStrOut = OOO_STRING_SVTOOLS_HTML_table; aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_frame; @@ -929,7 +911,6 @@ void OHTMLImportExport::WriteTables() void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal_Int32 nHeightPixel, const char* pChar, const OUString& rValue, const char* pHtmlTag) { - SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteCell" ); OString aStrTD = pHtmlTag; nWidthPixel = nWidthPixel ? nWidthPixel : 86; @@ -1002,7 +983,6 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal void OHTMLImportExport::FontOn() { - SAL_INFO("dbaccess.ui", "OHTMLImportExport::FontOn" ); #if OSL_DEBUG_LEVEL > 0 m_bCheckFont = true; #endif @@ -1033,7 +1013,6 @@ void OHTMLImportExport::FontOn() inline void OHTMLImportExport::FontOff() { - SAL_INFO("dbaccess.ui", "OHTMLImportExport::FontOff" ); OSL_ENSURE(m_bCheckFont,"Kein FontOn() gerufen"); TAG_OFF( OOO_STRING_SVTOOLS_HTML_font ); #if OSL_DEBUG_LEVEL > 0 @@ -1043,7 +1022,6 @@ inline void OHTMLImportExport::FontOff() void OHTMLImportExport::IncIndent( sal_Int16 nVal ) { - SAL_INFO("dbaccess.ui", "OHTMLImportExport::IncIndent" ); sIndent[m_nIndent] = '\t'; m_nIndent = m_nIndent + nVal; if ( m_nIndent < 0 ) diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index f6fee11f30b9..3d6ad196522c 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -525,7 +525,6 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultN ,m_ePressed( WIZARD_NONE ) ,m_bCreatePrimaryKeyColumn(false) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::OCopyTableWizard" ); construct(); // extract table name @@ -623,7 +622,6 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultNa ,m_ePressed( WIZARD_NONE ) ,m_bCreatePrimaryKeyColumn(false) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::OCopyTableWizard" ); construct(); ODatabaseExport::TColumnVector::const_iterator aIter = _rSourceColVec.begin(); ODatabaseExport::TColumnVector::const_iterator aEnd = _rSourceColVec.end(); @@ -651,7 +649,6 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultNa void OCopyTableWizard::construct() { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::construct" ); AddButton( &m_pbHelp, WIZARDDIALOG_BUTTON_STDOFFSET_X ); AddButton( &m_pbCancel, WIZARDDIALOG_BUTTON_STDOFFSET_X ); AddButton( &m_pbPrev ); @@ -744,7 +741,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl) bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::CheckColumns" ); bool bRet = true; m_vColumnPos.clear(); m_vColumnTypes.clear(); @@ -919,13 +915,11 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) bool OCopyTableWizard::shouldCreatePrimaryKey() const { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::shouldCreatePrimaryKey" ); return m_bCreatePrimaryKeyColumn; } void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::setCreatePrimaryKey" ); m_bCreatePrimaryKeyColumn = _bDoCreate; if ( !_rSuggestedName.isEmpty() ) m_aKeyName = _rSuggestedName; @@ -956,7 +950,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplActivateHdl) void OCopyTableWizard::CheckButtons() { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::CheckButtons" ); if(GetCurLevel() == 0) // the first page has no back button { if(m_nPageCount > 1) @@ -980,7 +973,6 @@ void OCopyTableWizard::CheckButtons() void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle, bool bEnable) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::EnableButton" ); Button* pButton; if(eStyle == WIZARD_NEXT) pButton = &m_pbNext; @@ -994,21 +986,18 @@ void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle, bool bEnable) long OCopyTableWizard::DeactivatePage() { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::DeactivatePage" ); OWizardPage* pPage = (OWizardPage*)GetPage(GetCurLevel()); return pPage ? pPage->LeavePage() : sal_False; } void OCopyTableWizard::AddWizardPage(OWizardPage* pPage) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::AddWizardPage" ); AddPage(pPage); ++m_nPageCount; } void OCopyTableWizard::insertColumn(sal_Int32 _nPos,OFieldDescription* _pField) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::insertColumn" ); OSL_ENSURE(_pField,"FieldDescrioption is null!"); if ( _pField ) { @@ -1027,7 +1016,6 @@ void OCopyTableWizard::insertColumn(sal_Int32 _nPos,OFieldDescription* _pField) void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const OUString& _sOldName) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::replaceColumn" ); OSL_ENSURE(_pField,"FieldDescrioption is null!"); if ( _pField ) { @@ -1041,13 +1029,11 @@ void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField, void OCopyTableWizard::impl_loadSourceData() { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::impl_loadSourceData" ); loadData( m_rSourceObject, m_vSourceColumns, m_vSourceVec ); } void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, ODatabaseExport::TColumns& _rColumns, ODatabaseExport::TColumnVector& _rColVector ) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::loadData" ); ODatabaseExport::TColumns::iterator colEnd = _rColumns.end(); for ( ODatabaseExport::TColumns::iterator col = _rColumns.begin(); col != colEnd; ++col ) delete col->second; @@ -1107,7 +1093,6 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, void OCopyTableWizard::clearDestColumns() { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::clearDestColumns" ); clearColumns(m_vDestColumns,m_aDestVec); m_bAddPKFirstTime = true; m_mNameMapping.clear(); @@ -1115,7 +1100,6 @@ void OCopyTableWizard::clearDestColumns() void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, const ODatabaseExport::TColumnVector* _pVec, bool _bKeyColumns) const { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::appendColumns" ); // now append the columns OSL_ENSURE(_rxColSup.is(),"No columns supplier"); if(!_rxColSup.is()) @@ -1166,7 +1150,6 @@ void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, co void OCopyTableWizard::appendKey( Reference<XKeysSupplier>& _rxSup, const ODatabaseExport::TColumnVector* _pVec) const { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::appendKey" ); if(!_rxSup.is()) return; // the database doesn't support keys OSL_ENSURE(_rxSup.is(),"No XKeysSupplier!"); @@ -1194,7 +1177,6 @@ void OCopyTableWizard::appendKey( Reference<XKeysSupplier>& _rxSup, const ODatab Reference< XPropertySet > OCopyTableWizard::createView() const { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::createView" ); OUString sCommand( m_rSourceObject.getSelectStatement() ); OSL_ENSURE( !sCommand.isEmpty(), "OCopyTableWizard::createView: no statement in the source object!" ); // there are legitimate cases in which getSelectStatement does not provide a statement, @@ -1204,7 +1186,6 @@ Reference< XPropertySet > OCopyTableWizard::createView() const Reference< XPropertySet > OCopyTableWizard::createTable() { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::createTable" ); Reference< XPropertySet > xTable; Reference<XTablesSupplier> xSup( m_xDestConnection, UNO_QUERY ); @@ -1336,7 +1317,6 @@ bool OCopyTableWizard::supportsPrimaryKey( const Reference< XConnection >& _rxCo bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnection ) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::supportsViews" ); OSL_PRECOND( _rxConnection.is(), "OCopyTableWizard::supportsViews: invalid connection!" ); if ( !_rxConnection.is() ) return false; @@ -1378,7 +1358,6 @@ bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnect sal_Int32 OCopyTableWizard::getMaxColumnNameLength() const { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::getMaxColumnNameLength" ); sal_Int32 nLen = 0; if ( m_xDestConnection.is() ) { @@ -1397,13 +1376,11 @@ sal_Int32 OCopyTableWizard::getMaxColumnNameLength() const void OCopyTableWizard::setOperation( const sal_Int16 _nOperation ) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::setOperation" ); m_nOperation = _nOperation; } sal_Int16 OCopyTableWizard::getOperation() const { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::getOperation" ); return m_nOperation; } @@ -1412,7 +1389,6 @@ OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFu const OUString& _sExtraChars, sal_Int32 _nMaxNameLen) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::convertColumnName" ); OUString sAlias = _sColumnName; if ( isSQL92CheckEnabled( m_xDestConnection ) ) sAlias = ::dbtools::convertName2SQLName(_sColumnName,_sExtraChars); @@ -1446,13 +1422,11 @@ OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFu void OCopyTableWizard::removeColumnNameFromNameMap(const OUString& _sName) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::removeColumnNameFromNameMap" ); m_mNameMapping.erase(_sName); } bool OCopyTableWizard::supportsType(sal_Int32 _nDataType, sal_Int32& _rNewDataType) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::supportsType" ); bool bRet = m_aDestTypeInfo.find(_nDataType) != m_aDestTypeInfo.end(); if ( bRet ) _rNewDataType = _nDataType; @@ -1461,7 +1435,6 @@ bool OCopyTableWizard::supportsType(sal_Int32 _nDataType, sal_Int32& _rNewData TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType, bool& _bNotConvert) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::convertType" ); if ( !m_bInterConnectionCopy ) // no need to convert if the source and destination connection are the same return _pType; @@ -1560,7 +1533,6 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType, bool& _bN OUString OCopyTableWizard::createUniqueName(const OUString& _sName) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::createUniqueName" ); OUString sName = _sName; Sequence< OUString > aColumnNames( m_rSourceObject.getColumnNames() ); if ( aColumnNames.getLength() ) @@ -1582,7 +1554,6 @@ OUString OCopyTableWizard::createUniqueName(const OUString& _sName) void OCopyTableWizard::showColumnTypeNotSupported(const OUString& _rColumnName) { - SAL_INFO("dbaccess.ui", "OCopyTableWizard::showColumnTypeNotSupported" ); OUString sMessage( ModuleRes( STR_UNKNOWN_TYPE_FOUND ) ); sMessage = sMessage.replaceFirst("#1",_rColumnName); showError(sMessage); |