strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS eforms2 (1.26.108); FILE MERGED

Browse source 
2004/11/07 01:59:38 dvo 1.26.108.4: RESYNC: (1.29-1.30); FILE MERGED
2004/06/30 15:13:51 dvo 1.26.108.3: RESYNC: (1.27-1.29); FILE MERGED
2004/04/08 12:11:21 dvo 1.26.108.2: RESYNC: (1.26-1.27); FILE MERGED
2004/03/25 17:36:58 dvo 1.26.108.1: #114856# allow changes of control properties while control is focussed
This commit is contained in:
Oliver Bolte 2004-11-16 09:01:30 +00:00
parent 1b588a12e9
commit 4d2758b588
1 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
toolkit/source/controls/unocontrol.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: unocontrol.cxx,v $
*
* $Revision: 1.30 $
* $Revision: 1.31 $
*
* last change: $Author: pjunck $ $Date: 2004-10-22 11:36:32 $
* last change: $Author: obo $ $Date: 2004-11-16 10:01:30 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -157,6 +157,8 @@
#include <comphelper/container.hxx>
#endif
#include <algorithm>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
@ -232,7 +234,6 @@ UnoControl::UnoControl()
, maPaintListeners( *this )
, maModeChangeListeners( GetMutex() )
{
mbUpdatingModel = sal_False;
mbDisposePeer = sal_True;
mbRefeshingPeer = sal_False;
mbCreatingPeer = sal_False;
@ -406,11 +407,38 @@ sal_Bool UnoControl::requiresNewPeer( const ::rtl::OUString& /* _rPropertyName *
// XPropertiesChangeListener
void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException)
{
Sequence< PropertyChangeEvent > aEvents( rEvents );
{
::osl::MutexGuard aGuard( GetMutex() );
if ( msPropertyCurrentlyUpdating.getLength() )
{
// strip the property which we are currently updating (somewhere up the stack)
PropertyChangeEvent* pEvents = aEvents.getArray();
PropertyChangeEvent* pEventsEnd = pEvents + aEvents.getLength();
for ( ; pEvents < pEventsEnd; ++pEvents )
if ( pEvents->PropertyName == msPropertyCurrentlyUpdating )
{
if ( pEvents != pEventsEnd )
::std::copy( pEvents + 1, pEventsEnd, pEvents );
--pEventsEnd;
}
aEvents.realloc( pEventsEnd - aEvents.getConstArray() );
if ( !aEvents.getLength() )
return;
}
}
ImplModelPropertiesChanged( aEvents );
}
void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents )
{
::osl::ClearableGuard< ::osl::Mutex > aGuard( GetMutex() );
// kommt von xModel
if( !IsUpdatingModel() && getPeer().is() )
if( getPeer().is() )
{
DECLARE_STL_VECTOR( PropertyValue, PropertyValueVector);
PropertyValueVector aPeerPropertiesToSet;