Kaydet (Commit) ad24ad98 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

CLASSIO is dead

Change-Id: Ib08fe1f8faf9d4a527ac84d69eaaa19eb7102a6a
üst a0315346
...@@ -859,8 +859,6 @@ public: ...@@ -859,8 +859,6 @@ public:
// OUTPUT_OPERATOR // OUTPUT_OPERATOR
}; };
//CLASSIO( SwMetaPortion )
/************************************************************************* /*************************************************************************
* virtual SwMetaPortion::Paint() * virtual SwMetaPortion::Paint()
*************************************************************************/ *************************************************************************/
......
...@@ -90,12 +90,6 @@ public: ...@@ -90,12 +90,6 @@ public:
OUTPUT_OPERATOR OUTPUT_OPERATOR
}; };
CLASSIO( SwExpandPortion )
CLASSIO( SwBlankPortion )
CLASSIO( SwPostItsPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -246,14 +246,6 @@ public: ...@@ -246,14 +246,6 @@ public:
OUTPUT_OPERATOR OUTPUT_OPERATOR
}; };
CLASSIO( SwHiddenPortion )
CLASSIO( SwNumberPortion )
CLASSIO( SwBulletPortion )
CLASSIO( SwGrfNumPortion )
CLASSIO( SwCombinedPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -94,10 +94,6 @@ public: ...@@ -94,10 +94,6 @@ public:
OUTPUT_OPERATOR OUTPUT_OPERATOR
}; };
CLASSIO( SwFlyPortion )
CLASSIO( SwFlyCntPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -108,12 +108,6 @@ public: ...@@ -108,12 +108,6 @@ public:
OUTPUT_OPERATOR OUTPUT_OPERATOR
}; };
CLASSIO( SwFtnPortion )
CLASSIO( SwFtnNumPortion )
CLASSIO( SwQuoVadisPortion )
CLASSIO( SwErgoSumPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -115,11 +115,6 @@ inline void SwGluePortion::MoveHalfGlue( SwGluePortion *pTarget ) ...@@ -115,11 +115,6 @@ inline void SwGluePortion::MoveHalfGlue( SwGluePortion *pTarget )
MoveGlue( pTarget, GetPrtGlue() / 2 ); MoveGlue( pTarget, GetPrtGlue() / 2 );
} }
CLASSIO( SwGluePortion )
CLASSIO( SwFixPortion )
CLASSIO( SwMarginPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -103,12 +103,6 @@ public: ...@@ -103,12 +103,6 @@ public:
OUTPUT_OPERATOR OUTPUT_OPERATOR
}; };
CLASSIO( SwHyphPortion )
CLASSIO( SwHyphStrPortion )
CLASSIO( SwSoftHyphPortion )
CLASSIO( SwSoftHyphStrPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -399,9 +399,6 @@ inline void SwParaPortion::FormatReset() ...@@ -399,9 +399,6 @@ inline void SwParaPortion::FormatReset()
inline SwLinePortion *SwLineLayout::GetFirstPortion() const inline SwLinePortion *SwLineLayout::GetFirstPortion() const
{ return( pPortion ? pPortion : (SwLinePortion*)this ); } { return( pPortion ? pPortion : (SwLinePortion*)this ); }
CLASSIO( SwLineLayout )
CLASSIO( SwParaPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -31,8 +31,6 @@ class SwTxtFormatInfo; ...@@ -31,8 +31,6 @@ class SwTxtFormatInfo;
class SwPortionHandler; class SwPortionHandler;
// The portions output operators are virtual methods of the portion. // The portions output operators are virtual methods of the portion.
// The CLASSIO macro implements the 'levitating' function.
// In doing so we end up with both benefits: virtual output operators and general utility
#ifdef DBG_UTIL #ifdef DBG_UTIL
#define OUTPUT_OPERATOR virtual SvStream &operator<<( SvStream & aOs ) const; #define OUTPUT_OPERATOR virtual SvStream &operator<<( SvStream & aOs ) const;
#else #else
...@@ -237,12 +235,6 @@ inline void SwLinePortion::Truncate() ...@@ -237,12 +235,6 @@ inline void SwLinePortion::Truncate()
_Truncate(); _Truncate();
} }
//$ ostream
#define CLASSIO( class )
CLASSIO( SwLinePortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -253,8 +253,6 @@ inline bool SwMultiPortion::HasBrackets() const ...@@ -253,8 +253,6 @@ inline bool SwMultiPortion::HasBrackets() const
return IsDouble() ? 0 != ((SwDoubleLinePortion*)this)->GetBrackets() : false; return IsDouble() ? 0 != ((SwDoubleLinePortion*)this)->GetBrackets() : false;
} }
CLASSIO( SwMultiPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -54,14 +54,6 @@ public: ...@@ -54,14 +54,6 @@ public:
OUTPUT_OPERATOR OUTPUT_OPERATOR
}; };
/*************************************************************************
* inline - Implementations
*************************************************************************/
CLASSIO( SwRefPortion )
CLASSIO( SwIsoRefPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -165,17 +165,6 @@ public: ...@@ -165,17 +165,6 @@ public:
virtual KSHORT GetViewWidth( const SwTxtSizeInfo& rInf ) const; virtual KSHORT GetViewWidth( const SwTxtSizeInfo& rInf ) const;
}; };
/*************************************************************************
* inline - Implementations
*************************************************************************/
CLASSIO( SwBreakPortion )
CLASSIO( SwEndPortion )
CLASSIO( SwKernPortion )
CLASSIO( SwArrowPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -140,14 +140,6 @@ public: ...@@ -140,14 +140,6 @@ public:
virtual void Paint( const SwTxtPaintInfo &rInf ) const; virtual void Paint( const SwTxtPaintInfo &rInf ) const;
}; };
CLASSIO( SwTabPortion )
CLASSIO( SwTabLeftPortion )
CLASSIO( SwTabRightPortion )
CLASSIO( SwTabCenterPortion )
CLASSIO( SwTabDecimalPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -55,14 +55,6 @@ public: ...@@ -55,14 +55,6 @@ public:
OUTPUT_OPERATOR OUTPUT_OPERATOR
}; };
/*************************************************************************
* inline - Implementations
*************************************************************************/
CLASSIO( SwToxPortion )
CLASSIO( SwIsoToxPortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -99,10 +99,6 @@ class SwFieldFormPortion : public SwTxtPortion ...@@ -99,10 +99,6 @@ class SwFieldFormPortion : public SwTxtPortion
virtual sal_Bool Format( SwTxtFormatInfo &rInf ); virtual sal_Bool Format( SwTxtFormatInfo &rInf );
}; };
CLASSIO( SwTxtPortion )
CLASSIO( SwHolePortion )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment