Tag: cws_src680_odbmacros2 User: fs Date: 2007-12-19 11:05:49+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx
Log: objectHasMacros: catch exceptions File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.21.2.4&r2=1.21.2.5 Delta lines: +17 -8 -------------------- --- ModelImpl.cxx 2007-12-19 11:03:45+0000 1.21.2.4 +++ ModelImpl.cxx 2007-12-19 11:05:46+0000 1.21.2.5 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.cxx,v $ * - * $Revision: 1.21.2.4 $ + * $Revision: 1.21.2.5 $ * - * last change: $Author: fs $ $Date: 2007/12/19 11:03:45 $ + * last change: $Author: fs $ $Date: 2007/12/19 11:05:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -513,6 +513,9 @@ { OSL_PRECOND( _rxContainerStorage.is(), "ODatabaseModelImpl::objectHasMacros: this will crash!" ); + bool bHasMacros = true; + try + { if ( !_rxContainerStorage->hasByName( _rPersistentName ) ) return false; @@ -521,7 +524,13 @@ // TODO: opening the storage is too expensive, find some hasByHierarchicalName or so - return ::sfx2::DocumentMacroMode::storageHasMacros( xObjectStor ); + bHasMacros = ::sfx2::DocumentMacroMode::storageHasMacros( xObjectStor ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + return bHasMacros; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
