Tag: cws_src680_oj14 User: oj Date: 05/10/31 04:21:06 Modified: /dba/connectivity/source/types/ makefile.mk /dba/connectivity/source/commontools/ dbtools.cxx
Log: findDataSource now also use XOfficeDatabaseDocument File Changes: Directory: /dba/connectivity/source/types/ ========================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/types/makefile.mk?r1=1.6&r2=1.6.26.1 Delta lines: +4 -3 ------------------- --- makefile.mk 8 Sep 2005 07:49:29 -0000 1.6 +++ makefile.mk 31 Oct 2005 12:21:03 -0000 1.6.26.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.6.26.1 $ # -# last change: $Author: rt $ $Date: 2005/09/08 07:49:29 $ +# last change: $Author: oj $ $Date: 2005/10/31 12:21:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -125,6 +125,7 @@ com.sun.star.sdbcx.PrivilegeObject \ com.sun.star.sdb.SQLFilterOperator \ com.sun.star.sdb.XColumnUpdate \ + com.sun.star.sdb.XOfficeDatabaseDocument \ com.sun.star.sdb.XColumn Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbtools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools.cxx?r1=1.57&r2=1.57.14.1 Delta lines: +12 -4 -------------------- --- dbtools.cxx 23 Sep 2005 11:36:41 -0000 1.57 +++ dbtools.cxx 31 Oct 2005 12:21:03 -0000 1.57.14.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbtools.cxx,v $ * - * $Revision: 1.57 $ + * $Revision: 1.57.14.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 11:36:41 $ + * last change: $Author: oj $ $Date: 2005/10/31 12:21:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -92,6 +92,9 @@ #ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #endif +#ifndef _COM_SUN_STAR_SDB_XOFFICEDATABASEDOCUMENT_HPP_ +#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> +#endif #ifndef _COM_SUN_STAR_SDB_COMMANDTYPE_HPP_ #include <com/sun/star/sdb/CommandType.hpp> #endif @@ -1217,7 +1220,12 @@ // ----------------------------------------------------------------------------- Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent) { - Reference< XDataSource> xDataSource(_xParent, UNO_QUERY); + Reference< XOfficeDatabaseDocument> xDatabaseDocument(_xParent, UNO_QUERY); + Reference< XDataSource> xDataSource; + if ( xDatabaseDocument.is() ) + xDataSource = xDatabaseDocument->getDataSource(); + if ( !xDataSource.is() ) + xDataSource.set(_xParent, UNO_QUERY); if (!xDataSource.is()) { Reference< XChild> xChild(_xParent, UNO_QUERY); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
