User: obo Date: 2006/10/12 07:16:19 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: INTEGRATION: CWS sb59 (1.32.4); FILE MERGED 2006/09/08 08:22:13 sb 1.32.4.3: Manually resolved merge conflicts against SRC680m183. 2006/08/29 11:44:25 sb 1.32.4.2: #i67487# Made code warning-free (wntmsci10). 2006/08/22 08:09:34 sb 1.32.4.1: #i67487# Made code warning-free (wntmsci10). 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.35&r2=1.36 Delta lines: +4 -3 ------------------- --- AppController.cxx 5 Oct 2006 12:59:07 -0000 1.35 +++ AppController.cxx 12 Oct 2006 14:16:16 -0000 1.36 @@ -107,6 +107,7 @@ #ifndef _COM_SUN_STAR_UTIL_XFLUSHABLE_HPP_ #include <com/sun/star/util/XFlushable.hpp> #endif +#include "com/sun/star/ui/dialogs/TemplateDescription.hpp" /** === end UNO includes === **/ #ifndef _TOOLS_DEBUG_HXX @@ -780,8 +781,8 @@ } break; case SID_DB_APP_DSCONNECTION_TYPE: - aReturn.bEnabled = !isDataSourceReadOnly(); - if ( aReturn.bEnabled && m_xDataSource.is() ) + aReturn.bEnabled = !isDataSourceReadOnly() && m_xDataSource.is(); + if ( aReturn.bEnabled ) { DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); aReturn.bEnabled = DST_EMBEDDED != eType; @@ -1055,7 +1056,7 @@ if ( !sUrl.getLength() ) sUrl = SvtPathOptions().GetWorkPath(); - ::sfx2::FileDialogHelper aFileDlg( ::sfx2::FILESAVE_AUTOEXTENSION,static_cast<sal_uInt32>(nBits) ,getView()); + ::sfx2::FileDialogHelper aFileDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,static_cast<sal_uInt32>(nBits) ,getView()); aFileDlg.SetDisplayDirectory( sUrl ); const SfxFilter* pFilter = getStandardDatabaseFilter(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
