fdo#78971 There's even a git hook to prevent commits containing SAL_DEBUG
Change-Id: I5a46e1eed129edf3648c68c36951d6fdf9bd370d
This commit is contained in:
@@ -302,15 +302,9 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
SAL_DEBUG("OFilteredContainer::construct(). "
|
|
||||||
"Getting metadata ...");
|
|
||||||
|
|
||||||
Reference< XConnection > xCon( m_xConnection, UNO_SET_THROW );
|
Reference< XConnection > xCon( m_xConnection, UNO_SET_THROW );
|
||||||
m_xMetaData.set( xCon->getMetaData(), UNO_SET_THROW );
|
m_xMetaData.set( xCon->getMetaData(), UNO_SET_THROW );
|
||||||
|
|
||||||
SAL_DEBUG("OFilteredContainer::construct(). "
|
|
||||||
"Metadata got.");
|
|
||||||
|
|
||||||
// create a table table filter suitable for the XDatabaseMetaData::getTables call,
|
// create a table table filter suitable for the XDatabaseMetaData::getTables call,
|
||||||
// taking into account both the externally-provided table type filter, and any
|
// taking into account both the externally-provided table type filter, and any
|
||||||
// table type restriction which is inherent to the container
|
// table type restriction which is inherent to the container
|
||||||
@@ -318,9 +312,6 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
|
|||||||
OUString sInherentTableTypeRestriction( getTableTypeRestriction() );
|
OUString sInherentTableTypeRestriction( getTableTypeRestriction() );
|
||||||
if ( !sInherentTableTypeRestriction.isEmpty() )
|
if ( !sInherentTableTypeRestriction.isEmpty() )
|
||||||
{
|
{
|
||||||
SAL_DEBUG("OFilteredContainer::construct(). "
|
|
||||||
"NOT InherentTableTypeRestriction.");
|
|
||||||
|
|
||||||
if ( _rTableTypeFilter.getLength() != 0 )
|
if ( _rTableTypeFilter.getLength() != 0 )
|
||||||
{
|
{
|
||||||
const OUString* tableType = _rTableTypeFilter.getConstArray();
|
const OUString* tableType = _rTableTypeFilter.getConstArray();
|
||||||
@@ -342,9 +333,6 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SAL_DEBUG("OFilteredContainer::construct(). "
|
|
||||||
"InherentTableTypeRestriction.");
|
|
||||||
|
|
||||||
// no container-inherent restriction for the table types
|
// no container-inherent restriction for the table types
|
||||||
if ( _rTableTypeFilter.getLength() == 0 )
|
if ( _rTableTypeFilter.getLength() == 0 )
|
||||||
{ // no externally-provided table type filter => use the default filter
|
{ // no externally-provided table type filter => use the default filter
|
||||||
@@ -356,16 +344,10 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SAL_DEBUG("OFilteredContainer::construct(). "
|
|
||||||
"Getting tables ...");
|
|
||||||
|
|
||||||
static const OUString sAll("%");
|
static const OUString sAll("%");
|
||||||
Reference< XResultSet > xTables = m_xMetaData->getTables( Any(), sAll, sAll, aTableTypeFilter );
|
Reference< XResultSet > xTables = m_xMetaData->getTables( Any(), sAll, sAll, aTableTypeFilter );
|
||||||
Reference< XRow > xCurrentRow( xTables, UNO_QUERY_THROW );
|
Reference< XRow > xCurrentRow( xTables, UNO_QUERY_THROW );
|
||||||
|
|
||||||
SAL_DEBUG("OFilteredContainer::construct(). "
|
|
||||||
"Tables got.");
|
|
||||||
|
|
||||||
TableInfos aUnfilteredTables;
|
TableInfos aUnfilteredTables;
|
||||||
|
|
||||||
OUString sCatalog, sSchema, sName, sType;
|
OUString sCatalog, sSchema, sName, sType;
|
||||||
|
Reference in New Issue
Block a user