User: kz Date: 2006/10/05 05:59:48 Modified: dba/dbaccess/source/ui/app/AppControllerGen.cxx
Log: INTEGRATION: CWS hsqlcsvstage1 (1.21.2); FILE MERGED 2006/09/20 19:29:04 fs 1.21.2.2: #i10000# 2006/09/20 11:43:55 fs 1.21.2.1: #i69696#, being stage 1 of issue #i69526#: merging changes from CWS hsqlcsv herein File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppControllerGen.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerGen.cxx?r1=1.21&r2=1.22 Delta lines: +45 -1 -------------------- --- AppControllerGen.cxx 17 Sep 2006 06:54:17 -0000 1.21 +++ AppControllerGen.cxx 5 Oct 2006 12:59:46 -0000 1.22 @@ -142,6 +142,7 @@ using namespace ::dbtools; using namespace ::svx; using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::awt; using namespace ::com::sun::star::util; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; @@ -184,7 +185,7 @@ Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject); if ( !xView.is() ) throw SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); - getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView),xConnection); + getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView)); } } catch(SQLContext& e) { showError(SQLExceptionInfo(e)); } @@ -325,6 +326,49 @@ aEvt.Source = m_xModel; modified(aEvt); } + +// ----------------------------------------------------------------------------- +Reference< XDataSource > SAL_CALL OApplicationController::getDataSource() throw (RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + Reference< XDataSource > xDataSource( m_xDataSource, UNO_QUERY ); + return xDataSource; +} + +// ----------------------------------------------------------------------------- +Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow() throw (RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + Reference< XFrame > xFrame( getFrame(), UNO_QUERY_THROW ); + Reference< XWindow > xWindow( xFrame->getContainerWindow(), UNO_QUERY_THROW ); + return xWindow; +} + +// ----------------------------------------------------------------------------- +Reference< XConnection > SAL_CALL OApplicationController::getActiveConnection() throw (RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_xDataSourceConnection.getTyped(); +} + +// ----------------------------------------------------------------------------- +::sal_Bool SAL_CALL OApplicationController::isConnected( ) throw (RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_xDataSourceConnection.is(); +} + +// ----------------------------------------------------------------------------- +::sal_Bool SAL_CALL OApplicationController::connect( ) throw (RuntimeException) +{ + ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::osl::MutexGuard aGuard(m_aMutex); + + ensureConnection(); + return isConnected(); +} + + // ----------------------------------------------------------------------------- void OApplicationController::previewChanged( sal_Int32 _nMode ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
