Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:01:06 Modified: dba/dbaccess/source/ui/dlg/sqlmessage.cxx
Log: RESYNC: (1.20-1.21); FILE MERGED 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.4.3&r2=1.20.4.4 Delta lines: +8 -13 -------------------- --- sqlmessage.cxx 25 Apr 2006 13:03:02 -0000 1.20.4.3 +++ sqlmessage.cxx 4 Jul 2006 08:01:03 -0000 1.20.4.4 @@ -179,7 +179,6 @@ case SQLExceptionInfo::SQL_EXCEPTION: { pListEntry = m_aExceptionList.InsertEntry(sErrorLabel, aErrorImage, aErrorImage); - const SQLException* pException = (const SQLException*)aCurrent; } break; @@ -292,8 +291,7 @@ MessageType eImage) { // Changed as per BugID 79541 Branding/Configuration - ::utl::ConfigManager* pMgr = ::utl::ConfigManager::GetConfigManager(); - Any aProductName = pMgr->GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME); + Any aProductName = ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME ); ::rtl::OUString sProductName; aProductName >>= sProductName; @@ -360,9 +358,6 @@ m_aMessage.SetText(rMessage); // Buttons anlegen - long nBtnCount = 0; - sal_Bool bHelp = sal_False; //aHelpBtn.IsVisible(); - sal_uInt16 nDefId = 0; if (nStyle & WB_DEF_YES) @@ -514,8 +509,8 @@ ,m_aInfoImage(this) ,m_aTitle(this,WB_WORDBREAK | WB_LEFT) ,m_aMessage(this,WB_WORDBREAK | WB_LEFT) - ,m_pInfoButton(NULL) ,m_aNextChainElement(SQLExceptionInfo(_rError).get()) + ,m_pInfoButton(NULL) { DBG_CTOR(OSQLMessageBox,NULL); @@ -528,8 +523,8 @@ ,m_aInfoImage(this) ,m_aTitle(this,WB_WORDBREAK | WB_LEFT) ,m_aMessage(this,WB_WORDBREAK | WB_LEFT) - ,m_pInfoButton(NULL) ,m_aNextChainElement(SQLExceptionInfo(_rError).get()) + ,m_pInfoButton(NULL) { DBG_CTOR(OSQLMessageBox,NULL); @@ -542,8 +537,8 @@ ,m_aInfoImage(this) ,m_aTitle(this,WB_WORDBREAK | WB_LEFT) ,m_aMessage(this,WB_WORDBREAK | WB_LEFT) - ,m_pInfoButton(NULL) ,m_aNextChainElement(_rException.get()) + ,m_pInfoButton(NULL) { DBG_CTOR(OSQLMessageBox,NULL); @@ -572,7 +567,7 @@ } //-------------------------------------------------------------------------- -IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, pButton ) +IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ ) { OExceptionChainDialog aDlg( this, m_aNextChainElement ); aDlg.Execute(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
