Tag: cws_src680_dba25 User: oj Date: 05/03/03 23:18:26 Modified: /dba/dbaccess/source/ui/inc/ UserAdminDlg.hxx, unoadmin.hxx, unodatbr.hxx
Log: #i43912# use set connection as activeconnection File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: UserAdminDlg.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/UserAdminDlg.hxx?r1=1.3&r2=1.3.38.1 Delta lines: +6 -4 ------------------- --- UserAdminDlg.hxx 21 Jan 2005 17:17:44 -0000 1.3 +++ UserAdminDlg.hxx 4 Mar 2005 07:18:23 -0000 1.3.38.1 @@ -2,9 +2,9 @@ * * $RCSfile: UserAdminDlg.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.38.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 17:17:44 $ + * last change: $Author: oj $ $Date: 2005/03/04 07:18:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,13 +99,15 @@ ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pItemSet; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + sal_Bool m_bOwnConnection; protected: virtual void PageCreated(USHORT _nId, SfxTabPage& _rPage); public: OUserAdminDlg( Window* _pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB - ,const ::com::sun::star::uno::Any& _aDataSourceName); + ,const ::com::sun::star::uno::Any& _aDataSourceName + ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); virtual ~OUserAdminDlg(); File [changed]: unoadmin.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/unoadmin.hxx?r1=1.8&r2=1.8.102.1 Delta lines: +7 -3 ------------------- --- unoadmin.hxx 2 Aug 2004 16:03:36 -0000 1.8 +++ unoadmin.hxx 4 Mar 2005 07:18:23 -0000 1.8.102.1 @@ -2,9 +2,9 @@ * * $RCSfile: unoadmin.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.102.1 $ * - * last change: $Author: hr $ $Date: 2004/08/02 16:03:36 $ + * last change: $Author: oj $ $Date: 2005/03/04 07:18:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,9 @@ #ifndef _SVT_GENERICUNODIALOG_HXX_ #include <svtools/genericunodialog.hxx> #endif +#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ +#include <com/sun/star/sdbc/XConnection.hpp> +#endif #ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" #endif @@ -98,6 +101,7 @@ ODsnTypeCollection* m_pCollection; // datasource type collection ::com::sun::star::uno::Any m_aInitialSelection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; protected: ODatabaseAdministrationDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); File [changed]: unodatbr.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/unodatbr.hxx?r1=1.58&r2=1.58.38.1 Delta lines: +12 -6 -------------------- --- unodatbr.hxx 21 Jan 2005 17:19:32 -0000 1.58 +++ unodatbr.hxx 4 Mar 2005 07:18:23 -0000 1.58.38.1 @@ -2,9 +2,9 @@ * * $RCSfile: unodatbr.hxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.58.38.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 17:19:32 $ + * last change: $Author: oj $ $Date: 2005/03/04 07:18:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,9 @@ #ifndef _SBA_BWRCTRLR_HXX #include "brwctrlr.hxx" #endif - +#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ +#include <com/sun/star/sdbc/XConnection.hpp> +#endif #ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> #endif @@ -180,6 +182,7 @@ sal_Bool m_bShowMenu; // if TRUE the menu should be visible otherwise not sal_Bool m_bInSuspend; sal_Bool m_bEnableBrowser; + sal_Bool m_bOwnConnection; /** updateTitle will be called when a new frame is attached @@ -331,7 +334,9 @@ */ void implAddDatasource(const String& _rDbName, Image& _rDbImage, String& _rQueryName, Image& _rQueryImage, - String& _rTableName, Image& _rTableImage); + String& _rTableName, Image& _rTableImage + ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection + ); /// clears the tree list box void clearTreeModel(); @@ -446,7 +451,8 @@ SvLBoxEntry* getObjectEntry( const ::rtl::OUString& _rDataSource, const ::rtl::OUString& _rCommand, sal_Int32 _nCommandType, SvLBoxEntry** _ppDataSourceEntry = NULL, SvLBoxEntry** _ppContainerEntry = NULL, - sal_Bool _bExpandAncestors = sal_True + sal_Bool _bExpandAncestors = sal_True, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection = NULL ); /// checks if m_aDocumentDataSource describes a known object --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
