INTEGRATION: CWS dba24b (1.11.28); FILE MERGED

2007/08/29 11:57:35 fs 1.11.28.2: during #i80930#: getDefaultDatabaseType
2007/08/28 13:29:13 fs 1.11.28.1: +declareAuthDepPath

1 files changed, 19 insertions, 3 deletions

diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 68eadcba1413..919ac122fd1c 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbwizsetup.hxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-06 08:28:45 $
+ *  last change: $Author: hr $ $Date: 2007-11-01 15:21:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -133,7 +133,7 @@ public:
     virtual SfxItemSet* getWriteOutputSet();
 
     // forwards to ODbDataSourceAdministrationHelper
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB();
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const;
     virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection();
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver();
     virtual DATASOURCE_TYPE     getDatasourceType(const SfxItemSet& _rSet) const;
@@ -176,6 +176,20 @@ protected:
     };
 
 private:
+    /** declares a path with or without authentication, as indicated by the database type
+
+        @param _eType
+            the data source type for which the path is declared. If this
+            data source type does not support authentication, the PAGE_DBSETUPWIZARD_AUTHENTIFICATION
+            state will be stripped from the sequence of states.
+        @param _nPathId
+            the ID of the path
+        @path
+            the first state in this path, following by an arbitrary number of others, as in
+            RoadmapWizard::declarePath.
+    */
+    void declareAuthDepPath( DATASOURCE_TYPE _eType, PathId _nPathId, WizardState _nFirstState, ... );
+
     void RegisterDataSourceByLocation(const ::rtl::OUString& sPath);
     sal_Bool SaveDatabaseDocument();
     void activateDatabasePath();
@@ -184,6 +198,8 @@ private:
     void createUniqueFolderName(INetURLObject* pURL);
     DATASOURCE_TYPE VerifyDataSourceType(const DATASOURCE_TYPE _DatabaseType) const;
 
+    DATASOURCE_TYPE getDefaultDatabaseType() const;
+
     void updateTypeDependentStates();
     sal_Bool callSaveAsDialog();
     sal_Bool IsConnectionUrlRequired();