diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 14:58:12 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 14:58:12 +0000 |
commit | 121d78bf03d5ba2627062f1a6e2b9652746b3606 (patch) | |
tree | db8b172da4c2b7ecf09cee6eeb953ed3f9d949a3 /dbaccess/source/ui/dlg/generalpage.hxx | |
parent | 98f8d5101a319598f1c82aad00047c30f82ef3ba (diff) |
INTEGRATION: CWS dba24c (1.18.58); FILE MERGED
2007/10/29 22:44:08 fs 1.18.58.2: merging changes from CWS dba24b herein, to not wait for later resync
2007/09/19 08:51:33 fs 1.18.58.1: dialogcontrolling.hxx is dead, has been re-incarnated as svtools/dialogcontrolling a while ago
Diffstat (limited to 'dbaccess/source/ui/dlg/generalpage.hxx')
-rw-r--r-- | dbaccess/source/ui/dlg/generalpage.hxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index b223e03abc83..44faf6ca2b42 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -4,9 +4,9 @@ * * $RCSfile: generalpage.hxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: hr $ $Date: 2007-11-01 15:13:35 $ + * last change: $Author: ihi $ $Date: 2007-11-21 15:58:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,6 +51,7 @@ #ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> #endif +#include <svtools/dialogcontrolling.hxx> #include <memory> //......................................................................... @@ -58,7 +59,6 @@ namespace dbaui { //......................................................................... class IDatabaseSettingsDialog; - class RadioDependentEnabler; //========================================================================= //= OGeneralPage //========================================================================= @@ -105,10 +105,8 @@ namespace dbaui CreationMode m_eOriginalCreationMode; DocumentDescriptor m_aBrowsedDocument; - ::std::auto_ptr< RadioDependentEnabler > - m_pSelectTypeController; - ::std::auto_ptr< RadioDependentEnabler > - m_pOpenDocController; + ::svt::ControlDependencyManager + m_aControlDependencies; ODsnTypeCollection* m_pCollection; /// the DSN type collection instance |