INTEGRATION: CWS macaddressbook01 (1.41.22); FILE MERGED

2007/07/09 23:15:52 ericb 1.41.22.2: RESYNC: (1.41-1.42); FILE MERGED
2007/07/08 19:08:12 msicotte 1.41.22.1: #i77591# initial commit
This commit is contained in:
Ivo Hinkelmann 2007-09-13 16:57:53 +00:00
parent 4c55147ce0
commit b813961852

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: AppController.cxx,v $ * $RCSfile: AppController.cxx,v $
* *
* $Revision: 1.45 $ * $Revision: 1.46 $
* *
* last change: $Author: ihi $ $Date: 2007-09-11 10:33:21 $ * last change: $Author: ihi $ $Date: 2007-09-13 17:57:53 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -805,7 +805,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
if ( aReturn.bEnabled ) if ( aReturn.bEnabled )
{ {
DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL)));
aReturn.bEnabled = DST_EMBEDDED != eType && DST_MOZILLA != eType && DST_EVOLUTION != eType && DST_KAB != eType && DST_OUTLOOK != eType && DST_OUTLOOKEXP != eType; aReturn.bEnabled = DST_EMBEDDED != eType && DST_MOZILLA != eType && DST_EVOLUTION != eType && DST_KAB != eType && DST_MACAB != eType && DST_OUTLOOK != eType && DST_OUTLOOKEXP != eType;
} }
break; break;
case SID_DB_APP_DSCONNECTION_TYPE: case SID_DB_APP_DSCONNECTION_TYPE:
@ -821,7 +821,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
if ( aReturn.bEnabled ) if ( aReturn.bEnabled )
{ {
DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL)));
aReturn.bEnabled = DST_EMBEDDED != eType && DST_LDAP != eType && DST_CALC != eType && DST_MOZILLA != eType && DST_THUNDERBIRD != eType && DST_EVOLUTION != eType && DST_KAB != eType && DST_OUTLOOK != eType && DST_OUTLOOKEXP != eType; aReturn.bEnabled = DST_EMBEDDED != eType && DST_LDAP != eType && DST_CALC != eType && DST_MOZILLA != eType && DST_THUNDERBIRD != eType && DST_EVOLUTION != eType && DST_KAB != eType && DST_MACAB != eType && DST_OUTLOOK != eType && DST_OUTLOOKEXP != eType;
} }
break; break;
case SID_DB_APP_CONVERTTOVIEW: case SID_DB_APP_CONVERTTOVIEW: