Tag: cws_ood680_os2port01 User: obr Date: 2007-09-05 07:15:16+0000 Modified: dba/dbaccess/source/ui/dlg/odbcconfig.hxx
Log: RESYNC: (1.6-1.7); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: odbcconfig.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/odbcconfig.hxx?r1=1.6.106.1&r2=1.6.106.2 Delta lines: +20 -20 --------------------- --- odbcconfig.hxx 2006-12-28 14:54:08+0000 1.6.106.1 +++ odbcconfig.hxx 2007-09-05 07:15:14+0000 1.6.106.2 @@ -36,19 +36,20 @@ #ifndef _DBAUI_ODBC_CONFIG_HXX_ #define _DBAUI_ODBC_CONFIG_HXX_ +#include "commontypes.hxx" + #if defined(WIN) || defined(WNT) || defined (UNX) #define HAVE_ODBC_SUPPORT #endif + #if ( defined(WIN) || defined(WNT) ) && defined(HAVE_ODBC_SUPPORT) #define HAVE_ODBC_ADMINISTRATION #endif -#ifndef _OSL_MODULE_H_ +#include <tools/link.hxx> #include <osl/module.h> -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ -#include "commontypes.hxx" -#endif + +#include <memory> //......................................................................... namespace dbaui @@ -123,22 +124,21 @@ //========================================================================= //= OOdbcManagement //========================================================================= -class OOdbcManagement : public OOdbcLibWrapper +#ifdef HAVE_ODBC_ADMINISTRATION +class ProcessTerminationWait; +class OOdbcManagement { -#ifdef HAVE_ODBC_SUPPORT - // entry points for ODBC administration - oslGenericFunction m_pSQLManageDataSource; - oslModule m_pOdbcLib; - - OdbcTypesImpl* m_pImpl; - // needed because we can't have a member of type SQLHANDLE: this would require us to include the respective - // ODBC file, which would lead to a lot of conflicts with other includes -#endif + ::std::auto_ptr< ProcessTerminationWait > m_pProcessWait; + Link m_aAsyncFinishCallback; public: - OOdbcManagement(); - void manageDataSources(void* _pParentSysWindowHandle); + OOdbcManagement( const Link& _rAsyncFinishCallback ); + ~OOdbcManagement(); + + bool manageDataSources_async(); + bool isRunning() const; }; +#endif //......................................................................... } // namespace dbaui --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
