diff options
Diffstat (limited to 'dbaccess/source/ui/control/tabletree.cxx')
-rw-r--r-- | dbaccess/source/ui/control/tabletree.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 39c001c39fb7..340e1b863431 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -181,7 +181,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn namespace { - struct OViewSetter : public ::std::unary_function< OTableTreeListBox::TNames::value_type, bool> + struct OViewSetter : public std::unary_function< OTableTreeListBox::TNames::value_type, bool> { const Sequence< OUString> m_aViews; ::comphelper::UStringMixEqual m_aEqualFunctor; @@ -193,7 +193,7 @@ namespace aRet.first = lhs; const OUString* pIter = m_aViews.getConstArray(); const OUString* pEnd = m_aViews.getConstArray() + m_aViews.getLength(); - aRet.second = ::std::any_of(pIter,pEnd,::std::bind2nd(m_aEqualFunctor,lhs)); + aRet.second = std::any_of(pIter,pEnd,std::bind2nd(m_aEqualFunctor,lhs)); return aRet; } @@ -214,7 +214,7 @@ void OTableTreeListBox::UpdateTableList( try { Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW ); - ::std::transform( pIter, pEnd, + std::transform( pIter, pEnd, aTables.begin(), OViewSetter( _rViews, xMeta->supportsMixedCaseQuotedIdentifiers() ) ); } catch(Exception&) @@ -226,9 +226,9 @@ void OTableTreeListBox::UpdateTableList( namespace { - ::std::vector< OUString > lcl_getMetaDataStrings_throw( const Reference< XResultSet >& _rxMetaDataResult, sal_Int32 _nColumnIndex ) + std::vector< OUString > lcl_getMetaDataStrings_throw( const Reference< XResultSet >& _rxMetaDataResult, sal_Int32 _nColumnIndex ) { - ::std::vector< OUString > aStrings; + std::vector< OUString > aStrings; Reference< XRow > xRow( _rxMetaDataResult, UNO_QUERY_THROW ); while ( _rxMetaDataResult->next() ) aStrings.push_back( xRow->getString( _nColumnIndex ) ); @@ -254,10 +254,10 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn if (haveVirtualRoot()) { OUString sRootEntryText; - if ( ::std::none_of(_rTables.begin(),_rTables.end(), + if ( std::none_of(_rTables.begin(),_rTables.end(), [] (const TNames::value_type& name) { return !name.second; }) ) sRootEntryText = ModuleRes(STR_ALL_TABLES); - else if ( ::std::none_of(_rTables.begin(),_rTables.end(), + else if ( std::none_of(_rTables.begin(),_rTables.end(), [] (const TNames::value_type& name) { return name.second; }) ) sRootEntryText = ModuleRes(STR_ALL_VIEWS); else @@ -296,12 +296,12 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn // implAddEntry) bool bCatalogs = bSupportsCatalogs && xMeta->isCatalogAtStart(); - ::std::vector< OUString > aFolderNames( lcl_getMetaDataStrings_throw( + std::vector< OUString > aFolderNames( lcl_getMetaDataStrings_throw( bCatalogs ? xMeta->getCatalogs() : xMeta->getSchemas(), 1 ) ); sal_Int32 nFolderType = bCatalogs ? DatabaseObjectContainer::CATALOG : DatabaseObjectContainer::SCHEMA; SvTreeListEntry* pRootEntry = getAllObjectsEntry(); - for ( ::std::vector< OUString >::const_iterator folder = aFolderNames.begin(); + for ( std::vector< OUString >::const_iterator folder = aFolderNames.begin(); folder != aFolderNames.end(); ++folder ) |