Tag: cws_src680_qiq User: fs Date: 06/05/17 04:49:05 Modified: /dba/dbaccess/source/ui/tabledesign/ TableController.cxx
Log: refactored OSaveAsDlg in preparation of #i51143# File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableController.cxx?r1=1.103.2.1&r2=1.103.2.2 Delta lines: +10 -6 -------------------- --- TableController.cxx 12 May 2006 13:47:02 -0000 1.103.2.1 +++ TableController.cxx 17 May 2006 11:49:03 -0000 1.103.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: TableController.cxx,v $ * - * $Revision: 1.103.2.1 $ + * $Revision: 1.103.2.2 $ * - * last change: $Author: fs $ $Date: 2006/05/12 13:47:02 $ + * last change: $Author: fs $ $Date: 2006/05/17 11:49:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -57,6 +57,9 @@ #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" #endif +#ifndef DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX +#include "defaultobjectnamecheck.hxx" +#endif #ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include <connectivity/dbtools.hxx> #endif @@ -422,7 +425,8 @@ aDefaultName = ::dbaui::createDefaultName(getConnection()->getMetaData(),xTables,aName); } - OSaveAsDlg aDlg(getView(),CommandType::TABLE,xTables,getConnection()->getMetaData(),getConnection(),aDefaultName); + PlainNameCheck aNameChecker( xTables ); + OSaveAsDlg aDlg( getView(), CommandType::TABLE, getORB(), getConnection(), aDefaultName, aNameChecker ); if(aDlg.Execute() == RET_OK) { m_sName = aDlg.getName(); @@ -513,9 +517,9 @@ } catch(const ElementExistException& ) { - String sText( ModuleRes(STR_OBJECT_ALREADY_EXISTS)); + String sText( ModuleRes( STR_NAME_ALREADY_EXISTS ) ); sText.SearchAndReplaceAscii( "#" , m_sName); - OSQLMessageBox aDlg(getView(), String(ModuleRes(STR_OBJECT_ALREADY_EXSISTS)), sText, WB_OK, OSQLMessageBox::Error); + OSQLMessageBox aDlg( getView(), String( ModuleRes( STR_ERROR_DURING_CREATION ) ), sText, WB_OK, OSQLMessageBox::Error ); aDlg.Execute(); bError = sal_True; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
