summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svx/source/engine3d/obj3d.cxx8
-rw-r--r--svx/source/engine3d/scene3d.cxx10
-rw-r--r--svx/source/svdraw/svdobj.cxx19
-rw-r--r--svx/source/svdraw/svdocapt.cxx8
-rw-r--r--svx/source/svdraw/svdocirc.cxx8
-rw-r--r--svx/source/svdraw/svdoedge.cxx8
-rw-r--r--svx/source/svdraw/svdogrp.cxx8
-rw-r--r--svx/source/svdraw/svdomeas.cxx8
-rw-r--r--svx/source/svdraw/svdorect.cxx8
-rw-r--r--svx/source/svdraw/svdovirt.cxx8
10 files changed, 50 insertions, 43 deletions
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 17e94f6604f6..062c5f7cb4c5 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: obj3d.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: aw $ $Date: 2001-02-15 16:10:18 $
+ * last change: $Author: dl $ $Date: 2001-03-28 08:07:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1655,10 +1655,10 @@ void E3dObject::ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem)
SdrAttrObj::ItemChange(nWhich, pNewItem);
}
-void E3dObject::ItemSetChanged()
+void E3dObject::ItemSetChanged( const SfxItemSet& rSet )
{
// call parent
- SdrAttrObj::ItemSetChanged();
+ SdrAttrObj::ItemSetChanged( rSet );
// local changes
StructureChanged(this);
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 3ec594bcf0a9..24f9d23745ad 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: scene3d.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: aw $ $Date: 2001-02-09 17:53:13 $
+ * last change: $Author: dl $ $Date: 2001-03-28 08:08:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1741,15 +1741,15 @@ void E3dScene::PostItemChange(const sal_uInt16 nWhich)
////////////////////////////////////////////////////////////////////////////////////////////////////
// ItemSet was changed, maybe user wants to react
-void E3dScene::ItemSetChanged()
+void E3dScene::ItemSetChanged( const SfxItemSet& rSet )
{
// call parent
- E3dObject::ItemSetChanged();
+ E3dObject::ItemSetChanged( rSet );
// set at all contained objects
sal_uInt32 nCount(pSub->GetObjCount());
for(sal_uInt32 a(0); a < nCount; a++)
- pSub->GetObj(a)->ItemSetChanged();
+ pSub->GetObj(a)->ItemSetChanged( rSet );
}
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 24a7044b804f..1861e0f42cca 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svdobj.cxx,v $
*
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
- * last change: $Author: cl $ $Date: 2001-03-19 09:52:30 $
+ * last change: $Author: dl $ $Date: 2001-03-28 08:03:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -3282,7 +3282,10 @@ void SdrObject::SetItem( const SfxPoolItem& rItem )
{
ItemChange(nWhichID, &rItem);
PostItemChange(nWhichID);
- ItemSetChanged();
+
+ SfxItemSet aSet( *GetItemPool(), nWhichID, nWhichID, 0 );
+ aSet.Put( rItem );
+ ItemSetChanged( aSet );
}
}
@@ -3292,7 +3295,9 @@ void SdrObject::ClearItem( const sal_uInt16 nWhich )
{
ItemChange(nWhich);
PostItemChange(nWhich);
- ItemSetChanged();
+
+ SfxItemSet aSet( *GetItemPool(), nWhich, nWhich, 0 );
+ ItemSetChanged( aSet );
}
}
@@ -3303,6 +3308,7 @@ void SdrObject::SetItemSet( const SfxItemSet& rSet )
const SfxPoolItem *pPoolItem;
std::vector< sal_uInt16 > aPostItemChangeList;
BOOL bDidChange(FALSE);
+ SfxItemSet aSet( *GetItemPool(), SDRATTR_START, SDRATTR_END );
while(nWhich)
{
@@ -3313,6 +3319,7 @@ void SdrObject::SetItemSet( const SfxItemSet& rSet )
bDidChange = TRUE;
ItemChange(nWhich, pPoolItem);
aPostItemChangeList.push_back( nWhich );
+ aSet.Put( *pPoolItem );
}
}
nWhich = aWhichIter.NextWhich();
@@ -3328,14 +3335,14 @@ void SdrObject::SetItemSet( const SfxItemSet& rSet )
aIter++;
}
- ItemSetChanged();
+ ItemSetChanged( aSet );
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
// ItemSet was changed, maybe user wants to react
-void SdrObject::ItemSetChanged()
+void SdrObject::ItemSetChanged(const SfxItemSet& rSet)
{
}
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 527a59584d5b..af969472775f 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svdocapt.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: aw $ $Date: 2001-02-15 16:11:33 $
+ * last change: $Author: dl $ $Date: 2001-03-28 08:05:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -840,13 +840,13 @@ SfxItemSet* SdrCaptionObj::CreateNewItemSet(SfxItemPool& rPool)
////////////////////////////////////////////////////////////////////////////////////////////////////
// private support routines for ItemSet access
-void SdrCaptionObj::ItemSetChanged()
+void SdrCaptionObj::ItemSetChanged(const SfxItemSet& rSet)
{
// local changes
ImpRecalcTail();
// call parent
- SdrRectObj::ItemSetChanged();
+ SdrRectObj::ItemSetChanged(rSet);
}
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index f11a75aead28..0caf67143c5a 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svdocirc.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: aw $ $Date: 2001-02-15 16:11:33 $
+ * last change: $Author: dl $ $Date: 2001-03-28 08:05:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1364,13 +1364,13 @@ SfxItemSet* SdrCircObj::CreateNewItemSet(SfxItemPool& rPool)
////////////////////////////////////////////////////////////////////////////////////////////////////
// private support routines for ItemSet access
-void SdrCircObj::ItemSetChanged()
+void SdrCircObj::ItemSetChanged(const SfxItemSet& rSet)
{
// local changes
SetXPolyDirty();
// call parent
- SdrRectObj::ItemSetChanged();
+ SdrRectObj::ItemSetChanged(rSet);
// local changes
ImpSetAttrToCircInfo();
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 205b16ff5121..9bd51791ef95 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svdoedge.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: aw $ $Date: 2001-03-09 17:07:18 $
+ * last change: $Author: dl $ $Date: 2001-03-28 08:05:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -344,10 +344,10 @@ SfxItemSet* SdrEdgeObj::CreateNewItemSet(SfxItemPool& rPool)
////////////////////////////////////////////////////////////////////////////////////////////////////
// private support routines for ItemSet access
-void SdrEdgeObj::ItemSetChanged()
+void SdrEdgeObj::ItemSetChanged(const SfxItemSet& rSet)
{
// call parent
- SdrTextObj::ItemSetChanged();
+ SdrTextObj::ItemSetChanged(rSet);
// local changes
ImpSetAttrToEdgeInfo();
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index f3ca95eb7780..4274c8745adc 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svdogrp.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: dl $ $Date: 2001-03-16 09:45:40 $
+ * last change: $Author: dl $ $Date: 2001-03-28 08:06:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1435,13 +1435,13 @@ void SdrObjGroup::ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewIte
////////////////////////////////////////////////////////////////////////////////////////////////////
// ItemSet was changed, maybe user wants to react
-void SdrObjGroup::ItemSetChanged()
+void SdrObjGroup::ItemSetChanged(const SfxItemSet& rSet)
{
if(!IsLinkedGroup())
{
sal_uInt32 nCount(pSub->GetObjCount());
for(sal_uInt32 a(0); a < nCount; a++)
- pSub->GetObj(a)->ItemSetChanged();
+ pSub->GetObj(a)->ItemSetChanged(rSet);
}
}
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 7942603cce3a..9a0f2751986f 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svdomeas.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: aw $ $Date: 2001-02-15 16:11:33 $
+ * last change: $Author: dl $ $Date: 2001-03-28 08:06:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1703,10 +1703,10 @@ SfxItemSet* SdrMeasureObj::CreateNewItemSet(SfxItemPool& rPool)
////////////////////////////////////////////////////////////////////////////////////////////////////
// private support routines for ItemSet access
-void SdrMeasureObj::ItemSetChanged()
+void SdrMeasureObj::ItemSetChanged(const SfxItemSet& rSet)
{
// call parent
- SdrTextObj::ItemSetChanged();
+ SdrTextObj::ItemSetChanged(rSet);
// local changes
SetTextDirty();
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index d424519d6784..d7776a6d1180 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svdorect.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: aw $ $Date: 2001-02-15 16:11:33 $
+ * last change: $Author: dl $ $Date: 2001-03-28 08:07:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -809,10 +809,10 @@ void SdrRectObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const Sf
////////////////////////////////////////////////////////////////////////////////////////////////////
// private support routines for ItemSet access
-void SdrRectObj::ItemSetChanged()
+void SdrRectObj::ItemSetChanged(const SfxItemSet& rSet)
{
// call parent
- SdrTextObj::ItemSetChanged();
+ SdrTextObj::ItemSetChanged(rSet);
// local changes
SetXPolyDirty();
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 2e69337513b2..34a031df9a28 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svdovirt.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: aw $ $Date: 2001-02-09 17:54:43 $
+ * last change: $Author: dl $ $Date: 2001-03-28 08:07:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -605,9 +605,9 @@ void SdrVirtObj::ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem
rRefObj.ItemChange(nWhich, pNewItem);
}
-void SdrVirtObj::ItemSetChanged()
+void SdrVirtObj::ItemSetChanged(const SfxItemSet& rSet)
{
- rRefObj.ItemSetChanged();
+ rRefObj.ItemSetChanged(rSet);
}
void SdrVirtObj::PostItemChange(const sal_uInt16 nWhich)
generated by cgit (git 2.34.1) at 2025-01-06 07:17:31 +0000