summaryrefslogtreecommitdiffstats
path: root/svx/source/sdr/properties/defaultproperties.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/sdr/properties/defaultproperties.cxx')
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx48
1 files changed, 24 insertions, 24 deletions
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index fd27a9744d80..fadebf4c6dfd 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -110,20 +110,20 @@ namespace sdr::properties
{
const sal_uInt16 nWhichID(rItem.Which());
- if(AllowItemChange(nWhichID, &rItem))
- {
- ItemChange(nWhichID, &rItem);
- PostItemChange(nWhichID);
+ if(!AllowItemChange(nWhichID, &rItem))
+ return;
- if (WantItemSetInItemSetChanged())
- {
- SfxItemSet aSet(GetSdrObject().GetObjectItemPool(), nWhichID, nWhichID);
- aSet.Put(rItem);
- ItemSetChanged(&aSet);
- }
- else
- ItemSetChanged(nullptr);
+ ItemChange(nWhichID, &rItem);
+ PostItemChange(nWhichID);
+
+ if (WantItemSetInItemSetChanged())
+ {
+ SfxItemSet aSet(GetSdrObject().GetObjectItemPool(), nWhichID, nWhichID);
+ aSet.Put(rItem);
+ ItemSetChanged(&aSet);
}
+ else
+ ItemSetChanged(nullptr);
}
void DefaultProperties::SetObjectItemDirect(const SfxPoolItem& rItem)
@@ -138,21 +138,21 @@ namespace sdr::properties
void DefaultProperties::ClearObjectItem(const sal_uInt16 nWhich)
{
- if(AllowItemChange(nWhich))
- {
- ItemChange(nWhich);
- PostItemChange(nWhich);
+ if(!AllowItemChange(nWhich))
+ return;
+
+ ItemChange(nWhich);
+ PostItemChange(nWhich);
- if(nWhich)
+ if(nWhich)
+ {
+ if (WantItemSetInItemSetChanged())
{
- if (WantItemSetInItemSetChanged())
- {
- SfxItemSet aSet(GetSdrObject().GetObjectItemPool(), nWhich, nWhich);
- ItemSetChanged(&aSet);
- }
- else
- ItemSetChanged(nullptr);
+ SfxItemSet aSet(GetSdrObject().GetObjectItemPool(), nWhich, nWhich);
+ ItemSetChanged(&aSet);
}
+ else
+ ItemSetChanged(nullptr);
}
}