diff options
| author | Armin Weiss <aw@openoffice.org> | 2000-12-11 10:56:32 +0000 |
|---|---|---|
| committer | Armin Weiss <aw@openoffice.org> | 2000-12-11 10:56:32 +0000 |
| commit | c6da83bc148484503162a0fe6c2d23ae52381f28 (patch) | |
| tree | 13839b9b9fd2fa5a1aa16390784b0826d23bbfa3 /svx/source/svdraw/svdograf.cxx | |
| parent | 2951e72dae9ae1931d71ada2f5209ec682998829 (diff) | |
#81466# use GetUnmergedItemSet() inside of WriteData() and PreSave() to not
risk changing the pool during save
Diffstat (limited to 'svx/source/svdraw/svdograf.cxx')
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 4f9a65a5212b..70e5290b9e92 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdograf.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: ka $ $Date: 2000-12-03 16:55:59 $ + * last change: $Author: aw $ $Date: 2000-12-11 11:56:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1322,7 +1322,7 @@ void SdrGrafObj::PreSave() SdrRectObj::PreSave(); // prepare SetItems for storage - const SfxItemSet& rSet = GetItemSet(); + const SfxItemSet& rSet = GetUnmergedItemSet(); const SfxItemSet* pParent = GetStyleSheet() ? &GetStyleSheet()->GetItemSet() : 0L; SdrGrafSetItem aGrafAttr(rSet.GetPool()); aGrafAttr.GetItemSet().Put(rSet); @@ -1413,7 +1413,7 @@ void SdrGrafObj::WriteData(SvStream& rOut) const if(pPool) { - const SfxItemSet& rSet = GetItemSet(); + const SfxItemSet& rSet = GetUnmergedItemSet(); pPool->StoreSurrogate(rOut, &rSet.Get(SDRATTRSET_GRAF)); |