Tag: cws_dev300_dba30d User: fs Date: 2008-06-10 08:34:47+0000 Modified: dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx
Log: DatabaseObjectFolder renamed to DatabaseObjectContainer File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppDetailPageHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.32.10.3&r2=1.32.10.4 Delta lines: +11 -12 --------------------- --- AppDetailPageHelper.cxx 2008-06-09 13:45:43+0000 1.32.10.3 +++ AppDetailPageHelper.cxx 2008-06-10 08:34:44+0000 1.32.10.4 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AppDetailPageHelper.cxx,v $ - * $Revision: 1.32.10.3 $ + * $Revision: 1.32.10.4 $ * * This file is part of OpenOffice.org. * @@ -124,7 +124,7 @@ #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #endif #include <com/sun/star/sdb/application/DatabaseObject.hpp> -#include <com/sun/star/sdb/application/DatabaseObjectFolder.hpp> +#include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp> #ifndef DBAUI_APPVIEW_HXX #include "AppView.hxx" #endif @@ -183,7 +183,7 @@ using namespace ::com::sun::star; namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject; -namespace DatabaseObjectFolder = ::com::sun::star::sdb::application::DatabaseObjectFolder; +namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer; namespace { @@ -469,7 +469,6 @@ return; ::std::vector< NamedDatabaseObject > aSelected; - aSelected.reserve( pList->GetEntryCount() ); SvLBoxEntry* pEntry = pList->FirstSelected(); while( pEntry ) @@ -507,7 +506,7 @@ if ( isLeaf( pEntry ) ) aObject.Type = ( eType == E_FORM ) ? DatabaseObject::FORM : DatabaseObject::REPORT; else - aObject.Type = ( eType == E_FORM ) ? DatabaseObjectFolder::FORMS_FOLDER : DatabaseObjectFolder::REPORTS_FOLDER; + aObject.Type = ( eType == E_FORM ) ? DatabaseObjectContainer::FORMS_FOLDER : DatabaseObjectContainer::REPORTS_FOLDER; aObject.Name = sName; } break; @@ -651,11 +650,11 @@ bool OAppDetailPageHelper::isLeaf(SvLBoxEntry* _pEntry) const { sal_Int32 nEntryType = reinterpret_cast< sal_IntPtr >( _pEntry->GetUserData() ); - if ( ( nEntryType == DatabaseObjectFolder::ALL_TABLES ) - || ( nEntryType == DatabaseObjectFolder::CATALOG ) - || ( nEntryType == DatabaseObjectFolder::SCHEMA ) - || ( nEntryType == DatabaseObjectFolder::FORMS_FOLDER ) - || ( nEntryType == DatabaseObjectFolder::REPORTS_FOLDER ) + if ( ( nEntryType == DatabaseObjectContainer::ALL_TABLES ) + || ( nEntryType == DatabaseObjectContainer::CATALOG ) + || ( nEntryType == DatabaseObjectContainer::SCHEMA ) + || ( nEntryType == DatabaseObjectContainer::FORMS_FOLDER ) + || ( nEntryType == DatabaseObjectContainer::REPORTS_FOLDER ) ) return false; @@ -820,8 +819,8 @@ static sal_Int32 lcl_getFolderIndicatorForType( const ElementType _eType ) { const sal_Int32 nFolderIndicator = - ( _eType == E_FORM ) ? DatabaseObjectFolder::FORMS_FOLDER - : ( _eType == E_REPORT ) ? DatabaseObjectFolder::REPORTS_FOLDER : -1; + ( _eType == E_FORM ) ? DatabaseObjectContainer::FORMS_FOLDER + : ( _eType == E_REPORT ) ? DatabaseObjectContainer::REPORTS_FOLDER : -1; return nFolderIndicator; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
