[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dbaccess/source

[Stephan Bergmann]

 dbaccess/source/core/api/FilteredContainer.cxx |   18 ------------------
 1 file changed, 18 deletions(-)

New commits:
commit 862abf22751c02a495ded3971b9a6e5c3553b514
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 20 17:01:38 2014 +0200

    fdo#78971 There's even a git hook to prevent commits containing SAL_DEBUG
    
    Change-Id: I5a46e1eed129edf3648c68c36951d6fdf9bd370d
    (cherry picked from commit dc24203e5f20dcbf2818651a8802e67338293b3c)

diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 7e5de81..edcf256 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -303,15 +303,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
@@ -319,9 +313,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();
@@ -343,9 +334,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
@@ -357,16 +345,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;