Tag: cws_src680_dba24b
User: fs      
Date: 2007-08-27 10:55:07+0000
Modified:
   dba/dbaccess/source/ui/app/AppController.cxx

Log:
 prepare #i80930#: advanced settings enabled according to DataSourceMetaData, 
not with hard-coded list of supporting types

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.44&r2=1.44.6.1
Delta lines:  +8 -11
--------------------
--- AppController.cxx   2007-08-03 12:47:47+0000        1.44
+++ AppController.cxx   2007-08-27 10:55:04+0000        1.44.6.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: AppController.cxx,v $
  *
- *  $Revision: 1.44 $
+ *  $Revision: 1.44.6.1 $
  *
- *  last change: $Author: hr $ $Date: 2007/08/03 12:47:47 $
+ *  last change: $Author: fs $ $Date: 2007/08/27 10:55:04 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,12 +36,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
 
-#ifndef DBAUI_APPCONTROLLER_HXX
 #include "AppController.hxx"
-#endif
-#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"
-#endif
+#include "advancedsettingsdlg.hxx"
+
 /** === begin UNO includes === **/
 #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -787,8 +785,7 @@
                                break;
                        case SID_DB_APP_DSUSERADMIN:
                        {
-                               ODsnTypeCollection aTypeCollection;
-                               DATASOURCE_TYPE eType = 
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;
                        }
                        break;
@@ -821,8 +818,8 @@
                 aReturn.bEnabled = m_xDataSource.is();
                                if ( aReturn.bEnabled )
                                {
-                                       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;
+                                       DATASOURCE_TYPE eType = 
m_aTypeCollection.getType( ::comphelper::getString( 
m_xDataSource->getPropertyValue( PROPERTY_URL ) ) );
+                    aReturn.bEnabled = 
AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( eType );
                                }
                                break;
                        case SID_DB_APP_CONVERTTOVIEW:




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to