Tag: cws_src680_dba20blocker User: fs Date: 05/06/24 00:26:10 Modified: /dba/dbaccess/source/ui/browser/ brwctrlr.cxx, dsEntriesNoExp.cxx, genericcontroller.cxx /dba/dbaccess/source/ui/inc/ unodatbr.hxx
Log: copying fix for #121276# into this CWS 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.86&r2=1.86.72.1 Delta lines: +4 -6 ------------------- --- brwctrlr.cxx 1 Mar 2005 19:15:34 -0000 1.86 +++ brwctrlr.cxx 24 Jun 2005 07:26:04 -0000 1.86.72.1 @@ -2,9 +2,9 @@ * * $RCSfile: brwctrlr.cxx,v $ * - * $Revision: 1.86 $ + * $Revision: 1.86.72.1 $ * - * last change: $Author: kz $ $Date: 2005/03/01 19:15:34 $ + * last change: $Author: fs $ $Date: 2005/06/24 07:26:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2203,9 +2203,7 @@ //------------------------------------------------------------------------------ void SbaXDataBrowserController::SelectionChanged() { - InvalidateFeature(ID_BROWSER_INSERTCOLUMNS); - InvalidateFeature(ID_BROWSER_INSERTCONTENT); - InvalidateFeature(ID_BROWSER_FORMLETTER); + // not interested in } //------------------------------------------------------------------------------ File [changed]: dsEntriesNoExp.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dsEntriesNoExp.cxx?r1=1.12&r2=1.12.116.1 Delta lines: +13 -3 -------------------- --- dsEntriesNoExp.cxx 16 Nov 2004 14:49:57 -0000 1.12 +++ dsEntriesNoExp.cxx 24 Jun 2005 07:26:06 -0000 1.12.116.1 @@ -2,9 +2,9 @@ * * $RCSfile: dsEntriesNoExp.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.116.1 $ * - * last change: $Author: obo $ $Date: 2004/11/16 14:49:57 $ + * last change: $Author: fs $ $Date: 2005/06/24 07:26:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -177,6 +177,16 @@ else DBG_ERROR("SbaTableQueryBrowser::isSelected: invalid entry!"); return sal_False; +} +//------------------------------------------------------------------------------ +void SbaTableQueryBrowser::SelectionChanged() +{ + if ( !m_bShowMenu ) + { + InvalidateFeature(ID_BROWSER_INSERTCOLUMNS); + InvalidateFeature(ID_BROWSER_INSERTCONTENT); + InvalidateFeature(ID_BROWSER_FORMLETTER); + } } //------------------------------------------------------------------------------ void SbaTableQueryBrowser::describeSupportedFeatures() File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.63&r2=1.63.66.1 Delta lines: +20 -7 -------------------- --- genericcontroller.cxx 10 Mar 2005 16:45:35 -0000 1.63 +++ genericcontroller.cxx 24 Jun 2005 07:26:06 -0000 1.63.66.1 @@ -2,9 +2,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.63.66.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 16:45:35 $ + * last change: $Author: fs $ $Date: 2005/06/24 07:26:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -512,8 +512,13 @@ CommandCollector( nFeat, aFeatureCommands ) ); - DispatchIterator iterSearch = m_arrStatusListener.begin(); - DispatchIterator iterEnd = m_arrStatusListener.end(); + // it is possible that listeners are registered or revoked while + // we are notifying them, so we must use a copy of m_arrStatusListener, not + // m_arrStatusListener itself + // #121276# / 2005-05-19 / [EMAIL PROTECTED] + Dispatch aNotifyLoop( m_arrStatusListener ); + DispatchIterator iterSearch = aNotifyLoop.begin(); + DispatchIterator iterEnd = aNotifyLoop.end(); while (iterSearch != iterEnd) { @@ -580,7 +585,15 @@ ::std::bind2nd( SupportedFeaturesEqualId(), aNextFeature.nId ) ); - OSL_ENSURE( m_aSupportedFeatures.end() != aFeaturePos, "OGenericUnoController::InvalidateFeature_Impl: out of interest: please tell FS how you got this assertion ..." ); +#if OSL_DEBUG_LEVEL > 0 + if ( m_aSupportedFeatures.end() == aFeaturePos ) + { + ::rtl::OString sMessage( "OGenericUnoController::InvalidateFeature_Impl: feature id " ); + sMessage += ::rtl::OString::valueOf( aNextFeature.nId ); + sMessage += ::rtl::OString( " has been invalidated, but is not supported!" ); + OSL_ENSURE( false, sMessage.getStr() ); + } +#endif if ( m_aSupportedFeatures.end() != aFeaturePos ) // we really know this feature ImplBroadcastFeatureState( aFeaturePos->first, aNextFeature.xListener, aNextFeature.bForceBroadcast ); @@ -876,7 +889,7 @@ #if DBG_UTIL String sMessage("OGenericUnoController::GetState(", RTL_TEXTENCODING_ASCII_US); sMessage += String::CreateFromInt32(nId); - sMessage.AppendAscii(") : catched an exception ! message : "); + sMessage.AppendAscii("): caught an exception ! message : "); sMessage += (const sal_Unicode*)e.Message; DBG_ERROR(ByteString(sMessage, gsl_getSystemTextEncoding()).GetBuffer()); #else Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: unodatbr.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/unodatbr.hxx?r1=1.59&r2=1.59.60.1 Delta lines: +4 -3 ------------------- --- unodatbr.hxx 18 Mar 2005 10:11:22 -0000 1.59 +++ unodatbr.hxx 24 Jun 2005 07:26:07 -0000 1.59.60.1 @@ -2,9 +2,9 @@ * * $RCSfile: unodatbr.hxx,v $ * - * $Revision: 1.59 $ + * $Revision: 1.59.60.1 $ * - * last change: $Author: obo $ $Date: 2005/03/18 10:11:22 $ + * last change: $Author: fs $ $Date: 2005/06/24 07:26:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -295,6 +295,7 @@ // SbaGridListener overridables virtual void RowChanged(); virtual void ColumnChanged(); + virtual void SelectionChanged(); String getURL() const; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
