Tag: cws_dev300_odbmacros3 User: fs Date: 2008-05-08 10:07:03+0000 Modified: dba/dbaccess/source/ext/macromigration/migrationlog.cxx dba/dbaccess/source/ext/macromigration/migrationlog.hxx dba/dbaccess/source/ext/macromigration/migrationerror.hxx
Log: new error conditions, +MigrationLod::hadFailure File Changes: Directory: /dba/dbaccess/source/ext/macromigration/ =================================================== File [changed]: migrationlog.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/migrationlog.cxx?r1=1.4.2.2&r2=1.4.2.3 Delta lines: +9 -1 ------------------- --- migrationlog.cxx 2008-04-30 10:29:34+0000 1.4.2.2 +++ migrationlog.cxx 2008-05-08 10:07:00+0000 1.4.2.3 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: migrationlog.cxx,v $ - * $Revision: 1.4.2.2 $ + * $Revision: 1.4.2.3 $ * * This file is part of OpenOffice.org. * @@ -150,6 +150,12 @@ } //-------------------------------------------------------------------- + bool MigrationLog::hadFailure() const + { + return !m_pData->aFailures.empty(); + } + + //-------------------------------------------------------------------- void MigrationLog::backedUpDocument( const ::rtl::OUString& _rNewDocumentLocation ) { m_pData->sBackupLocation = _rNewDocumentLocation; @@ -259,6 +265,8 @@ case ERR_BIND_SCRIPT_STORAGE_FAILED: pAsciiErrorDescription = "binding to the script storage failed"; break; case ERR_REMOVE_SCRIPTS_STORAGE_FAILED: pAsciiErrorDescription = "removing a scripts storage failed"; break; case ERR_DOCUMENT_BACKUP_FAILED: pAsciiErrorDescription = "document backup failed"; break; + case ERR_UNKNOWN_SCRIPT_FOLDER: pAsciiErrorDescription = "unknown script folder"; break; + case ERR_EXAMINING_SCRIPTS_FOLDER_FAILED: pAsciiErrorDescription = "examining the 'Scripts' folder failed"; break; // do *not* add a default case here: Without a default, some compilers will warn you when // you miss a newly-introduced enum value here File [changed]: migrationlog.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/migrationlog.hxx?r1=1.3.2.1&r2=1.3.2.2 Delta lines: +4 -1 ------------------- --- migrationlog.hxx 2008-04-30 09:23:56+0000 1.3.2.1 +++ migrationlog.hxx 2008-05-08 10:07:00+0000 1.3.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: migrationlog.hxx,v $ - * $Revision: 1.3.2.1 $ + * $Revision: 1.3.2.2 $ * * This file is part of OpenOffice.org. * @@ -69,6 +69,9 @@ */ void logRecoverable( const MigrationError& _rError ); + /// checks whether logFailure has been called + bool hadFailure() const; + /// logs the fact that the database document has been backed up void backedUpDocument( const ::rtl::OUString& _rNewDocumentLocation ); File [changed]: migrationerror.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/migrationerror.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +5 -3 ------------------- --- migrationerror.hxx 2008-04-30 09:24:17+0000 1.1.2.1 +++ migrationerror.hxx 2008-05-08 10:07:00+0000 1.1.2.2 @@ -7,7 +7,7 @@ * * $RCSfile: migrationerror.hxx,v $ * -* $Revision: 1.1.2.1 $ +* $Revision: 1.1.2.2 $ * * This file is part of OpenOffice.org. * @@ -62,7 +62,9 @@ ERR_ADJUSTING_FORMCOMP_EVENTS_FAILED, ERR_BIND_SCRIPT_STORAGE_FAILED, ERR_REMOVE_SCRIPTS_STORAGE_FAILED, - ERR_DOCUMENT_BACKUP_FAILED + ERR_DOCUMENT_BACKUP_FAILED, + ERR_UNKNOWN_SCRIPT_FOLDER, + ERR_EXAMINING_SCRIPTS_FOLDER_FAILED }; //==================================================================== --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
