diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:47:32 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:47:32 +0000 |
| commit | 3d8f82f880008e40ea2c9cf77a3c41e42bc8b734 (patch) | |
| tree | 1acd8077bf283eec70bab1b99f1cf818c6338b73 /svx/source/svdraw/svdotxed.cxx | |
| parent | 8743850ee90cd6ab4175e05fce60e1eaa2e12178 (diff) | |
INTEGRATION: CWS aw024 (1.14.138); FILE MERGED
2006/09/21 19:31:58 aw 1.14.138.5: RESYNC: (1.16-1.17); FILE MERGED
2006/07/04 13:18:39 aw 1.14.138.4: RESYNC: (1.15-1.16); FILE MERGED
2005/09/18 05:08:14 aw 1.14.138.3: RESYNC: (1.14-1.15); FILE MERGED
2005/05/19 12:31:38 aw 1.14.138.2: #i39529#
2004/12/23 16:52:51 aw 1.14.138.1: #i39525
Diffstat (limited to 'svx/source/svdraw/svdotxed.cxx')
| -rw-r--r-- | svx/source/svdraw/svdotxed.cxx | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index 898f67c285cb..d3e63a633d2e 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdotxed.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: obo $ $Date: 2006-09-17 05:57:45 $ + * last change: $Author: ihi $ $Date: 2006-11-14 13:47:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,9 +78,9 @@ FASTBOOL SdrTextObj::HasTextEdit() const return TRUE; } -FASTBOOL SdrTextObj::BegTextEdit(SdrOutliner& rOutl) +sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) { - if (pEdtOutl!=NULL) return FALSE; // Textedit laeuft evtl. schon an einer anderen View! + if (pEdtOutl!=NULL) return sal_False; // Textedit laeuft evtl. schon an einer anderen View! pEdtOutl=&rOutl; // #101684# @@ -126,15 +126,6 @@ FASTBOOL SdrTextObj::BegTextEdit(SdrOutliner& rOutl) // Parent enthaltenen Items hart am Absatz attributiert werden. // -> BugID 22467 const SfxItemSet& rSet = GetObjectItemSet(); -//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); @@ -168,7 +159,7 @@ FASTBOOL SdrTextObj::BegTextEdit(SdrOutliner& rOutl) rOutl.UpdateFields(); rOutl.ClearModifyFlag(); - return TRUE; + return sal_True; } void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const |