Tag: cws_src680_qiq User: fs Date: 06/05/10 03:59:35 Modified: /dba/dbaccess/source/ui/dlg/ sqlmessage.cxx
Log: +ImageType::AUTO File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: sqlmessage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/sqlmessage.cxx?r1=1.20&r2=1.20.118.1 Delta lines: +24 -11 --------------------- --- sqlmessage.cxx 23 Sep 2005 12:32:10 -0000 1.20 +++ sqlmessage.cxx 10 May 2006 10:59:32 -0000 1.20.118.1 @@ -4,9 +4,9 @@ * * $RCSfile: sqlmessage.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.20.118.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:32:10 $ + * last change: $Author: fs $ $Date: 2006/05/10 10:59:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -156,9 +156,9 @@ DBG_ASSERT(aInfo.isValid(), "OExceptionChainDialog::OExceptionChainDialog : invalid chain start !"); SQLExceptionIteratorHelper aIter(aInfo); - Image aErrorImage( ModuleRes( bHiContrast ? BMP_EXCEPTION_ERROR_SCH : BMP_EXCEPTION_ERROR)), + Image aErrorImage ( ModuleRes( bHiContrast ? BMP_EXCEPTION_ERROR_SCH : BMP_EXCEPTION_ERROR)), aWarningImage( ModuleRes( bHiContrast ? BMP_EXCEPTION_WARNING_SCH : BMP_EXCEPTION_WARNING)), - m_aInfoImage( ModuleRes( bHiContrast ? BMP_EXCEPTION_INFO_SCH : BMP_EXCEPTION_INFO)); + aInfoImage ( ModuleRes( bHiContrast ? BMP_EXCEPTION_INFO_SCH : BMP_EXCEPTION_INFO)); bool bHave22018 = false; @@ -189,11 +189,11 @@ case SQLExceptionInfo::SQL_CONTEXT: { - pListEntry = m_aExceptionList.InsertEntry(sInfoLabel, m_aInfoImage, m_aInfoImage); + pListEntry = m_aExceptionList.InsertEntry(sInfoLabel, aInfoImage, aInfoImage); const SQLContext* pContext = (const SQLContext*)aCurrent; if (pContext->Details.getLength()) { - SvLBoxEntry* pDetailsEntry = m_aExceptionList.InsertEntry(sDetailsLabel, m_aInfoImage, m_aInfoImage, pListEntry); + SvLBoxEntry* pDetailsEntry = m_aExceptionList.InsertEntry(sDetailsLabel, aInfoImage, aInfoImage, pListEntry); pDetailsEntry->SetUserData(pUserData); m_aExceptionList.Expand(pListEntry); } @@ -215,7 +215,7 @@ // #i24021# / 2004-10-14 / [EMAIL PROTECTED] if ( bHave22018 ) { - SvLBoxEntry* pExplanation = m_aExceptionList.InsertEntry( sInfoLabel, m_aInfoImage, m_aInfoImage ); + SvLBoxEntry* pExplanation = m_aExceptionList.InsertEntry( sInfoLabel, aInfoImage, aInfoImage ); SQLContext aExplanation; aExplanation.Message = String( ModuleRes( STR_EXPLAN_STRINGCONVERSION_ERROR ) ); @@ -289,7 +289,7 @@ void OSQLMessageBox::Construct(const UniString& rTitle, const UniString& rMessage, WinBits nStyle, - MessageType eImage) + MessageType _eImage) { // Changed as per BugID 79541 Branding/Configuration ::utl::ConfigManager* pMgr = ::utl::ConfigManager::GetConfigManager(); @@ -319,8 +319,11 @@ m_pInfoButton = NULL; // Image festlegen - switch (eImage) + switch (_eImage) { + default: + DBG_ERROR( "OSQLMessageBox::Construct: unsupported image type!" ); + case Info: m_aInfoImage.SetImage(InfoBox::GetStandardImage()); break; @@ -503,6 +506,16 @@ sTitle = ModuleRes(STR_GENERAL_SDB_ERROR); } + if ( _eImage == AUTO ) + { + switch ( _rException.getType() ) + { + case SQLExceptionInfo::SQL_EXCEPTION: _eImage = Error; break; + case SQLExceptionInfo::SQL_WARNING: _eImage = Warning; break; + case SQLExceptionInfo::SQL_CONTEXT: _eImage = Info; break; + } + } + Construct(sTitle, sMessage, _nStyle, _eImage); } @@ -519,7 +532,7 @@ { DBG_CTOR(OSQLMessageBox,NULL); - Construct(_rTitle, _rError.Message, _nStyle, _eImage); + Construct(_rTitle, _rError.Message, _nStyle, _eImage == AUTO ? Error : _eImage ); } //------------------------------------------------------------------------------ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
