User: kz      
Date: 2008-03-06 18:31:33+0000
Modified:
   dba/dbaccess/source/ui/uno/unosqlmessage.cxx

Log:
 INTEGRATION: CWS odbmacros2 (1.12.196); FILE MERGED
 2007/12/06 13:34:07 fs 1.12.196.1: during #i49133#: support a HelpURL property

File Changes:

Directory: /dba/dbaccess/source/ui/uno/
=======================================

File [changed]: unosqlmessage.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/unosqlmessage.cxx?r1=1.12&r2=1.13
Delta lines:  +4 -2
-------------------
--- unosqlmessage.cxx   2006-09-17 07:34:47+0000        1.12
+++ unosqlmessage.cxx   2008-03-06 18:31:29+0000        1.13
@@ -82,6 +82,8 @@
 {
        registerMayBeVoidProperty(PROPERTY_SQLEXCEPTION, 
PROPERTY_ID_SQLEXCEPTION, PropertyAttribute::TRANSIENT | 
PropertyAttribute::MAYBEVOID,
                &m_aException, ::getCppuType(static_cast<SQLException*>(NULL)));
+    registerProperty( PROPERTY_HELP_URL, PROPERTY_ID_HELP_URL, 
PropertyAttribute::TRANSIENT,
+        &m_sHelpURL, ::getCppuType( &m_sHelpURL ) );
 }
 
 //-------------------------------------------------------------------------
@@ -169,8 +171,8 @@
 
//------------------------------------------------------------------------------
 Dialog*        OSQLMessageDialog::createDialog(Window* _pParent)
 {
-       if (m_aException.hasValue())
-        return new OSQLMessageBox( _pParent, SQLExceptionInfo( m_aException ) 
);
+       if ( m_aException.hasValue() )
+        return new OSQLMessageBox( _pParent, SQLExceptionInfo( m_aException ), 
WB_OK | WB_DEF_OK, m_sHelpURL );
 
        OSL_ENSURE(sal_False, "OSQLMessageDialog::createDialog : You should use 
the SQLException property to specify the error to display!");
        return new OSQLMessageBox(_pParent, SQLException());




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to