mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#78971 There's even a git hook to prevent commits containing SAL_DEBUG

Browse Source 
Change-Id: I5a46e1eed129edf3648c68c36951d6fdf9bd370d
This commit is contained in:
Stephan Bergmann
2014-05-20 17:01:38 +02:00
parent 68bc8af6b6
commit dc24203e5f
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dbaccess/source/core/api/FilteredContainer.cxx
View File

@@ -302,15 +302,9 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
try
{
SAL_DEBUG("OFilteredContainer::construct(). "
"Getting metadata ...");
Reference< XConnection > xCon( m_xConnection, 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,
// taking into account both the externally-provided table type filter, and any
// table type restriction which is inherent to the container
@@ -318,9 +312,6 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
OUString sInherentTableTypeRestriction( getTableTypeRestriction() );
if ( !sInherentTableTypeRestriction.isEmpty() )
{
SAL_DEBUG("OFilteredContainer::construct(). "
"NOT InherentTableTypeRestriction.");
if ( _rTableTypeFilter.getLength() != 0 )
{
const OUString* tableType = _rTableTypeFilter.getConstArray();
@@ -342,9 +333,6 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
}
else
{
SAL_DEBUG("OFilteredContainer::construct(). "
"InherentTableTypeRestriction.");
// no container-inherent restriction for the table types
if ( _rTableTypeFilter.getLength() == 0 )
{ // 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("%");
Reference< XResultSet > xTables = m_xMetaData->getTables( Any(), sAll, sAll, aTableTypeFilter );
Reference< XRow > xCurrentRow( xTables, UNO_QUERY_THROW );
SAL_DEBUG("OFilteredContainer::construct(). "
"Tables got.");
TableInfos aUnfilteredTables;
OUString sCatalog, sSchema, sName, sType;