Kaydet (Commit) 57236961 authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: outline longer SwLineLayout member functions

Change-Id: I8ad38c64eea399e3b682a82f7b1a10ca8c669021
üst 0ed936cc
...@@ -617,6 +617,27 @@ void SwLineLayout::MaxAscentDescent( SwTwips& _orAscent, ...@@ -617,6 +617,27 @@ void SwLineLayout::MaxAscentDescent( SwTwips& _orAscent,
} }
} }
void SwLineLayout::ResetFlags()
{
m_bFormatAdj = m_bDummy = m_bFntChg = m_bTab = m_bEndHyph = m_bMidHyph = m_bFly
= m_bRest = m_bBlinking = m_bClipping = m_bContent = m_bRedline
= m_bForcedLeftMargin = m_bHanging = false;
}
SwLineLayout::SwLineLayout()
: m_pNext( nullptr ), m_pLLSpaceAdd( nullptr ), m_pKanaComp( nullptr ), m_nRealHeight( 0 ),
m_bUnderscore( false )
{
ResetFlags();
SetWhichPor( POR_LAY );
}
SwLinePortion *SwLineLayout::GetFirstPortion() const
{
const SwLinePortion *pRet = pPortion ? pPortion : this;
return const_cast<SwLinePortion*>(pRet);
}
SwCharRange &SwCharRange::operator+=(const SwCharRange &rRange) SwCharRange &SwCharRange::operator+=(const SwCharRange &rRange)
{ {
if(0 != rRange.nLen ) { if(0 != rRange.nLen ) {
......
...@@ -103,10 +103,10 @@ public: ...@@ -103,10 +103,10 @@ public:
// From SwLinePortion // From SwLinePortion
virtual SwLinePortion *Insert( SwLinePortion *pPortion ) override; virtual SwLinePortion *Insert( SwLinePortion *pPortion ) override;
virtual SwLinePortion *Append( SwLinePortion *pPortion ) override; virtual SwLinePortion *Append( SwLinePortion *pPortion ) override;
inline SwLinePortion *GetFirstPortion() const; SwLinePortion *GetFirstPortion() const;
// Flags // Flags
inline void ResetFlags(); void ResetFlags();
inline void SetFormatAdj( const bool bNew ) { m_bFormatAdj = bNew; } inline void SetFormatAdj( const bool bNew ) { m_bFormatAdj = bNew; }
inline bool IsFormatAdj() const { return m_bFormatAdj; } inline bool IsFormatAdj() const { return m_bFormatAdj; }
inline void SetEndHyph( const bool bNew ) { m_bEndHyph = bNew; } inline void SetEndHyph( const bool bNew ) { m_bEndHyph = bNew; }
...@@ -136,7 +136,7 @@ public: ...@@ -136,7 +136,7 @@ public:
inline void SetClipping( const bool bNew ) { m_bClipping = bNew; } inline void SetClipping( const bool bNew ) { m_bClipping = bNew; }
inline bool IsClipping() const { return m_bClipping; } inline bool IsClipping() const { return m_bClipping; }
inline SwLineLayout(); SwLineLayout();
virtual ~SwLineLayout() override; virtual ~SwLineLayout() override;
inline SwLineLayout *GetNext() { return m_pNext; } inline SwLineLayout *GetNext() { return m_pNext; }
...@@ -308,21 +308,6 @@ public: ...@@ -308,21 +308,6 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwParaPortion) DECL_FIXEDMEMPOOL_NEWDEL(SwParaPortion)
}; };
inline void SwLineLayout::ResetFlags()
{
m_bFormatAdj = m_bDummy = m_bFntChg = m_bTab = m_bEndHyph = m_bMidHyph = m_bFly
= m_bRest = m_bBlinking = m_bClipping = m_bContent = m_bRedline
= m_bForcedLeftMargin = m_bHanging = false;
}
inline SwLineLayout::SwLineLayout()
: m_pNext( nullptr ), m_pLLSpaceAdd( nullptr ), m_pKanaComp( nullptr ), m_nRealHeight( 0 ),
m_bUnderscore( false )
{
ResetFlags();
SetWhichPor( POR_LAY );
}
inline void SwParaPortion::ResetPreps() inline void SwParaPortion::ResetPreps()
{ {
m_bPrep = m_bPrepWidows = m_bPrepAdjust = m_bPrepMustFit = false; m_bPrep = m_bPrepWidows = m_bPrepAdjust = m_bPrepMustFit = false;
...@@ -340,13 +325,6 @@ inline void SwParaPortion::FormatReset() ...@@ -340,13 +325,6 @@ inline void SwParaPortion::FormatReset()
m_bFollowField = m_bFixLineHeight = m_bMargin = false; m_bFollowField = m_bFixLineHeight = m_bMargin = false;
} }
inline SwLinePortion *SwLineLayout::GetFirstPortion() const
{
const SwLinePortion *pRet = pPortion ? pPortion : this;
return const_cast<SwLinePortion*>(pRet);
}
#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