INTEGRATION: CWS swundo01 (1.2.34); FILE MERGED

2004/05/25 14:43:16 hbrinkm 1.2.34.3: #116912# Compile time fixes
2004/04/19 10:01:20 hbrinkm 1.2.34.2: RESYNC: (1.2-1.3); FILE MERGED
2004/01/06 15:25:13 hbrinkm 1.2.34.1: #111840#
This commit is contained in:
Rüdiger Timm 2004-05-25 13:57:51 +00:00
parent 1b42ffbdc5
commit 5abaa90576

View file

@ -2,9 +2,9 @@
*
* $RCSfile: txtfld.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: kz $ $Date: 2004-05-18 13:59:49 $
* last change: $Author: rt $ $Date: 2004-05-25 14:57:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -88,8 +88,8 @@ public:
inline void ExpandAlways();
// erfrage und setze den TxtNode Pointer
const SwTxtNode* GetpTxtNode() const { return pMyTxtNd; }
inline const SwTxtNode& GetTxtNode() const;
SwTxtNode* GetpTxtNode() const { return pMyTxtNd; }
inline SwTxtNode& GetTxtNode() const;
void ChgTxtNode( const SwTxtNode* pNew ) { pMyTxtNd = (SwTxtNode*)pNew; }
// enable notification that field content has changed and needs reformatting
void NotifyContentChange(SwFmtFld& rFmtFld);
@ -103,7 +103,7 @@ public:
SwPosition * GetPosition() const;
};
inline const SwTxtNode& SwTxtFld::GetTxtNode() const
inline SwTxtNode& SwTxtFld::GetTxtNode() const
{
ASSERT( pMyTxtNd, "SwTxtFld:: wo ist mein TextNode?" );
return *pMyTxtNd;