Tag: cws_dev300_dba30c User: oj Date: 2008-05-13 05:54:46+0000 Modified: dba/dbaccess/source/ext/adabas/AdabasNewDb.cxx dba/dbaccess/source/ext/adabas/AdabasNewDb.hxx dba/dbaccess/source/ext/adabas/AdabasNewDb.src dba/dbaccess/source/ext/adabas/adabasui_resource.hrc
Log: #i89322# remove unused code File Changes: Directory: /dba/dbaccess/source/ext/adabas/ =========================================== File [changed]: AdabasNewDb.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/adabas/AdabasNewDb.cxx?r1=1.4&r2=1.4.8.1 Delta lines: +2 -39 -------------------- --- AdabasNewDb.cxx 2008-04-10 13:07:11+0000 1.4 +++ AdabasNewDb.cxx 2008-05-13 05:54:43+0000 1.4.8.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AdabasNewDb.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.8.1 $ * * This file is part of OpenOffice.org. * @@ -571,43 +571,6 @@ EndDialog(RET_OK); return 0; } -// ----------------------------------------------------------------------------- -void OAdabasNewDbDlg::ShowErrorText(INT32 _nError) -{ - String aErrorMsg; - BOOL bError = TRUE; - switch(_nError) - { - case -5: - aErrorMsg = String(ModuleRes(STR_ADABAS_NO_NEW_CONFIG_FILE)); - break; - case -7: - aErrorMsg = String(ModuleRes(STR_ADABAS_WRONG_KERNEL_PARAMETER)); - break; - case -8: - aErrorMsg = String(ModuleRes(STR_ADABAS_NO_SERVER_START)); - break; - case -9: - aErrorMsg = String(ModuleRes(STR_ADABAS_NOT_ENOUGH_SPACE)); - aErrorMsg .SearchAndReplace(String::CreateFromAscii("\'#\'"),m_SYSDEV_File); - break; - case -10: - aErrorMsg = String(ModuleRes(STR_ADABAS_NOT_ENOUGH_SPACE)); - aErrorMsg.SearchAndReplace(String::CreateFromAscii("\'#\'"),m_TRANSDEV_File); - break; - case -11: - aErrorMsg = String(ModuleRes(STR_ADABAS_NOT_ENOUGH_SPACE)); - aErrorMsg.SearchAndReplace(String::CreateFromAscii("\'#\'"),m_DATADEV_File); - break; - case 0: - default: - bError = FALSE; - } - if(bError) - { - // OSQLMessageBox(this,String(ModuleRes(STR_STAT_WARNING)),aErrorMsg).Execute(); - } -} //------------------------------------------------------------------------ IMPL_LINK( OAdabasNewDbDlg, LoseFocusHdl, Edit *, pEdit ) { File [changed]: AdabasNewDb.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/adabas/AdabasNewDb.hxx?r1=1.4&r2=1.4.8.1 Delta lines: +3 -4 ------------------- --- AdabasNewDb.hxx 2008-04-10 13:07:43+0000 1.4 +++ AdabasNewDb.hxx 2008-05-13 05:54:43+0000 1.4.8.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AdabasNewDb.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.8.1 $ * * This file is part of OpenOffice.org. * @@ -143,7 +143,6 @@ DECL_LINK( TerminateHdl, void * ); void CheckBitmaps(); - void ShowErrorText(INT32 _nError); DECL_LINK(OnError, void*); DECL_LINK(OnNoDefaultPath, void*); @@ -155,7 +154,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog>& _rxCreateCatalog, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxORB, BOOL _bRestore=FALSE); - ~OAdabasNewDbDlg(); + virtual ~OAdabasNewDbDlg(); ::rtl::OUString GetDatabaseName() const { return m_ET_DATABASENAME.GetText(); } ::rtl::OUString GetControlUser() const { return m_ET_CONUSR.GetText(); } File [changed]: AdabasNewDb.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/adabas/AdabasNewDb.src?r1=1.4&r2=1.4.8.1 Delta lines: +2 -21 -------------------- --- AdabasNewDb.src 2008-04-10 13:07:58+0000 1.4 +++ AdabasNewDb.src 2008-05-13 05:54:43+0000 1.4.8.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AdabasNewDb.src,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.8.1 $ * * This file is part of OpenOffice.org. * @@ -364,26 +364,12 @@ MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; /* Fehlermeldungen beim Erstellen einer Adabas DB */ -String STR_ADABAS_NO_NEW_CONFIG_FILE -{ - Text[ en-US ] = "An \"empty\" DB configuration file cannot be created."; -}; String STR_ADABAS_NO_PARAM_SET { Text[ en-US ] = "No entry could be written in the configuration file."; }; -String STR_ADABAS_WRONG_KERNEL_PARAMETER -{ - Text[ en-US ] = "The parameters set for the kernel are not large enough. Please see the Help."; -}; - -String STR_ADABAS_NO_SERVER_START -{ - Text[ en-US ] = "The DB server could not be started."; -}; - String STR_ADABAS_NO_DB_CREATED { Text[ en-US ] = "An error occurred as the DB files were being created."; @@ -403,11 +389,6 @@ Message[ en-US ] = "The fully qualified file cannot be longer than \'#\' characters."; }; -String STR_ADABAS_NOT_ENOUGH_SPACE -{ - Text[ en-US ] = "An error occurred as the file \'#\' was being created. Please check if there is enough memory available."; -}; - String STR_NO_SAME_USER { Text[ en-US ] = "The administrator and the control user cannot have the same name!"; File [changed]: adabasui_resource.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/adabas/adabasui_resource.hrc?r1=1.4&r2=1.4.8.1 Delta lines: +6 -6 ------------------- --- adabasui_resource.hrc 2008-04-10 13:08:59+0000 1.4 +++ adabasui_resource.hrc 2008-05-13 05:54:43+0000 1.4.8.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: adabasui_resource.hrc,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.8.1 $ * * This file is part of OpenOffice.org. * @@ -68,16 +68,16 @@ // strings #define STR_ADABAS_NO_BACKUP_FILE RID_STRING_START + 0 -#define STR_ADABAS_NOT_ENOUGH_SPACE RID_STRING_START + 1 +// #define STR_NO_SAME_USER RID_STRING_START + 2 #define STR_DEVSPACE_NO_FILE RID_STRING_START + 3 #define STR_NO_PERMISSION RID_STRING_START + 4 #define STR_FILE_OR_DIR_UNKNOWN RID_STRING_START + 5 #define STR_STAT_WARNING RID_STRING_START + 6 -#define STR_ADABAS_NO_NEW_CONFIG_FILE RID_STRING_START + 7 +// #define STR_ADABAS_NO_PARAM_SET RID_STRING_START + 8 -#define STR_ADABAS_NO_SERVER_START RID_STRING_START + 9 -#define STR_ADABAS_WRONG_KERNEL_PARAMETER RID_STRING_START + 10 +// +// #define STR_ADABAS_NO_DB_CREATED RID_STRING_START + 11 #define STR_ADABAS_NO_SYSTEM_TABLES RID_STRING_START + 12 #define STR_ERROR_IN_ADABAS_INSTALLATION RID_STRING_START + 13 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
