[Libreoffice-commits] core.git: 2 commits - comphelper/source dbaccess/source
Noel Grandin
noel at peralex.com
Wed May 14 01:01:31 PDT 2014
comphelper/source/container/embeddedobjectcontainer.cxx | 44 ----
dbaccess/source/core/api/BookmarkSet.cxx | 16 -
dbaccess/source/core/api/CacheSet.cxx | 48 -----
dbaccess/source/core/api/FilteredContainer.cxx | 2
dbaccess/source/core/api/KeySet.cxx | 59 ------
dbaccess/source/core/api/OptimisticSet.cxx | 7
dbaccess/source/core/api/RowSet.cxx | 2
dbaccess/source/core/api/RowSetBase.cxx | 152 +++-------------
dbaccess/source/core/api/RowSetCacheIterator.cxx | 4
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 48 -----
dbaccess/source/core/api/StaticSet.cxx | 33 ---
dbaccess/source/core/api/TableDeco.cxx | 22 --
dbaccess/source/core/api/WrappedResultSet.cxx | 17 -
dbaccess/source/core/api/callablestatement.cxx | 26 --
dbaccess/source/core/api/querycomposer.cxx | 19 --
dbaccess/source/core/api/resultset.cxx | 89 ---------
dbaccess/source/core/api/statement.cxx | 34 ---
dbaccess/source/core/api/table.cxx | 19 --
dbaccess/source/core/api/tablecontainer.cxx | 11 -
dbaccess/source/core/dataaccess/connection.cxx | 50 -----
dbaccess/source/core/dataaccess/datasource.cxx | 32 ---
dbaccess/source/filter/xml/xmlfilter.cxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 72 -------
dbaccess/source/ui/misc/DExport.cxx | 15 -
dbaccess/source/ui/misc/HtmlReader.cxx | 12 -
dbaccess/source/ui/misc/RowSetDrop.cxx | 5
dbaccess/source/ui/misc/RtfReader.cxx | 7
dbaccess/source/ui/misc/TokenWriter.cxx | 22 --
dbaccess/source/ui/misc/WCopyTable.cxx | 29 ---
29 files changed, 38 insertions(+), 860 deletions(-)
New commits:
commit ca86511a6eaa4de43cc9b498d5d8f140967224b3
Author: Noel Grandin <noel at peralex.com>
Date: Tue May 13 13:46:07 2014 +0200
dbaccess: remove SAL_INFO's that only make function entry
Change-Id: Ibdf92698446d0a7aed7c474ec7d3ea720cd2c2a6
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 37958b0..8cb6a4e 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 0523a64..83e28fc 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 4264c7f..21c0b2a 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 d32b973..21c01fe 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 84cbc7a..44e7807 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 ed0471e..644b937 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 204e37e..5d9438e 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 72ad03f..555d28b 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 4d7999e..7f4efb2 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 f4a4609..aea9c4d 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)
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list