Tag: cws_src680_oj14 User: oj Date: 2006/11/08 03:15:44 Modified: dba/dbaccess/inc/singledoccontroller.hxx
Log: merge conflicts resolved File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: singledoccontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/singledoccontroller.hxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +16 -5 -------------------- --- singledoccontroller.hxx 25 Apr 2006 13:06:21 -0000 1.1.2.2 +++ singledoccontroller.hxx 8 Nov 2006 11:15:41 -0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: singledoccontroller.hxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2006/04/25 13:06:21 $ + * last change: $Author: oj $ $Date: 2006/11/08 11:15:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -57,6 +57,9 @@ #ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_ #include <com/sun/star/sdbc/XDataSource.hpp> #endif +#ifndef _DBAUI_COMMON_TYPES_HXX_ +#include "commontypes.hxx" +#endif #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #endif @@ -66,6 +69,9 @@ #ifndef DBACCESS_SOURCE_UI_INC_DOCUMENTCONTROLLER_HXX #include "documentcontroller.hxx" #endif +#ifndef CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX +#include <connectivity/dbmetadata.hxx> +#endif #ifndef _UNDO_HXX #include <svtools/undo.hxx> #endif @@ -146,6 +152,11 @@ getDataSource() const; sal_Bool haveDataSource() const; + + /** provides to the SDB-level database meta data of the current connection + */ + const ::dbtools::DatabaseMetaData& getSdbMetaData() const; + // IEnvironment /** appends an error in the current environment. @param _aException --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
