Tag: cws_dev300_dba31a User: oj Date: 2008-07-04 13:17:14+0000 Modified: dba/dbaccess/source/ui/dlg/dbadmin.src dba/dbaccess/source/ui/dlg/generalpage.cxx
Log: #i86043# new info string when selecting wrong file type File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbadmin.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.src?r1=1.159&r2=1.159.42.1 Delta lines: +6 -2 ------------------- --- dbadmin.src 2008-04-10 14:45:07+0000 1.159 +++ dbadmin.src 2008-07-04 13:17:10+0000 1.159.42.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbadmin.src,v $ - * $Revision: 1.159 $ + * $Revision: 1.159.42.1 $ * * This file is part of OpenOffice.org. * @@ -732,3 +732,7 @@ AUTO_CHARSET( 4*UNRELATED_CONTROLS+ 3*FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X) }; +String STR_ERR_USE_CONNECT_TO +{ + Text [ en-US ] = "Please choose 'Connect to an existing database' to connect to an existing database instead."; +}; File [changed]: generalpage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/generalpage.cxx?r1=1.56.42.1&r2=1.56.42.2 Delta lines: +10 -1 -------------------- --- generalpage.cxx 2008-06-09 06:58:17+0000 1.56.42.1 +++ generalpage.cxx 2008-07-04 13:17:11+0000 1.56.42.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: generalpage.cxx,v $ - * $Revision: 1.56.42.1 $ + * $Revision: 1.56.42.2 $ * * This file is part of OpenOffice.org. * @@ -606,6 +606,15 @@ } if ( aFileDlg.Execute() == ERRCODE_NONE ) { + if ( aFileDlg.GetCurrentFilter() != pFilter->GetUIName() ) + { + String sMessage(ModuleRes(STR_ERR_USE_CONNECT_TO)); + InfoBox aError(this, sMessage); + aError.Execute(); + m_aRB_GetExistingDatabase.Check(); + OnSetupModeSelected(&m_aRB_GetExistingDatabase); + return 0L; + } m_aBrowsedDocument.sURL = aFileDlg.GetPath(); m_aBrowsedDocument.sFilter = String(); m_aChooseDocumentHandler.Call( this ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
