Tag: cws_dev300_dba30d User: fs Date: 2008-06-10 08:34:04+0000 Modified: dba/dbaccess/source/ui/control/tabletree.cxx
Log: DatabaseObjectFolder renamed to DatabaseObjectContainer File Changes: Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: tabletree.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/tabletree.cxx?r1=1.37.10.2&r2=1.37.10.3 Delta lines: +17 -17 --------------------- --- tabletree.cxx 2008-06-10 07:21:20+0000 1.37.10.2 +++ tabletree.cxx 2008-06-10 08:34:01+0000 1.37.10.3 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabletree.cxx,v $ - * $Revision: 1.37.10.2 $ + * $Revision: 1.37.10.3 $ * * This file is part of OpenOffice.org. * @@ -62,7 +62,7 @@ #include <com/sun/star/sdb/application/DatabaseObject.hpp> #endif #ifndef _COM_SUN_STAR_SDB_APPLICATION_DATABASEOBJECTFOLDER_HPP_ -#include <com/sun/star/sdb/application/DatabaseObjectFolder.hpp> +#include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp> #endif #ifndef _COM_SUN_STAR_SDBC_XDRIVERACCESS_HPP_ #include <com/sun/star/sdbc/XDriverAccess.hpp> @@ -117,7 +117,7 @@ using namespace ::comphelper; namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject; -namespace DatabaseObjectFolder = ::com::sun::star::sdb::application::DatabaseObjectFolder; +namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer; //======================================================================== //= OTableTreeListBox @@ -157,9 +157,9 @@ bool OTableTreeListBox::isFolderEntry( const SvLBoxEntry* _pEntry ) const { sal_Int32 nEntryType = reinterpret_cast< sal_IntPtr >( _pEntry->GetUserData() ); - if ( ( nEntryType == DatabaseObjectFolder::ALL_TABLES ) - || ( nEntryType == DatabaseObjectFolder::CATALOG ) - || ( nEntryType == DatabaseObjectFolder::SCHEMA ) + if ( ( nEntryType == DatabaseObjectContainer::ALL_TABLES ) + || ( nEntryType == DatabaseObjectContainer::CATALOG ) + || ( nEntryType == DatabaseObjectContainer::SCHEMA ) ) return true; return false; @@ -328,7 +328,7 @@ sRootEntryText = String(ModuleRes(STR_ALL_VIEWS)); else sRootEntryText = String(ModuleRes(STR_ALL_TABLES_AND_VIEWS)); - pAllObjects = InsertEntry( sRootEntryText, NULL, FALSE, LIST_APPEND, reinterpret_cast< void* >( DatabaseObjectFolder::ALL_TABLES ) ); + pAllObjects = InsertEntry( sRootEntryText, NULL, FALSE, LIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::ALL_TABLES ) ); } if ( _rTables.empty() ) @@ -475,9 +475,9 @@ // +- table sal_Bool bCatalogAtStart = _rxMeta->isCatalogAtStart(); ::rtl::OUString& nFirstName = bCatalogAtStart ? sCatalog : sSchema; - sal_Int32 nFirstFolderType = bCatalogAtStart ? DatabaseObjectFolder::CATALOG : DatabaseObjectFolder::SCHEMA; + sal_Int32 nFirstFolderType = bCatalogAtStart ? DatabaseObjectContainer::CATALOG : DatabaseObjectContainer::SCHEMA; ::rtl::OUString& nSecondName = bCatalogAtStart ? sSchema : sCatalog; - sal_Int32 nSecondFolderType = bCatalogAtStart ? DatabaseObjectFolder::SCHEMA : DatabaseObjectFolder::CATALOG; + sal_Int32 nSecondFolderType = bCatalogAtStart ? DatabaseObjectContainer::SCHEMA : DatabaseObjectContainer::CATALOG; if ( nFirstName.getLength() ) { @@ -518,30 +518,30 @@ sal_Int32 nEntryType = reinterpret_cast< sal_IntPtr >( _pEntry->GetUserData() ); - if ( nEntryType == DatabaseObjectFolder::ALL_TABLES ) + if ( nEntryType == DatabaseObjectContainer::ALL_TABLES ) { - aObject.Type = DatabaseObjectFolder::ALL_TABLES; + aObject.Type = DatabaseObjectContainer::ALL_TABLES; } - else if ( ( nEntryType == DatabaseObjectFolder::CATALOG ) - || ( nEntryType == DatabaseObjectFolder::SCHEMA ) + else if ( ( nEntryType == DatabaseObjectContainer::CATALOG ) + || ( nEntryType == DatabaseObjectContainer::SCHEMA ) ) { SvLBoxEntry* pParent = GetParent( _pEntry ); sal_Int32 nParentEntryType = pParent ? reinterpret_cast< sal_IntPtr >( pParent->GetUserData() ) : -1; ::rtl::OUStringBuffer buffer; - if ( nEntryType == DatabaseObjectFolder::CATALOG ) + if ( nEntryType == DatabaseObjectContainer::CATALOG ) { - if ( nParentEntryType == DatabaseObjectFolder::SCHEMA ) + if ( nParentEntryType == DatabaseObjectContainer::SCHEMA ) { buffer.append( GetEntryText( pParent ) ); buffer.append( sal_Unicode( '.' ) ); } buffer.append( GetEntryText( _pEntry ) ); } - else if ( nEntryType == DatabaseObjectFolder::SCHEMA ) + else if ( nEntryType == DatabaseObjectContainer::SCHEMA ) { - if ( nParentEntryType == DatabaseObjectFolder::CATALOG ) + if ( nParentEntryType == DatabaseObjectContainer::CATALOG ) { buffer.append( GetEntryText( pParent ) ); buffer.append( sal_Unicode( '.' ) ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
