diff options
Diffstat (limited to 'dbaccess/source/core/dataaccess/documentdefinition.cxx')
| -rw-r--r-- | dbaccess/source/core/dataaccess/documentdefinition.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 2789dbdf8dfc..51b07d58eb99 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -34,6 +34,7 @@ #include "sdbcoretools.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> +#include <osl/diagnose.h> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/mediadescriptor.hxx> @@ -338,13 +339,13 @@ namespace dbaccess inline LifetimeCoupler( const Reference< XInterface >& _rxClient, const Reference< XComponent >& _rxActor ) :m_xClient( _rxClient ) { - DBG_ASSERT( _rxActor.is(), "LifetimeCoupler::LifetimeCoupler: this will crash!" ); + OSL_ENSURE( _rxActor.is(), "LifetimeCoupler::LifetimeCoupler: this will crash!" ); osl_incrementInterlockedCount( &m_refCount ); { _rxActor->addEventListener( this ); } osl_decrementInterlockedCount( &m_refCount ); - DBG_ASSERT( m_refCount, "LifetimeCoupler::LifetimeCoupler: the actor is not holding us by hard ref - this won't work!" ); + OSL_ENSURE( m_refCount, "LifetimeCoupler::LifetimeCoupler: the actor is not holding us by hard ref - this won't work!" ); } virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException); @@ -682,7 +683,7 @@ namespace } catch ( Exception& ) { - DBG_ERROR( "PreserveVisualAreaSize::PreserveVisualAreaSize: caught an exception!" ); + OSL_FAIL( "PreserveVisualAreaSize::PreserveVisualAreaSize: caught an exception!" ); } } } @@ -697,7 +698,7 @@ namespace } catch ( Exception& ) { - DBG_ERROR( "PreserveVisualAreaSize::~PreserveVisualAreaSize: caught an exception!" ); + OSL_FAIL( "PreserveVisualAreaSize::~PreserveVisualAreaSize: caught an exception!" ); } } } @@ -716,7 +717,7 @@ namespace public: inline LayoutManagerLock( const Reference< XController >& _rxController ) { - DBG_ASSERT( _rxController.is(), "LayoutManagerLock::LayoutManagerLock: this will crash!" ); + OSL_ENSURE( _rxController.is(), "LayoutManagerLock::LayoutManagerLock: this will crash!" ); Reference< XFrame > xFrame( _rxController->getFrame() ); try { @@ -729,7 +730,7 @@ namespace } catch( Exception& ) { - DBG_ERROR( "LayoutManagerLock::LayoutManagerLock: caught an exception!" ); + OSL_FAIL( "LayoutManagerLock::LayoutManagerLock: caught an exception!" ); } } @@ -743,7 +744,7 @@ namespace } catch( Exception& ) { - DBG_ERROR( "LayoutManagerLock::~LayoutManagerLock: caught an exception!" ); + OSL_FAIL( "LayoutManagerLock::~LayoutManagerLock: caught an exception!" ); } } }; @@ -873,7 +874,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons // However, it is possible to programmatically load forms/reports, without actually // loading the database document into a frame. In this case, the user will be asked // here and now. - // #i87741# / 2008-05-05 / frank.schoenheit@sun.com + // #i87741# // allow the command arguments to downgrade the macro execution mode, but not to upgrade // it @@ -934,7 +935,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons sal_Int16( nOpenMode ) ) ), _rxEnvironment ); // Unreachable - DBG_ERROR( "unreachable" ); + OSL_FAIL( "unreachable" ); } OSL_ENSURE( m_pImpl->m_aProps.sPersistentName.getLength(), @@ -1237,7 +1238,7 @@ void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const R ,aEmpty),UNO_QUERY); lcl_resetFormsToEmptyDataSource( m_xEmbeddedObject ); - // #i57669# / 2005-12-01 / frank.schoenheit@sun.com + // #i57669# Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY); if ( xPersist.is() ) @@ -1756,8 +1757,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_ lcl_putLoadArgs( aExistentMediaDesc, optional_bool(), optional_bool() ); // don't put _bSuppressMacros and _bReadOnly here - if the document was already // loaded, we should not tamper with its settings. - // #i88977# / 2008-05-05 / frank.schoenheit@sun.com - // #i86872# / 2008-03-13 / frank.schoenheit@sun.com + // #i88977# #i86872# xModel->attachResource( xModel->getURL(), aExistentMediaDesc.getPropertyValues() ); } @@ -1769,7 +1769,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_ } // set the OfficeDatabaseDocument instance as parent of the embedded document - // #i40358# / 2005-01-19 / frank.schoenheit@sun.com + // #i40358# Reference< XChild > xDepdendDocAsChild( getComponent(), UNO_QUERY ); if ( xDepdendDocAsChild.is() ) { @@ -2053,7 +2053,7 @@ bool ODocumentDefinition::prepareClose() // suspend the controller. Embedded objects are not allowed to raise // own UI at their own discretion, instead, this has always to be triggered // by the embedding component. Thus, we do the suspend call here. - // #i49370# / 2005-06-09 / frank.schoenheit@sun.com + // #i49370# Reference< util::XCloseable > xComponent( impl_getComponent_throw( false ) ); if ( !xComponent.is() ) |