diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 14:35:48 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 14:35:48 +0000 |
commit | 4b9030e3f2a45fdeaf46ffe64fca8f81b308aa11 (patch) | |
tree | 8806ce979e74901081d7fe1bd85a4651688467bb /sw/inc | |
parent | a8abf3482f8faa58712d6f1e06f4e8e827621d37 (diff) |
INTEGRATION: CWS writercorehandoff (1.8.1314); FILE MERGED
2005/09/13 12:22:43 tra 1.8.1314.2: RESYNC: (1.8-1.9); FILE MERGED
2005/06/07 14:10:27 fme 1.8.1314.1: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/txtatr.hxx | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index 1b6c54a02660..b4282c7bae72 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -4,9 +4,9 @@ * * $RCSfile: txtatr.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-09 02:21:50 $ + * last change: $Author: hr $ $Date: 2006-08-14 15:35:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -34,7 +34,6 @@ ************************************************************************/ #ifndef _TXTATR_HXX #define _TXTATR_HXX - #ifndef _SV_GEN_HXX #include <tools/gen.hxx> #endif @@ -49,8 +48,6 @@ #endif class SwTxtNode; // fuer SwTxtFld -class SvxFont; -class SwCharSetCol; class SwCharFmt; class SvxTwoLinesItem; @@ -59,10 +56,6 @@ class SvxTwoLinesItem; class SwTxtCharFmt : public SwTxtAttrEnd { SwTxtNode* pMyTxtNd; - BOOL bPrevNoHyph : 1; - BOOL bPrevBlink : 1; - BOOL bPrevURL : 1; - BOOL bColor : 1; public: SwTxtCharFmt( const SwFmtCharFmt& rAttr, xub_StrLen nStart, xub_StrLen nEnd ); @@ -73,7 +66,6 @@ public: virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; // erfrage und setze den TxtNode Pointer - inline const SwTxtNode& GetTxtNode() const; void ChgTxtNode( const SwTxtNode* pNew ) { pMyTxtNd = (SwTxtNode*)pNew; } }; @@ -132,12 +124,6 @@ public: // --------------- Inline Implementierungen ------------------------ -inline const SwTxtNode& SwTxtCharFmt::GetTxtNode() const -{ - ASSERT( pMyTxtNd, "SwTxtCharFmt:: wo ist mein TextNode?" ); - return *pMyTxtNd; -} - inline const SwTxtNode& SwTxtRuby::GetTxtNode() const { ASSERT( pMyTxtNd, "SwTxtRuby:: wo ist mein TextNode?" ); |