diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-02-19 12:48:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-02-19 12:48:46 +0000 |
| commit | fe6b48e08d314f73cbe39689afeb299c12ed0017 (patch) | |
| tree | 4679565dd21252598bbdc24a2281586373a90c34 /sw/source/core/txtnode/txatbase.cxx | |
| parent | 05a401fb8dcc566b79cf1d97e98ea31477c06c80 (diff) | |
INTEGRATION: CWS notes2 (1.9.320); FILE MERGED
2007/10/12 22:30:10 mod 1.9.320.1: fix for overlays, layout algorithm fix, patch for ww8 import
Diffstat (limited to 'sw/source/core/txtnode/txatbase.cxx')
| -rw-r--r-- | sw/source/core/txtnode/txatbase.cxx | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/sw/source/core/txtnode/txatbase.cxx b/sw/source/core/txtnode/txatbase.cxx index 6844b63baf86..2c64111dc1cc 100644 --- a/sw/source/core/txtnode/txatbase.cxx +++ b/sw/source/core/txtnode/txatbase.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txatbase.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-16 21:47:32 $ + * last change: $Author: rt $ $Date: 2008-02-19 13:48:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,6 +45,20 @@ #include <txatbase.hxx> #endif +#ifndef _FMTFLD_HXX //autogen +#include <fmtfld.hxx> +#endif +#ifndef _DOCUFLD_HXX //autogen +#include <docufld.hxx> +#endif + + +#include "doc.hxx" +#include "docsh.hxx" +#include "../../../inc/PostItMgr.hxx" +#include "../../ui/inc/view.hxx" + + SwTxtAttr::SwTxtAttr( const SfxPoolItem& rAttr, xub_StrLen nStt ) : pAttr( &rAttr ), nStart( nStt ) { @@ -66,6 +80,21 @@ xub_StrLen* SwTxtAttr::GetEnd() // Meldet sein Attribut beim Pool ab void SwTxtAttr::RemoveFromPool( SfxItemPool& rPool ) { + /* + // delete in SwPostItMgr + if (Which()==RES_TXTATR_FIELD) + { + if ( ((SwFmtFld&)(GetAttr())).GetFld()->GetTyp()->Which()==RES_POSTITFLD) + { + SwDocShell* aShell = static_cast<SwPostItFieldType*>(((SwFmtFld&)GetAttr()).GetFld()->GetTyp())->GetDoc()->GetDocShell(); + if (aShell) + { + aShell->GetView()->GetPostItMgr()->Delete(&(SwFmtFld&)GetAttr()); + } + + } + } + */ rPool.Remove( GetAttr() ); pAttr = 0; } |