diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 10:02:35 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 10:02:35 +0000 |
| commit | f3cefcfd0df43a0a8745b8045c1c2c70507ef929 (patch) | |
| tree | 4999eb20cccc1eba937617b021a94d5c1c50dfff /svx | |
| parent | 3f0b1f0f5b85b8fa26e12e080ebc19e2f66c67f0 (diff) | |
INTEGRATION: CWS aw019 (1.13.306); FILE MERGED
2004/09/28 15:53:22 aw 1.13.306.1: #i11190#
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdotxed.cxx | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index dfddd9542f7d..6f9c99361efc 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdotxed.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2004-04-02 14:13:54 $ + * last change: $Author: pjunck $ $Date: 2004-11-03 11:02:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,6 +72,14 @@ #include <editstat.hxx> #endif +#ifndef _SFXITEMSET_HXX +#include <svtools/itemset.hxx> +#endif + +#ifndef _EEITEM_HXX +#include "eeitem.hxx" +#endif + //////////////////////////////////////////////////////////////////////////////////////////////////// // // @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@ @@ -141,13 +149,18 @@ FASTBOOL SdrTextObj::BegTextEdit(SdrOutliner& rOutl) // Parent enthaltenen Items hart am Absatz attributiert werden. // -> BugID 22467 const SfxItemSet& rSet = GetObjectItemSet(); - 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); +//BFS01 SdrOutlinerSetItem aOutlSetItem(rSet.GetPool()); +//BFS01 aOutlSetItem.GetItemSet().Put(rSet); +//BFS01 const SfxItemSet* pTmpSet = &aOutlSetItem.GetItemSet(); +//BFS01 const SfxItemSet* pParentMerk = pTmpSet->GetParent(); +//BFS01 ((SfxItemSet*)pTmpSet)->SetParent(NULL); +//BFS01 rOutl.SetParaAttribs(0,*pTmpSet); +//BFS01 ((SfxItemSet*)pTmpSet)->SetParent(pParentMerk); + + //BFS01 + SfxItemSet aFilteredSet(*rSet.GetPool(), EE_ITEMS_START, EE_ITEMS_END); + aFilteredSet.Put(rSet); + rOutl.SetParaAttribs(0, aFilteredSet); } } if (bFitToSize) { |