diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:34:51 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:34:51 +0000 |
| commit | f500547d57fcbec837985638fcbf111fb0f99449 (patch) | |
| tree | cea1c405cdfb77e5cc2ad30aa10b6c674b630dde /configmgr | |
| parent | a17279a429014bb1a5c5370362ab3f612fcad0b9 (diff) | |
INTEGRATION: CWS cfgfix01 (1.17.166); FILE MERGED
2005/03/10 16:10:00 jb 1.17.166.1: #i38262# Fix spurious assertion when all requested changes are not real changes
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/api2/propsetaccessimpl.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/configmgr/source/api2/propsetaccessimpl.cxx b/configmgr/source/api2/propsetaccessimpl.cxx index 3a8f80d9ae62..164b795ec964 100644 --- a/configmgr/source/api2/propsetaccessimpl.cxx +++ b/configmgr/source/api2/propsetaccessimpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: propsetaccessimpl.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: vg $ $Date: 2003-04-01 13:29:47 $ + * last change: $Author: obo $ $Date: 2005-03-18 10:34:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -574,9 +574,9 @@ void implSetPropertyValues( NodeGroupAccess& rNode, const Sequence< OUString >& } } - if (!aChanges.test().isEmpty()) + if (!aChanges.test().compact().isEmpty()) { - Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges.compact(),true)); + Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges,true)); aSender.queryConstraints(aChanges); @@ -754,9 +754,9 @@ void implSetHierarchicalPropertyValues( NodeGroupAccess& rNode, const Sequence< continue; } - if (!aChanges.test().isEmpty()) + if (!aChanges.test().compact().isEmpty()) { - Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges.compact(),false)); + Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges,false)); aSender.queryConstraints(aChanges); @@ -1291,9 +1291,9 @@ void implSetPropertiesToDefault( NodeGroupAccess& rNode, const Sequence< OUStrin const bool bLocal = !aDefaulter.hasDoneSet(); - if (!aChanges.test().isEmpty()) + if (!aChanges.test().compact().isEmpty()) { - Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges.compact(),bLocal)); + Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges,bLocal)); aSender.queryConstraints(aChanges); @@ -1343,9 +1343,9 @@ void implSetAllPropertiesToDefault( NodeGroupAccess& rNode ) const bool bLocal = !aDefaulter.hasDoneSet(); - if (!aChanges.test().isEmpty()) + if (!aChanges.test().compact().isEmpty()) { - Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges.compact(),bLocal)); + Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges,bLocal)); aSender.queryConstraints(aChanges); |