User: obo Date: 2006/07/10 08:23:47 Modified: dba/dbaccess/source/ui/browser/brwctrlr.cxx
Log: INTEGRATION: CWS qiq (1.91.16); FILE MERGED 2006/06/27 12:14:15 fs 1.91.16.3: RESYNC: (1.91-1.92); FILE MERGED 2006/06/19 09:27:50 fs 1.91.16.2: during #i51143#: A FeatureState can now transport more than one state. In particular, it has typed bChecked and sTitle members, instead of the previous unchecked aState 2006/05/11 10:38:04 fs 1.91.16.1: during #i51143#: don't use prependContextInfo if we have only one error string File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: brwctrlr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/brwctrlr.cxx?r1=1.92&r2=1.93 Delta lines: +11 -12 --------------------- --- brwctrlr.cxx 20 Jun 2006 02:55:50 -0000 1.92 +++ brwctrlr.cxx 10 Jul 2006 15:23:44 -0000 1.93 @@ -225,15 +225,14 @@ } \ catch(SQLException& e) \ { \ - ::com::sun::star::sdb::SQLContext eExtendedInfo = \ - ::dbtools::prependContextInfo(e, Reference< XInterface > (), context); \ + SQLException aError = ::dbtools::prependErrorInfo(e, *this, context); \ ::com::sun::star::sdb::SQLErrorEvent aEvent; \ - aEvent.Reason <<= eExtendedInfo; \ + aEvent.Reason <<= aError; \ errorOccured(aEvent); \ } \ catch(Exception&) \ { \ - DBG_ERROR(message); \ + DBG_UNHANDLED_EXCEPTION(); \ } \ #define DO_SAFE( action, message ) try { action; } catch(Exception&) { DBG_ERROR(message); } ; @@ -1542,7 +1541,7 @@ else aReturn.bEnabled = sal_True; - aReturn.aState <<= ::rtl::OUString((ID_BROWSER_UNDORECORD == nId) ? m_sStateUndoRecord : m_sStateSaveRecord); + aReturn.sTitle = (ID_BROWSER_UNDORECORD == nId) ? m_sStateUndoRecord : m_sStateSaveRecord; } break; case ID_BROWSER_EDITDOC: @@ -1565,7 +1564,7 @@ aReturn.bEnabled = sal_True; sal_Int16 nGridMode = getBrowserView()->getVclControl()->GetOptions(); - aReturn.aState = ::comphelper::makeBoolAny(nGridMode > DbGridControl::OPT_READONLY); + aReturn.bChecked = nGridMode > DbGridControl::OPT_READONLY; } break; case ID_BROWSER_FILTERED: @@ -1576,12 +1575,12 @@ ::rtl::OUString aHaving = ::comphelper::getString(xActiveSet->getPropertyValue(PROPERTY_HAVING_CLAUSE)); if ( aFilter.getLength() || aHaving.getLength() ) { - aReturn.aState = xActiveSet->getPropertyValue(PROPERTY_APPLYFILTER); + xActiveSet->getPropertyValue( PROPERTY_APPLYFILTER ) >>= aReturn.bChecked; aReturn.bEnabled = sal_True; } else { - aReturn.aState = ::comphelper::makeBoolAny(sal_False); + aReturn.bChecked = sal_False; aReturn.bEnabled = sal_False; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
