User: rt Date: 2008-01-29 14:07:02+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: INTEGRATION: CWS reportdesign02 (1.47.16); FILE MERGED 2007/12/20 08:29:32 oj 1.47.16.3: #i82914# check report engine service name 2007/12/20 07:51:10 oj 1.47.16.2: RESYNC: (1.47-1.50); FILE MERGED 2007/10/26 11:05:06 oj 1.47.16.1: #i82914# check report engine service name File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.51&r2=1.52 Delta lines: +12 -10 --------------------- --- AppController.cxx 2008-01-29 08:51:32+0000 1.51 +++ AppController.cxx 2008-01-29 14:07:00+0000 1.52 @@ -526,13 +526,11 @@ "OApplicationController::disposing: the below code will ignore this call - why?" ); if ( getContainer() && getContainer()->getElementType() == E_TABLE ) - { + getContainer()->clearPages(); if ( m_xDataSourceConnection == xCon ) { - getContainer()->clearPages(); - m_xDataSourceConnection.clear(); m_xMetaData.clear(); - } + m_xDataSourceConnection.clear(); } } else if ( _rSource.Source == m_xModel ) @@ -687,11 +685,15 @@ aReturn.bEnabled = xEnumAccess.is(); if ( aReturn.bEnabled ) { - static ::rtl::OUString s_sReportDesign(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.pentaho.SOReportJobFactory")); - Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(s_sReportDesign); + const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_xServiceFactory); + aReturn.bEnabled = sReportEngineServiceName.getLength() != 0; + if ( aReturn.bEnabled ) + { + const Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(sReportEngineServiceName); aReturn.bEnabled = xEnumDrivers.is() && xEnumDrivers->hasMoreElements(); } } + } break; case SID_DB_APP_VIEW_TABLES: aReturn.bEnabled = sal_True; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
