Tag: cws_dev300_dba31b User: oj Date: 2008-08-12 10:27:45+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: #i92092# moved dsntypes to dba 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.63.20.3&r2=1.63.20.4 Delta lines: +1 -7 ------------------- --- AppController.cxx 2008-08-12 10:25:34+0000 1.63.20.3 +++ AppController.cxx 2008-08-12 10:27:42+0000 1.63.20.4 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AppController.cxx,v $ - * $Revision: 1.63.20.3 $ + * $Revision: 1.63.20.4 $ * * This file is part of OpenOffice.org. * @@ -1023,12 +1023,7 @@ aReturn.bEnabled = m_xDataSource.is(); if ( aReturn.bEnabled ) { -<<<<<<< AppController.cxx ::dbaccess::DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); - ::rtl::OUString sDSTypeName = m_aTypeCollection.getTypeDisplayName(eType); - aReturn.sTitle = sDSTypeName; -======= - DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); ::rtl::OUString sDSTypeName; if ( m_aTypeCollection.isEmbeddedDatabase( eType ) ) { @@ -1039,7 +1034,6 @@ sDSTypeName = m_aTypeCollection.getTypeDisplayName(eType); } aReturn.sTitle = sDSTypeName; ->>>>>>> 1.63.20.2 } break; case SID_DB_APP_STATUS_DBNAME: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
