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

#83832# - Fixed HierarchyContent::setPropertyValues(...). Generated

Browse source 
PropertyChangeEvent.OldValue contained the new property value!
This commit is contained in:
Kai Sommerfeld 2001-02-22 09:53:14 +00:00
parent 722f13e568
commit 3a9c0f59d0
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ucb/source/ucp/hierarchy/hierarchycontent.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: hierarchycontent.cxx,v $ * $RCSfile: hierarchycontent.cxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: kso $ $Date: 2001-01-31 13:54:24 $ * last change: $Author: kso $ $Date: 2001-02-22 10:53:14 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -542,11 +542,11 @@ Any SAL_CALL HierarchyContent::execute( const Command& aCommand,
else else
{ {
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// Unknown command // Unsupported command
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
VOS_ENSURE( sal_False, VOS_ENSURE( sal_False,
"HierarchyContent::execute - unknown command!" ); "HierarchyContent::execute - unsupported command!" );
throw CommandAbortedException(); throw CommandAbortedException();
} }
@ -1175,23 +1175,22 @@ void HierarchyContent::setPropertyValues(
{ {
if ( aNewValue != m_aProps.aTitle ) if ( aNewValue != m_aProps.aTitle )
{ {
osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); osl::Guard< osl::Mutex > aGuard( m_aMutex );
m_aProps.aTitle = aNewValue;
m_aProps.aName
= HierarchyContentProvider::encodeSegment(
aNewValue );
// modified title -> modified URL -> exchange ! // modified title -> modified URL -> exchange !
if ( m_eState == PERSISTENT ) if ( m_eState == PERSISTENT )
bExchange = sal_True; bExchange = sal_True;
aGuard.clear();
aEvent.PropertyName = rValue.Name; aEvent.PropertyName = rValue.Name;
aEvent.OldValue = makeAny( m_aProps.aTitle ); aEvent.OldValue = makeAny( m_aProps.aTitle );
aEvent.NewValue = makeAny( aNewValue ); aEvent.NewValue = makeAny( aNewValue );
aChanges.getArray()[ nChanged ] = aEvent; aChanges.getArray()[ nChanged ] = aEvent;
m_aProps.aTitle = aNewValue;
m_aProps.aName
= HierarchyContentProvider::encodeSegment(
aNewValue );
nChanged++; nChanged++;
} }
} }
@ -1211,16 +1210,15 @@ void HierarchyContent::setPropertyValues(
{ {
if ( aNewValue != m_aProps.aTargetURL ) if ( aNewValue != m_aProps.aTargetURL )
{ {
osl::ClearableGuard< osl::Mutex > aGuard( osl::Guard< osl::Mutex > aGuard( m_aMutex );
m_aMutex );
m_aProps.aTargetURL = aNewValue;
aGuard.clear();
aEvent.PropertyName = rValue.Name; aEvent.PropertyName = rValue.Name;
aEvent.OldValue = makeAny( m_aProps.aTargetURL ); aEvent.OldValue = makeAny( m_aProps.aTargetURL );
aEvent.NewValue = makeAny( aNewValue ); aEvent.NewValue = makeAny( aNewValue );
aChanges.getArray()[ nChanged ] = aEvent; aChanges.getArray()[ nChanged ] = aEvent;
m_aProps.aTargetURL = aNewValue;
nChanged++; nChanged++;
} }
} }
@ -1243,11 +1241,11 @@ void HierarchyContent::setPropertyValues(
{ {
Any aOldValue = xAdditionalPropSet->getPropertyValue( Any aOldValue = xAdditionalPropSet->getPropertyValue(
rValue.Name ); rValue.Name );
xAdditionalPropSet->setPropertyValue(
rValue.Name, rValue.Value );
if ( aOldValue != rValue.Value ) if ( aOldValue != rValue.Value )
{ {
xAdditionalPropSet->setPropertyValue(
rValue.Name, rValue.Value );
aEvent.PropertyName = rValue.Name; aEvent.PropertyName = rValue.Name;
aEvent.OldValue = aOldValue; aEvent.OldValue = aOldValue;
aEvent.NewValue = rValue.Value; aEvent.NewValue = rValue.Value;