Tag: cws_dev300_dba30d User: fs Date: 2008-06-10 08:32:46+0000 Modified: dba/dbaccess/source/ui/inc/unodatbr.hxx
Log: #i80943# EntryType values now defined via DatabaseObject(Container) File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: unodatbr.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/unodatbr.hxx?r1=1.72.30.2&r2=1.72.30.3 Delta lines: +16 -10 --------------------- --- unodatbr.hxx 2008-06-01 20:54:56+0000 1.72.30.2 +++ unodatbr.hxx 2008-06-10 08:32:43+0000 1.72.30.3 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unodatbr.hxx,v $ - * $Revision: 1.72.30.2 $ + * $Revision: 1.72.30.3 $ * * This file is part of OpenOffice.org. * @@ -64,6 +64,12 @@ #ifndef _COM_SUN_STAR_UI_XCONTEXTMENUINTERCEPTION_HPP_ #include <com/sun/star/ui/XContextMenuInterception.hpp> #endif +#ifndef _COM_SUN_STAR_SDB_APPLICATION_DATABASEOBJECT_HPP_ +#include <com/sun/star/sdb/application/DatabaseObject.hpp> +#endif +#ifndef _COM_SUN_STAR_SDB_APPLICATION_DATABASEOBJECTCONTAINER_HPP_ +#include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp> +#endif #ifndef _CPPUHELPER_IMPLBASE4_HXX_ #include <cppuhelper/implbase4.hxx> #endif @@ -94,9 +100,6 @@ class Splitter; struct SvSortData; -#define CONTAINER_QUERIES sal_Int32( etQuery - etQuery ) -#define CONTAINER_TABLES sal_Int32( etTableOrView - etQuery ) - namespace com { namespace sun{ namespace star { namespace container { class XNameContainer; } } } } class SvLBoxTreeList; @@ -181,13 +184,16 @@ enum EntryType { - etDatasource, - etQueryContainer, - etTableContainer, - etQuery, - etTableOrView, - etUnknown + // don't change the above definitions! There are places (in particular SbaTableQueryBrowser::getCurrentSelection) + // which rely on the fact that the EntryType values really equal the DatabaseObject(Container) values! + etDatasource = ::com::sun::star::sdb::application::DatabaseObjectContainer::DATA_SOURCE, + etQueryContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer::ALL_QUERIES, + etTableContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer::ALL_TABLES, + etQuery = ::com::sun::star::sdb::application::DatabaseObject::QUERY, + etTableOrView = ::com::sun::star::sdb::application::DatabaseObject::TABLE, + etUnknown = -1 }; + /** returns a DatabaseObject value corresponding to the given EntryType @param _eType the entry type. Must not be etUnknown. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
