diff options
| author | Armin Weiss <aw@openoffice.org> | 2000-10-30 10:20:51 +0000 |
|---|---|---|
| committer | Armin Weiss <aw@openoffice.org> | 2000-10-30 10:20:51 +0000 |
| commit | b0c2ec72ff171d8b4303d39f11f67497e88e2d8c (patch) | |
| tree | 86b80ee5e7a267717757077f9873a79e96b4cdcd /svx/source/svdraw/svdotxed.cxx | |
| parent | 2f420692d6201815297359380c7c7e840c2e1151 (diff) | |
change SdrObjects to use SfxItemSet instead of SfxSetItems.
Removed TakeAttributes() and SetAttributes(), new ItemSet
modification methods (GetItem[Set], SetItem[Set], ClearItem,...)
Diffstat (limited to 'svx/source/svdraw/svdotxed.cxx')
| -rw-r--r-- | svx/source/svdraw/svdotxed.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index 0b08d62134e0..19621dfef1cb 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdotxed.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2000-09-26 10:46:04 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:11:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,19 +129,25 @@ FASTBOOL SdrTextObj::BegTextEdit(SdrOutliner& rOutl) // damit sich der Outliner initiallisiert rOutl.SetText( String(), rOutl.GetParagraph( 0 ) ); - if(pStyleSheet) - rOutl.SetStyleSheet( 0, pStyleSheet ); + if(GetStyleSheet()) + rOutl.SetStyleSheet( 0, GetStyleSheet()); // Beim setzen der harten Attribute an den ersten Absatz muss // der Parent pOutlAttr (=die Vorlage) temporaer entfernt // werden, da sonst bei SetParaAttribs() auch alle in diesem // Parent enthaltenen Items hart am Absatz attributiert werden. // -> BugID 22467 - const SfxItemSet* pTmpSet=&pOutlAttr->GetItemSet(); - const SfxItemSet* pParentMerk=pTmpSet->GetParent(); +//-/ if(mpObjectItemSet) +//-/ { + const SfxItemSet& rSet = GetItemSet(); + SdrOutlinerSetItem aOutlSetItem(rSet.GetPool()); + aOutlSetItem.GetItemSet().Put(rSet); + const SfxItemSet* pTmpSet = &aOutlSetItem.GetItemSet(); + const SfxItemSet* pParentMerk = pTmpSet->GetParent(); ((SfxItemSet*)pTmpSet)->SetParent(NULL); rOutl.SetParaAttribs(0,*pTmpSet); ((SfxItemSet*)pTmpSet)->SetParent(pParentMerk); +//-/ } } } if (bFitToSize) { |