Tag: cws_src680_dba23a User: fs Date: 2007/03/13 01:42:19 Modified: dba/dbaccess/source/ui/dlg/AdabasStatDlg.cxx dba/dbaccess/source/ui/dlg/AdvancedPageDlg.cxx dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx dba/dbaccess/source/ui/dlg/ConnectionHelper.hxx dba/dbaccess/source/ui/dlg/ConnectionPage.cxx dba/dbaccess/source/ui/dlg/ConnectionPage.hxx dba/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx dba/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx dba/dbaccess/source/ui/dlg/TextConnectionHelper.cxx dba/dbaccess/source/ui/dlg/TextConnectionHelper.hxx dba/dbaccess/source/ui/dlg/UserAdminDlg.cxx dba/dbaccess/source/ui/dlg/adminpages.cxx dba/dbaccess/source/ui/dlg/adminpages.hxx dba/dbaccess/source/ui/dlg/dbadmin.cxx dba/dbaccess/source/ui/dlg/dbwiz.cxx dba/dbaccess/source/ui/dlg/dbwizsetup.cxx dba/dbaccess/source/ui/dlg/detailpages.cxx dba/dbaccess/source/ui/dlg/detailpages.hxx dba/dbaccess/source/ui/dlg/generalpage.hxx dba/dbaccess/source/ui/dlg/tablespage.cxx dba/dbaccess/source/ui/dlg/tablespage.hxx dba/dbaccess/source/ui/inc/AdabasStatDlg.hxx dba/dbaccess/source/ui/inc/AdvancedPageDlg.hxx dba/dbaccess/source/ui/inc/IItemSetHelper.hxx dba/dbaccess/source/ui/inc/UserAdminDlg.hxx dba/dbaccess/source/ui/inc/dbadmin.hxx dba/dbaccess/source/ui/inc/dbwiz.hxx dba/dbaccess/source/ui/inc/dbwizsetup.hxx dba/dbaccess/source/ui/inc/unoadmin.hxx
Log: some slight re-factoring (class/method renaming), plus some rudimentary fix for #b6532894# File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: AdabasStatDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AdabasStatDlg.cxx?r1=1.10&r2=1.10.72.1 Delta lines: +8 -3 ------------------- --- AdabasStatDlg.cxx 17 Sep 2006 07:03:54 -0000 1.10 +++ AdabasStatDlg.cxx 13 Mar 2007 08:42:11 -0000 1.10.72.1 @@ -4,9 +4,9 @@ * * $RCSfile: AdabasStatDlg.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.72.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 07:03:54 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -201,6 +201,11 @@ { SetText(_sTitle); } + //------------------------------------------------------------------------- + void OAdabasStatPageDlg::enableConfirmSettings( bool _bEnable ) + { + (void)_bEnable; + } //------------------------------------------------------------------------- sal_Bool OAdabasStatPageDlg::saveDatasource() { File [changed]: AdvancedPageDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AdvancedPageDlg.cxx?r1=1.10&r2=1.10.28.1 Delta lines: +8 -3 ------------------- --- AdvancedPageDlg.cxx 13 Dec 2006 16:47:32 -0000 1.10 +++ AdvancedPageDlg.cxx 13 Mar 2007 08:42:11 -0000 1.10.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: AdvancedPageDlg.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.28.1 $ * - * last change: $Author: kz $ $Date: 2006/12/13 16:47:32 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -246,6 +246,11 @@ { SetText(_sTitle); } + //------------------------------------------------------------------------- + void OAdvancedTabPageDlg::enableConfirmSettings( bool _bEnable ) + { + (void)_bEnable; + } //------------------------------------------------------------------------- sal_Bool OAdvancedTabPageDlg::saveDatasource() { File [changed]: ConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx?r1=1.11.70.1&r2=1.11.70.2 Delta lines: +28 -12 --------------------- --- ConnectionHelper.cxx 26 Feb 2007 10:33:59 -0000 1.11.70.1 +++ ConnectionHelper.cxx 13 Mar 2007 08:42:12 -0000 1.11.70.2 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionHelper.cxx,v $ * - * $Revision: 1.11.70.1 $ + * $Revision: 1.11.70.2 $ * - * last change: $Author: fs $ $Date: 2007/02/26 10:33:59 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -250,11 +250,26 @@ checkTestConnection(); m_aET_Connection.ClearModifyFlag(); } + OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } + // ----------------------------------------------------------------------- + void OConnectionHelper::implUpdateURLDependentStates() const + { + OSL_PRECOND( m_pAdminDialog, "OConnectionHelper::implUpdateURLDependentStates: no admin dialog!" ); + if ( !m_pAdminDialog ) + return; - + switch ( m_eType ) + { + case DST_CALC: + m_pAdminDialog->enableConfirmSettings( getURLNoPrefix().Len() > 0 ); + break; + default: + break; + } + } // ----------------------------------------------------------------------- IMPL_LINK(OConnectionHelper, OnBrowseConnections, PushButton*, /*_pButton*/) @@ -512,7 +527,7 @@ void OConnectionHelper::implSetURL( const String& _rURL, sal_Bool _bPrefix ) { String sURL( _rURL ); - DBG_ASSERT( m_pCollection, "OConnectionHelper::setURL: have no interpreter for the URLs!" ); + DBG_ASSERT( m_pCollection, "OConnectionHelper::implSetURL: have no interpreter for the URLs!" ); if ( m_pCollection && sURL.Len() ) { @@ -548,6 +563,8 @@ m_aET_Connection.SetText( sURL ); else m_aET_Connection.SetTextNoPrefix( sURL ); + + implUpdateURLDependentStates(); } //------------------------------------------------------------------------- @@ -574,17 +591,16 @@ sFileURLDecoded = sURL; } - // encode the URL - INetURLObject aFileURL( sFileURLDecoded, INetURLObject::ENCODE_ALL, RTL_TEXTENCODING_UTF8 ); - sFileURLDecoded = aFileURL.GetMainURL( INetURLObject::NO_DECODE ); sURL = sTypePrefix; if ( sFileURLDecoded.Len() ) { - OFileNotation aFileNotation(sFileURLDecoded,OFileNotation::N_SYSTEM); - - // set this decoded URL as text - sURL += String(aFileNotation.get(OFileNotation::N_URL)); + OFileNotation aFileNotation( sFileURLDecoded, OFileNotation::N_SYSTEM ); + sURL += String( aFileNotation.get( OFileNotation::N_URL ) ); } + + // encode the URL + INetURLObject aFileURL( sFileURLDecoded, INetURLObject::ENCODE_ALL, RTL_TEXTENCODING_UTF8 ); + sFileURLDecoded = aFileURL.GetMainURL( INetURLObject::NO_DECODE ); } } return sURL; File [changed]: ConnectionHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionHelper.hxx?r1=1.4.254.1&r2=1.4.254.2 Delta lines: +4 -4 ------------------- --- ConnectionHelper.hxx 26 Feb 2007 10:33:59 -0000 1.4.254.1 +++ ConnectionHelper.hxx 13 Mar 2007 08:42:12 -0000 1.4.254.2 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionHelper.hxx,v $ * - * $Revision: 1.4.254.1 $ + * $Revision: 1.4.254.2 $ * - * last change: $Author: fs $ $Date: 2007/02/26 10:33:59 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,7 @@ PATH_NOT_KNOWN }; - class IAdminHelper; + class IDatabaseSettingsDialog; class OConnectionHelper : public OGenericAdministrationPage { @@ -137,8 +137,8 @@ StringBag getInstalledAdabasDBDirs(const String &_rPath,const ::ucb::ResultSetInclude& _reResultSetInclude); StringBag getInstalledAdabasDBs(const String &_rConfigDir,const String &_rWorkDir); virtual bool checkTestConnection(); - private: + void implUpdateURLDependentStates() const; }; //......................................................................... File [changed]: ConnectionPage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.cxx?r1=1.16&r2=1.16.72.1 Delta lines: +5 -4 ------------------- --- ConnectionPage.cxx 17 Sep 2006 07:04:48 -0000 1.16 +++ ConnectionPage.cxx 13 Mar 2007 08:42:12 -0000 1.16.72.1 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionPage.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.16.72.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 07:04:48 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -236,6 +236,7 @@ { DBG_DTOR(OConnectionTabPage,NULL); } + // ----------------------------------------------------------------------- void OConnectionTabPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { File [changed]: ConnectionPage.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.hxx?r1=1.5&r2=1.5.254.1 Delta lines: +7 -17 -------------------- --- ConnectionPage.hxx 8 Sep 2005 14:45:07 -0000 1.5 +++ ConnectionPage.hxx 13 Mar 2007 08:42:12 -0000 1.5.254.1 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionPage.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.254.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 14:45:07 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -54,7 +54,7 @@ { //......................................................................... - class IAdminHelper; + class IDatabaseSettingsDialog; //========================================================================= //= OConnectionTabPage //========================================================================= @@ -88,6 +88,7 @@ DECL_LINK(OnBrowseConnections, PushButton*); DECL_LINK(OnTestJavaClickHdl,PushButton*); DECL_LINK(OnEditModified,Edit*); + public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); @@ -107,31 +108,20 @@ <p>The new URL must be of the type which is currently selected, only the parts which do not affect the type may be changed (compared to the previous URL).</p> */ - protected: + private: OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs); // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten virtual ~OConnectionTabPage(); - // <method>OGenericAdministrationPage::fillControls</method> virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); // <method>OGenericAdministrationPage::fillWindows</method> virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); - private: - // setting/retrieving the current connection URL - // necessary because for some types, the URL must be decoded for display purposes + private: /** enables the test connection button, if allowed */ virtual bool checkTestConnection(); - - - /** opens the FileOpen dialog and asks for a FileName - @param _sFilterName - The filter name. - @param _sExtension - The filter extension. - */ }; //......................................................................... } // namespace dbaui File [changed]: ConnectionPageSetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx?r1=1.7.72.1&r2=1.7.72.2 Delta lines: +3 -3 ------------------- --- ConnectionPageSetup.cxx 26 Feb 2007 10:34:00 -0000 1.7.72.1 +++ ConnectionPageSetup.cxx 13 Mar 2007 08:42:12 -0000 1.7.72.2 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionPageSetup.cxx,v $ * - * $Revision: 1.7.72.1 $ + * $Revision: 1.7.72.2 $ * - * last change: $Author: fs $ $Date: 2007/02/26 10:34:00 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -239,7 +239,7 @@ if ( USHRT_MAX != _nHeaderResId ) - SetHeaderText(this, FT_AUTOWIZARDHEADER, _nHeaderResId); + SetHeaderText(FT_AUTOWIZARDHEADER, _nHeaderResId); if ( USHRT_MAX != _nUrlResId ) { File [changed]: ConnectionPageSetup.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx?r1=1.5.126.1&r2=1.5.126.2 Delta lines: +4 -4 ------------------- --- ConnectionPageSetup.hxx 26 Feb 2007 10:34:00 -0000 1.5.126.1 +++ ConnectionPageSetup.hxx 13 Mar 2007 08:42:12 -0000 1.5.126.2 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionPageSetup.hxx,v $ * - * $Revision: 1.5.126.1 $ + * $Revision: 1.5.126.2 $ * - * last change: $Author: fs $ $Date: 2007/02/26 10:34:00 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,12 +68,12 @@ }; */ - class IAdminHelper; + class IDatabaseSettingsDialog; //========================================================================= //= OConnectionTabPageSetup //========================================================================= - /** implements the connection page of teh data source properties dialog. + /** implements the connection page of the data source properties dialog. */ class OConnectionTabPageSetup : public OConnectionHelper { File [changed]: DBSetupConnectionPages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx?r1=1.10&r2=1.10.30.1 Delta lines: +6 -6 ------------------- --- DBSetupConnectionPages.cxx 13 Dec 2006 16:47:57 -0000 1.10 +++ DBSetupConnectionPages.cxx 13 Mar 2007 08:42:13 -0000 1.10.30.1 @@ -4,9 +4,9 @@ * * $RCSfile: DBSetupConnectionPages.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.30.1 $ * - * last change: $Author: kz $ $Date: 2006/12/13 16:47:57 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -242,8 +242,8 @@ } - sal_Bool OTextConnectionPageSetup::checkItems(){ - return m_pTextConnectionHelper->checkItems(); + sal_Bool OTextConnectionPageSetup::prepareLeave(){ + return m_pTextConnectionHelper->prepareLeave(); } @@ -487,7 +487,7 @@ String sHelpText = String(ModuleRes(_nHelpTextResId)); m_aFTHelpText.SetText(sHelpText); //TODO this code snippet is redundant - SetHeaderText(this, FT_AUTOWIZARDHEADER, _nHeaderTextResId); + SetHeaderText(FT_AUTOWIZARDHEADER, _nHeaderTextResId); m_aETDatabasename.SetModifyHdl(getControlModifiedLink()); m_aETHostname.SetModifyHdl(getControlModifiedLink()); File [changed]: DBSetupConnectionPages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx?r1=1.5&r2=1.5.126.1 Delta lines: +5 -5 ------------------- --- DBSetupConnectionPages.hxx 20 Jun 2006 03:03:28 -0000 1.5 +++ DBSetupConnectionPages.hxx 13 Mar 2007 08:42:13 -0000 1.5.126.1 @@ -4,9 +4,9 @@ * * $RCSfile: DBSetupConnectionPages.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.126.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:03:28 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,7 +66,7 @@ { //......................................................................... - class IAdminHelper; + class IDatabaseSettingsDialog; // static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); @@ -105,7 +105,7 @@ protected: virtual ~OTextConnectionPageSetup(); - virtual sal_Bool checkItems(); + virtual sal_Bool prepareLeave(); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); File [changed]: TextConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/TextConnectionHelper.cxx?r1=1.9&r2=1.9.72.1 Delta lines: +4 -4 ------------------- --- TextConnectionHelper.cxx 17 Sep 2006 07:06:25 -0000 1.9 +++ TextConnectionHelper.cxx 13 Mar 2007 08:42:13 -0000 1.9.72.1 @@ -4,9 +4,9 @@ * * $RCSfile: TextConnectionHelper.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.72.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 07:06:25 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -303,7 +303,7 @@ // ----------------------------------------------------------------------- - sal_Bool OTextConnectionHelper::checkItems() + sal_Bool OTextConnectionHelper::prepareLeave() { LocalResourceAccess aStringResAccess(PAGE_TEXT, RSC_TABPAGE); // for accessing the strings which are local to our own resource block File [changed]: TextConnectionHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/TextConnectionHelper.hxx?r1=1.4&r2=1.4.126.1 Delta lines: +4 -4 ------------------- --- TextConnectionHelper.hxx 20 Jun 2006 03:04:34 -0000 1.4 +++ TextConnectionHelper.hxx 13 Mar 2007 08:42:13 -0000 1.4.126.1 @@ -4,9 +4,9 @@ * * $RCSfile: TextConnectionHelper.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.126.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:04:34 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -122,7 +122,7 @@ void SetClickHandler(const Link& _rHandler) { m_aGetExtensionHandler = _rHandler; } String GetExtension(); sal_Bool FillItemSet( SfxItemSet& rSet, const sal_Bool bChangedSomething ); - sal_Bool checkItems(); + sal_Bool prepareLeave(); }; //......................................................................... File [changed]: UserAdminDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/UserAdminDlg.cxx?r1=1.9&r2=1.9.72.1 Delta lines: +8 -3 ------------------- --- UserAdminDlg.cxx 17 Sep 2006 07:06:53 -0000 1.9 +++ UserAdminDlg.cxx 13 Mar 2007 08:42:13 -0000 1.9.72.1 @@ -4,9 +4,9 @@ * * $RCSfile: UserAdminDlg.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.72.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 07:06:53 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -250,6 +250,11 @@ { SetText(_sTitle); } + //------------------------------------------------------------------------- + void OUserAdminDlg::enableConfirmSettings( bool _bEnable ) + { + (void)_bEnable; + } //------------------------------------------------------------------------- sal_Bool OUserAdminDlg::saveDatasource() { File [changed]: adminpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adminpages.cxx?r1=1.45&r2=1.45.6.1 Delta lines: +11 -40 --------------------- --- adminpages.cxx 23 Jan 2007 11:41:01 -0000 1.45 +++ adminpages.cxx 13 Mar 2007 08:42:13 -0000 1.45.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: adminpages.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.45.6.1 $ * - * last change: $Author: obo $ $Date: 2007/01/23 11:41:01 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -118,18 +118,10 @@ //========================================================================= - //= OPageSettings - //========================================================================= - //------------------------------------------------------------------------- - OPageSettings::~OPageSettings() - { - } - - //========================================================================= //= OGenericAdministrationPage //========================================================================= -DBG_NAME(OGenericAdministrationPage) -//------------------------------------------------------------------------- + DBG_NAME(OGenericAdministrationPage) + //------------------------------------------------------------------------- OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const ResId& _rId, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rAttrSet) ,m_abEnableRoadmap(sal_False) @@ -155,7 +147,7 @@ { if (_pSet) { - if (!checkItems()) + if (!prepareLeave()) return KEEP_PAGE; FillItemSet(*_pSet); } @@ -183,24 +175,6 @@ } // ----------------------------------------------------------------------- - OPageSettings* OGenericAdministrationPage::createViewSettings() - { - return NULL; - } - - // ----------------------------------------------------------------------- - void OGenericAdministrationPage::fillViewSettings(OPageSettings* /*_rSettings*/) - { - // nothing to do - } - - // ----------------------------------------------------------------------- - void OGenericAdministrationPage::restoreViewSettings(const OPageSettings* /*_pPageState*/) - { - // nothing to do - } - - // ----------------------------------------------------------------------- void OGenericAdministrationPage::getFlags(const SfxItemSet& _rSet, sal_Bool& _rValid, sal_Bool& _rReadonly) { SFX_ITEMSET_GET(_rSet, pInvalid, SfxBoolItem, DSID_INVALID_SELECTION, sal_True); @@ -244,8 +218,9 @@ } return sal_True; } + // ----------------------------------------------------------------------- - void OGenericAdministrationPage::postInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OGenericAdministrationPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) sal_Bool bValid, bReadonly; @@ -361,17 +336,13 @@ return 0L; } - void OGenericAdministrationPage::SetHeaderText( Window* _parent, USHORT _nFTResId, USHORT _StringResId) + void OGenericAdministrationPage::SetHeaderText( USHORT _nFTResId, USHORT _StringResId) { -// if (!m_pFT_HeaderText) -// { delete(m_pFT_HeaderText); - m_pFT_HeaderText = new FixedText(_parent, ModuleRes(_nFTResId)); - // } + m_pFT_HeaderText = new FixedText(this, ModuleRes(_nFTResId)); String sHeaderText = String(ModuleRes(_StringResId)); m_pFT_HeaderText->SetText(sHeaderText); SetControlFontWeight(m_pFT_HeaderText); -// return m_pFT_HeaderText; } File [changed]: adminpages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adminpages.hxx?r1=1.30&r2=1.30.126.1 Delta lines: +12 -52 --------------------- --- adminpages.hxx 20 Jun 2006 03:05:26 -0000 1.30 +++ adminpages.hxx 13 Mar 2007 08:42:14 -0000 1.30.126.1 @@ -4,9 +4,9 @@ * * $RCSfile: adminpages.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.30.126.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:05:26 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -117,18 +117,9 @@ }; //========================================================================= - //= OPageSettings - //========================================================================= - struct OPageSettings - { - virtual ~OPageSettings(); - }; - - - //========================================================================= //= OGenericAdministrationPage //========================================================================= - class IAdminHelper; + class IDatabaseSettingsDialog; class IItemSetHelper; class OGenericAdministrationPage : public SfxTabPage, public svt::IWizardPage { @@ -136,7 +127,7 @@ Link m_aModifiedHandler; /// to be called if something on the page has been modified sal_Bool m_abEnableRoadmap; protected: - IAdminHelper* m_pAdminDialog; + IDatabaseSettingsDialog* m_pAdminDialog; IItemSetHelper* m_pItemSetHelper; FixedText* m_pFT_HeaderText; @@ -155,7 +146,7 @@ @param _pItemSetHelper the itemset helper */ - inline void SetAdminDialog(IAdminHelper* _pDialog,IItemSetHelper* _pItemSetHelper) + inline void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper) { OSL_ENSURE(_pDialog && _pItemSetHelper,"Values are NULL!"); m_pAdminDialog = _pDialog; @@ -171,27 +162,6 @@ m_xORB = _rxORB; } - /** create an instance of view settings for the page - <p>The caller is responsible for destroying the object later on.</p> - <p>The page may return <NULL/> if it does not support view settings.</p> - */ - virtual OPageSettings* createViewSettings(); - - /** get the pages current view settings, if any - */ - virtual void fillViewSettings(OPageSettings* _pSettings); - - /** called by the dialog after changes have been applied asnychronously - <p>The page can use this method to restore it's (non-persistent, e.g. view-) settings to the - state before the changes have been applied</p> - <p>This method is necessary because during applying, the page may die and be re-created.</p> - - @param _pPageState - the page state as given in <method>IAdminHelper::applyChangesAsync</method> - @see IAdminHelper::applyChangesAsync - */ - virtual void restoreViewSettings(const OPageSettings* _pSettings); - /** opens a dialog filled with all data sources available for this type and returns the selected on. @param _eType @@ -208,18 +178,11 @@ virtual void initializePage(); virtual sal_Bool commitPage(COMMIT_REASON _eReason); -// Link maRoadmapHdl; -// void SetRoadmapHdl( const Link& rLink ) { maRoadmapHdl = rLink; } -// const Link& GetRoadmapHdl() const { return maRoadmapHdl; } - void SetRoadmapStateValue( sal_Bool _bDoEnable ) { m_abEnableRoadmap = _bDoEnable; } bool GetRoadmapStateValue() const { return m_abEnableRoadmap; } - DECL_LINK(ImplRoadmapHdl, OGenericAdministrationPage*); - - protected: - /// default implementation: call FillItemSet, call checkItems, + /// default implementation: call FillItemSet, call prepareLeave, virtual int DeactivatePage(SfxItemSet* pSet); using SfxTabPage::DeactivatePage; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False @@ -234,24 +197,24 @@ void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call((void*)this); } /// called from within DeactivatePage. The page is allowed to be deactivated if this method returns sal_True - virtual sal_Bool checkItems() { return sal_True; } + virtual sal_Bool prepareLeave() { return sal_True; } /** called from within Reset and ActivatePage, use to initialize the controls with the items from the given set @param _bSaveValue if set to sal_True, the implementation should call SaveValue on all relevant controls */ - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { postInitControls(_rSet, _bSaveValue); } + virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); /// analyze the invalid and the readonly flag which may be present in the set void getFlags(const SfxItemSet& _rSet, sal_Bool& _rValid, sal_Bool& _rReadonly); - /** will be called inside <method>postInitControl</method> to save the value if necessary + /** will be called inside <method>implInitControls</method> to save the value if necessary @param _rControlList The list must be filled with the controls. It is not allowed to clear the list before pusching data into it. */ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) = 0; - /** will be called inside <method>postInitControl</method> to disable if necessary + /** will be called inside <method>implInitControls</method> to disable if necessary @param _rControlList The list must be filled with the controls. It is not allowed to clear the list before pusching data into it. @@ -296,7 +259,7 @@ // used to set the right Pane header of a wizard to bold void SetControlFontWeight(Window* _pWindow, FontWeight _eWeight = WEIGHT_BOLD); - void SetHeaderText( Window* _parent, USHORT _nFTResId, USHORT _StringResId); + void SetHeaderText( USHORT _nFTResId, USHORT _StringResId); Point MovePoint(Point _aPixelBasePoint, sal_Int32 _XShift, sal_Int32 _YShift); @@ -310,9 +273,6 @@ /// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method> virtual Link getControlModifiedLink() { return LINK(this, OGenericAdministrationPage, OnControlModified); } - - private: - void postInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); }; //......................................................................... File [changed]: dbadmin.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.cxx?r1=1.100&r2=1.100.28.1 Delta lines: +8 -3 ------------------- --- dbadmin.cxx 13 Dec 2006 16:49:20 -0000 1.100 +++ dbadmin.cxx 13 Mar 2007 08:42:14 -0000 1.100.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbadmin.cxx,v $ * - * $Revision: 1.100 $ + * $Revision: 1.100.28.1 $ * - * last change: $Author: kz $ $Date: 2006/12/13 16:49:20 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -329,6 +329,11 @@ void ODbAdminDialog::setTitle(const ::rtl::OUString& _sTitle) { SetText(_sTitle); +} +//------------------------------------------------------------------------- +void ODbAdminDialog::enableConfirmSettings( bool _bEnable ) +{ + (void)_bEnable; } //------------------------------------------------------------------------- sal_Bool ODbAdminDialog::saveDatasource() File [changed]: dbwiz.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwiz.cxx?r1=1.12.72.1&r2=1.12.72.2 Delta lines: +13 -2 -------------------- --- dbwiz.cxx 26 Feb 2007 11:48:12 -0000 1.12.72.1 +++ dbwiz.cxx 13 Mar 2007 08:42:14 -0000 1.12.72.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbwiz.cxx,v $ * - * $Revision: 1.12.72.1 $ + * $Revision: 1.12.72.2 $ * - * last change: $Author: fs $ $Date: 2007/02/26 11:48:12 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -384,6 +384,17 @@ void ODbTypeWizDialog::setTitle(const ::rtl::OUString& _sTitle) { SetText(_sTitle); +} +//------------------------------------------------------------------------- +void ODbTypeWizDialog::enableConfirmSettings( bool _bEnable ) +{ + enableButtons( WZB_FINISH, _bEnable ); + // TODO: + // this is hacky. At the moment, this method is used in only one case (#b6532894#). + // As soon as it is to be used more wide-spread, we should find a proper concept + // for enabling both the Next and Finish buttons, depending on the current page state. + // Plus, the concept must also care for the case where those pages are embedded into + // anormal tab dialog. } //------------------------------------------------------------------------- sal_Bool ODbTypeWizDialog::saveDatasource() File [changed]: dbwizsetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.23.2.1&r2=1.23.2.2 Delta lines: +8 -2 ------------------- --- dbwizsetup.cxx 26 Feb 2007 11:48:12 -0000 1.23.2.1 +++ dbwizsetup.cxx 13 Mar 2007 08:42:14 -0000 1.23.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbwizsetup.cxx,v $ * - * $Revision: 1.23.2.1 $ + * $Revision: 1.23.2.2 $ * - * last change: $Author: fs $ $Date: 2007/02/26 11:48:12 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -939,6 +939,12 @@ { DBG_ERROR( "ODbTypeWizDialogSetup::setTitle: not implemented!" ); // why? +} + +//------------------------------------------------------------------------- +void ODbTypeWizDialogSetup::enableConfirmSettings( bool _bEnable ) +{ + (void)_bEnable; } //------------------------------------------------------------------------- File [changed]: detailpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/detailpages.cxx?r1=1.44&r2=1.44.6.1 Delta lines: +5 -5 ------------------- --- detailpages.cxx 23 Jan 2007 11:41:13 -0000 1.44 +++ detailpages.cxx 13 Mar 2007 08:42:14 -0000 1.44.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: detailpages.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.44.6.1 $ * - * last change: $Author: obo $ $Date: 2007/01/23 11:41:13 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1415,9 +1415,9 @@ } // ----------------------------------------------------------------------- - sal_Bool OTextDetailsPage::checkItems() + sal_Bool OTextDetailsPage::prepareLeave() { - return m_pTextConnectionHelper->checkItems(); + return m_pTextConnectionHelper->prepareLeave(); } //------------------------------------------------------------------------ File [changed]: detailpages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/detailpages.hxx?r1=1.25&r2=1.25.30.1 Delta lines: +4 -4 ------------------- --- detailpages.hxx 13 Dec 2006 16:50:58 -0000 1.25 +++ detailpages.hxx 13 Mar 2007 08:42:14 -0000 1.25.30.1 @@ -4,9 +4,9 @@ * * $RCSfile: detailpages.hxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.30.1 $ * - * last change: $Author: kz $ $Date: 2006/12/13 16:50:58 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -387,7 +387,7 @@ String m_aTextNone; protected: virtual ~OTextDetailsPage(); - virtual sal_Bool checkItems(); + virtual sal_Bool prepareLeave(); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); File [changed]: generalpage.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/generalpage.hxx?r1=1.17&r2=1.17.126.1 Delta lines: +4 -4 ------------------- --- generalpage.hxx 20 Jun 2006 03:08:05 -0000 1.17 +++ generalpage.hxx 13 Mar 2007 08:42:15 -0000 1.17.126.1 @@ -4,9 +4,9 @@ * * $RCSfile: generalpage.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.17.126.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:08:05 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -57,7 +57,7 @@ namespace dbaui { //......................................................................... - class IAdminHelper; + class IDatabaseSettingsDialog; class RadioDependentEnabler; //========================================================================= //= OGeneralPage File [changed]: tablespage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/tablespage.cxx?r1=1.27.62.1&r2=1.27.62.2 Delta lines: +8 -76 -------------------- --- tablespage.cxx 26 Feb 2007 09:59:20 -0000 1.27.62.1 +++ tablespage.cxx 13 Mar 2007 08:42:15 -0000 1.27.62.2 @@ -4,9 +4,9 @@ * * $RCSfile: tablespage.cxx,v $ * - * $Revision: 1.27.62.1 $ + * $Revision: 1.27.62.2 $ * - * last change: $Author: fs $ $Date: 2007/02/26 09:59:20 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -123,6 +123,9 @@ #ifndef _DBAUI_TABLESSINGLEDLG_HXX_ #include "TablesSingleDlg.hxx" #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif //......................................................................... namespace dbaui @@ -318,7 +321,7 @@ // get the name of the data source we're working for SFX_ITEMSET_GET(_rSet, pNameItem, SfxStringItem, DSID_NAME, sal_True); - DBG_ASSERT(pNameItem, "OTableSubscriptionPage::ActivatePage: missing the name attribute!"); + DBG_ASSERT(pNameItem, "OTableSubscriptionPage::implInitControls: missing the name attribute!"); String sDSName = pNameItem->GetValue(); if (bValid && sDSName.Len() && !m_xCurrentConnection.is() ) @@ -326,7 +329,7 @@ // the PropertyValues for the current dialog settings Sequence< PropertyValue > aConnectionParams; - DBG_ASSERT(m_pTablesDlg, "OTableSubscriptionPage::ActivatePage : need a parent dialog doing the translation!"); + DBG_ASSERT(m_pTablesDlg, "OTableSubscriptionPage::implInitControls: need a parent dialog doing the translation!"); if ( m_pTablesDlg ) { if (!m_pTablesDlg->getCurrentSettings(aConnectionParams)) @@ -441,13 +444,9 @@ m_bCatalogAtStart = xMeta->isCatalogAtStart(); } } - catch(SQLException&) - { - DBG_ERROR("OTableSubscriptionPage::ActivatePage : could not retrieve the qualifier separator for the used connection !"); - } catch(Exception&) { - OSL_ENSURE(0,"Exception catched!"); + DBG_UNHANDLED_EXCEPTION(); } } } @@ -656,73 +655,6 @@ } return pParent; - } - - //------------------------------------------------------------------------ - OPageSettings* OTableSubscriptionPage::createViewSettings() - { - return new OTablePageViewSettings; - } - - //------------------------------------------------------------------------ - void OTableSubscriptionPage::fillViewSettings(OPageSettings* _pSettings) - { - OTablePageViewSettings* pMySettings = static_cast<OTablePageViewSettings*>(_pSettings); - if (!pMySettings) - return; - - // collect the names of the expanded extries - EntryPredicateCheck aExpandedCheck =&SvListView::IsExpanded; - collectEntryPaths(pMySettings->aExpandedEntries, aExpandedCheck); - - // collect the names of the selected extries - EntryPredicateCheck aSelectedCheck = &SvListView::IsSelected; - collectEntryPaths(pMySettings->aSelectedEntries, aSelectedCheck); - - SvLBoxEntry* pCurEntry = m_aTablesList.GetCurEntry(); - if (pCurEntry) - { - StringArray aLocalNames; - while (pCurEntry && (pCurEntry != m_aTablesList.getAllObjectsEntry())) - { - aLocalNames.push_back(m_aTablesList.GetEntryText(pCurEntry)); - pCurEntry = m_aTablesList.GetParent(pCurEntry); - } - - const ::rtl::OUString sSeparator = ::rtl::OUString::createFromAscii("."); - - // assemble the name - pMySettings->sFocusEntry = ::rtl::OUString(); - for ( StringArray::reverse_iterator aSegments = aLocalNames.rbegin(); - aSegments != aLocalNames.rend(); - - ) - { - pMySettings->sFocusEntry += *aSegments; - if (++aSegments != aLocalNames.rend()) - pMySettings->sFocusEntry += sSeparator; - } - } - } - - //------------------------------------------------------------------------ - void OTableSubscriptionPage::restoreViewSettings(const OPageSettings* _pSettings) - { - const OTablePageViewSettings* pMySettings = static_cast<const OTablePageViewSettings*>(_pSettings); - if (!pMySettings) - return; - - // expand the entries - // TODO: some kind of collapse all - actOnEntryPaths(pMySettings->aExpandedEntries, &OTableSubscriptionPage::doExpand); - - // select the entries - m_aTablesList.SelectAll(sal_False); - actOnEntryPaths(pMySettings->aSelectedEntries, &OTableSubscriptionPage::doSelect); - - SvLBoxEntry* pFocusEntry = getEntryFromPath(pMySettings->sFocusEntry); - if (pFocusEntry) - m_aTablesList.SetCurEntry(pFocusEntry); } //------------------------------------------------------------------------ File [changed]: tablespage.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/tablespage.hxx?r1=1.12.62.1&r2=1.12.62.2 Delta lines: +2 -19 -------------------- --- tablespage.hxx 26 Feb 2007 09:59:21 -0000 1.12.62.1 +++ tablespage.hxx 13 Mar 2007 08:42:15 -0000 1.12.62.2 @@ -4,9 +4,9 @@ * * $RCSfile: tablespage.hxx,v $ * - * $Revision: 1.12.62.1 $ + * $Revision: 1.12.62.2 $ * - * last change: $Author: fs $ $Date: 2007/02/26 09:59:21 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -93,10 +93,6 @@ virtual int DeactivatePage(SfxItemSet* _pSet); using OGenericAdministrationPage::DeactivatePage; - virtual OPageSettings* createViewSettings(); - virtual void fillViewSettings(OPageSettings* _pSettings); - virtual void restoreViewSettings(const OPageSettings* _pSettings); - virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -128,19 +124,6 @@ /** return the current selection in <member>m_aTablesList</member> */ ::com::sun::star::uno::Sequence< ::rtl::OUString > collectDetailedSelection() const; - - // helper for remembering view settings - struct OTablePageViewSettings : public OPageSettings - { - StringArray aExpandedEntries; - StringArray aSelectedEntries; - ::rtl::OUString sFocusEntry; - }; - - /// retrieve the current view settings - void getViewSettings(OTablePageViewSettings& _rFillIt); - /// initialize the page from the given view settings - void restoreViewSettings(const OTablePageViewSettings& _rInitializeFrom); typedef sal_Bool (SvListView::*EntryPredicateCheck) (SvListEntry*) const; /// collects the names of the entries which for which the given predicate is <TRUE/> Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: AdabasStatDlg.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/AdabasStatDlg.hxx?r1=1.4&r2=1.4.254.1 Delta lines: +5 -4 ------------------- --- AdabasStatDlg.hxx 8 Sep 2005 15:13:55 -0000 1.4 +++ AdabasStatDlg.hxx 13 Mar 2007 08:42:15 -0000 1.4.254.1 @@ -4,9 +4,9 @@ * * $RCSfile: AdabasStatDlg.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.254.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 15:13:55 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,7 +68,7 @@ /** implements the adabas admin dialog */ - class OAdabasStatPageDlg : public SfxTabDialog, public IItemSetHelper, public IAdminHelper,public dbaui::OModuleClient + class OAdabasStatPageDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient { ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; protected: @@ -94,6 +94,7 @@ virtual void clearPassword(); virtual sal_Bool saveDatasource(); virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void enableConfirmSettings( bool _bEnable ); }; //......................................................................... } // namespace dbaui File [changed]: AdvancedPageDlg.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/AdvancedPageDlg.hxx?r1=1.4&r2=1.4.254.1 Delta lines: +5 -4 ------------------- --- AdvancedPageDlg.hxx 8 Sep 2005 15:14:10 -0000 1.4 +++ AdvancedPageDlg.hxx 13 Mar 2007 08:42:16 -0000 1.4.254.1 @@ -4,9 +4,9 @@ * * $RCSfile: AdvancedPageDlg.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.254.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 15:14:10 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,7 +68,7 @@ /** implements the advanced page dlg of the data source properties. */ - class OAdvancedTabPageDlg : public SfxTabDialog, public IItemSetHelper, public IAdminHelper,public dbaui::OModuleClient + class OAdvancedTabPageDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient { ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pItemSet; @@ -95,6 +95,7 @@ virtual void clearPassword(); virtual sal_Bool saveDatasource(); virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void enableConfirmSettings( bool _bEnable ); }; //......................................................................... } // namespace dbaui File [changed]: IItemSetHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/IItemSetHelper.hxx?r1=1.4&r2=1.4.254.1 Delta lines: +11 -4 -------------------- --- IItemSetHelper.hxx 8 Sep 2005 15:24:58 -0000 1.4 +++ IItemSetHelper.hxx 13 Mar 2007 08:42:16 -0000 1.4.254.1 @@ -4,9 +4,9 @@ * * $RCSfile: IItemSetHelper.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.254.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 15:24:58 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -61,7 +61,7 @@ virtual SfxItemSet* getWriteOutputSet() = 0; }; - class SAL_NO_VTABLE IAdminHelper + class SAL_NO_VTABLE IDatabaseSettingsDialog { public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() = 0; @@ -71,6 +71,13 @@ virtual void clearPassword() = 0; virtual sal_Bool saveDatasource() = 0; virtual void setTitle(const ::rtl::OUString& _sTitle) = 0; + + /** enables or disables the user's possibility to confirm the settings + + In a wizard, disabling this will usually disable the "Finish" button. + In a normal tab dialog, this will usually disable the "OK" button. + */ + virtual void enableConfirmSettings( bool _bEnable ) = 0; }; } #endif // DBAUI_ITEMSETHELPER_HXX File [changed]: UserAdminDlg.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/UserAdminDlg.hxx?r1=1.5&r2=1.5.254.1 Delta lines: +5 -4 ------------------- --- UserAdminDlg.hxx 8 Sep 2005 15:41:12 -0000 1.5 +++ UserAdminDlg.hxx 13 Mar 2007 08:42:16 -0000 1.5.254.1 @@ -4,9 +4,9 @@ * * $RCSfile: UserAdminDlg.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.254.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 15:41:12 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,7 +68,7 @@ /** implements the user adin dialog */ - class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IAdminHelper,public dbaui::OModuleClient + class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient { ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pItemSet; @@ -98,6 +98,7 @@ virtual void clearPassword(); virtual sal_Bool saveDatasource(); virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void enableConfirmSettings( bool _bEnable ); }; //......................................................................... } // namespace dbaui File [changed]: dbadmin.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbadmin.hxx?r1=1.33&r2=1.33.254.1 Delta lines: +5 -5 ------------------- --- dbadmin.hxx 8 Sep 2005 15:47:34 -0000 1.33 +++ dbadmin.hxx 13 Mar 2007 08:42:16 -0000 1.33.254.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbadmin.hxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.33.254.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 15:47:34 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,11 +66,10 @@ //= ODbAdminDialog //========================================================================= class OGeneralPage; -struct OPageSettings; class ODbDataSourceAdministrationHelper; /** tab dialog for administrating the office wide registered data sources */ -class ODbAdminDialog : public SfxTabDialog , public IItemSetHelper, public IAdminHelper +class ODbAdminDialog : public SfxTabDialog , public IItemSetHelper, public IDatabaseSettingsDialog { private: typedef ::std::stack< sal_Int32 > PageStack; @@ -118,6 +117,7 @@ virtual void clearPassword(); virtual sal_Bool saveDatasource(); virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void enableConfirmSettings( bool _bEnable ); protected: // adds a new detail page and remove all the old ones File [changed]: dbwiz.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbwiz.hxx?r1=1.4&r2=1.4.254.1 Delta lines: +5 -5 ------------------- --- dbwiz.hxx 8 Sep 2005 15:51:21 -0000 1.4 +++ dbwiz.hxx 13 Mar 2007 08:42:16 -0000 1.4.254.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbwiz.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.254.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 15:51:21 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,11 +71,10 @@ //= ODbTypeWizDialog //========================================================================= class OGeneralPage; -struct OPageSettings; class ODbDataSourceAdministrationHelper; /** tab dialog for administrating the office wide registered data sources */ -class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IAdminHelper,public dbaui::OModuleClient +class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient { private: ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; @@ -108,6 +107,7 @@ virtual void clearPassword(); virtual sal_Bool saveDatasource(); virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void enableConfirmSettings( bool _bEnable ); protected: /// to override to create new pages File [changed]: dbwizsetup.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbwizsetup.hxx?r1=1.9.78.1&r2=1.9.78.2 Delta lines: +4 -4 ------------------- --- dbwizsetup.hxx 26 Feb 2007 11:48:15 -0000 1.9.78.1 +++ dbwizsetup.hxx 13 Mar 2007 08:42:16 -0000 1.9.78.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbwizsetup.hxx,v $ * - * $Revision: 1.9.78.1 $ + * $Revision: 1.9.78.2 $ * - * last change: $Author: fs $ $Date: 2007/02/26 11:48:15 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,13 +79,12 @@ //= ODbTypeWizDialogSetup //========================================================================= class OGeneralPage; -struct OPageSettings; class ODbDataSourceAdministrationHelper; /** tab dialog for administrating the office wide registered data sources */ class OMySQLIntroPageSetup; -class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IAdminHelper,public dbaui::OModuleClient +class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient { private: @@ -140,6 +139,7 @@ virtual DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void enableConfirmSettings( bool _bEnable ); virtual sal_Bool saveDatasource(); virtual String getStateDisplayName( WizardState _nState ); File [changed]: unoadmin.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/unoadmin.hxx?r1=1.10&r2=1.10.254.1 Delta lines: +4 -4 ------------------- --- unoadmin.hxx 8 Sep 2005 16:05:47 -0000 1.10 +++ unoadmin.hxx 13 Mar 2007 08:42:17 -0000 1.10.254.1 @@ -4,9 +4,9 @@ * * $RCSfile: unoadmin.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.254.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 16:05:47 $ + * last change: $Author: fs $ $Date: 2007/03/13 08:42:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,7 +58,7 @@ { //......................................................................... -class IAdminHelper; +class IDatabaseSettingsDialog; //========================================================================= //= ODatabaseAdministrationDialog --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
