User: kz Date: 2008-03-06 18:26:24+0000 Modified: dba/dbaccess/source/ui/inc/sqlmessage.hxx
Log: INTEGRATION: CWS odbmacros2 (1.6.116); FILE MERGED 2007/12/06 13:33:47 fs 1.6.116.1: during #i49133#: support a HelpURL property File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: sqlmessage.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/sqlmessage.hxx?r1=1.6&r2=1.7 Delta lines: +10 -21 --------------------- --- sqlmessage.hxx 2007-05-10 10:33:38+0000 1.6 +++ sqlmessage.hxx 2008-03-06 18:26:21+0000 1.7 @@ -76,6 +76,7 @@ FixedImage m_aInfoImage; FixedText m_aTitle; FixedText m_aMessage; + ::rtl::OUString m_sHelpURL; ::std::auto_ptr< SQLMessageBox_Impl > m_pImpl; @@ -92,40 +93,28 @@ public: /** display an SQLException with auto-recognizing a main and a detailed message - <p/> - The first two messages from the exception chain are used as main and detailed message (recognizing the - detailed field of an <type scope="com::sun::star::sdb">SQLContext</type>). - <br/> - If only one message is present, a default title ("error reading ...") is used - */ - OSQLMessageBox(Window* _pParent, - const ::com::sun::star::sdbc::SQLException& _rError, - WinBits _nStyle = WB_OK | WB_DEF_OK, - MessageType _eImage = Error); - /** display an SQLException with auto-recognizing a main and a detailed message - <p/> The first two messages from the exception chain are used as main and detailed message (recognizing the detailed field of an <type scope="com::sun::star::sdb">SQLContext</type>). - <br/> - If only one message is present, a default title ("error reading ...") is used */ - OSQLMessageBox(Window* _pParent, + OSQLMessageBox( + Window* _pParent, const dbtools::SQLExceptionInfo& _rException, WinBits _nStyle = WB_OK | WB_DEF_OK, - MessageType _eImage = AUTO); + const ::rtl::OUString& _rHelpURL = ::rtl::OUString() + ); /** display a database related error message <p/> @param rTitle the title to display @param rMessage the detailed message to display - @param eImage determines the image to use. AUTO is disallowed in this constructor version + @param _eType determines the image to use. AUTO is disallowed in this constructor version */ OSQLMessageBox(Window* pParent, const UniString& rTitle, const UniString& rMessage, WinBits nStyle = WB_OK | WB_DEF_OK, - MessageType eImage = Info, + MessageType _eType = Info, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); ~OSQLMessageBox(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
