diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-06 08:32:08 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-06 08:35:21 +0100 |
commit | 401483271ffca557a922d6d1ca271a46084867dc (patch) | |
tree | 8b15b8903978833a740b8b0e38a4e726edcbb6ea /sw | |
parent | dc5a6426fac6d6488ff764549dca898fb9d71b6f (diff) |
sw: prefix members of SwTextFormatInfo
Change-Id: I116b4c6b8eed53ad19263fdc3a11ee67756fe472
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/text/inftxt.cxx | 196 | ||||
-rw-r--r-- | sw/source/core/text/inftxt.hxx | 250 |
2 files changed, 223 insertions, 223 deletions
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 83632733d67b..1ca8b8447ea7 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1324,9 +1324,9 @@ static void lcl_InitHyphValues( PropertyValues &rVals, const PropertyValues & SwTextFormatInfo::GetHyphValues() const { - OSL_ENSURE( 2 == aHyphVals.getLength(), + OSL_ENSURE( 2 == m_aHyphVals.getLength(), "hyphenation values not yet initialized" ); - return aHyphVals; + return m_aHyphVals; } bool SwTextFormatInfo::InitHyph( const bool bAutoHyphen ) @@ -1338,11 +1338,11 @@ bool SwTextFormatInfo::InitHyph( const bool bAutoHyphen ) const SvxHyphenZoneItem &rAttr = rAttrSet.GetHyphenZone(); MaxHyph() = rAttr.GetMaxHyphens(); const bool bAuto = bAutoHyphen || rAttr.IsHyphen(); - if( bAuto || bInterHyph ) + if( bAuto || m_bInterHyph ) { const sal_Int16 nMinimalLeading = std::max(rAttr.GetMinLead(), sal_uInt8(2)); const sal_Int16 nMinimalTrailing = rAttr.GetMinTrail(); - lcl_InitHyphValues( aHyphVals, nMinimalLeading, nMinimalTrailing); + lcl_InitHyphValues( m_aHyphVals, nMinimalLeading, nMinimalTrailing); } return bAuto; } @@ -1352,28 +1352,28 @@ void SwTextFormatInfo::CtorInitTextFormatInfo( OutputDevice* pRenderContext, SwT { CtorInitTextPaintInfo( pRenderContext, pNewFrm, SwRect() ); - bQuick = bNewQuick; - bInterHyph = bNewInterHyph; + m_bQuick = bNewQuick; + m_bInterHyph = bNewInterHyph; //! needs to be done in this order - nMinLeading = 2; - nMinTrailing = 2; - nMinWordLength = 0; - bAutoHyph = InitHyph(); - - bIgnoreFly = false; - bFakeLineStart = false; - bShift = false; - bDropInit = false; - bTestFormat = bTst; - nLeft = 0; - nRight = 0; - nFirst = 0; - nRealWidth = 0; - nForcedLeftMargin = 0; - pRest = 0; - nLineHeight = 0; - nLineNetHeight = 0; + m_nMinLeading = 2; + m_nMinTrailing = 2; + m_nMinWordLength = 0; + m_bAutoHyph = InitHyph(); + + m_bIgnoreFly = false; + m_bFakeLineStart = false; + m_bShift = false; + m_bDropInit = false; + m_bTestFormat = bTst; + m_nLeft = 0; + m_nRight = 0; + m_nFirst = 0; + m_nRealWidth = 0; + m_nForcedLeftMargin = 0; + m_pRest = 0; + m_nLineHeight = 0; + m_nLineNetHeight = 0; SetLineStart(0); SvtCTLOptions::TextNumerals const nTextNumerals( @@ -1400,7 +1400,7 @@ void SwTextFormatInfo::CtorInitTextFormatInfo( OutputDevice* pRenderContext, SwT */ bool SwTextFormatInfo::IsHyphenate() const { - if( !bInterHyph && !bAutoHyph ) + if( !m_bInterHyph && !m_bAutoHyph ) return false; LanguageType eTmp = GetFont()->GetLanguage(); @@ -1411,7 +1411,7 @@ bool SwTextFormatInfo::IsHyphenate() const if (!xHyph.is()) return false; - if (bInterHyph) + if (m_bInterHyph) SvxSpellWrapper::CheckHyphLang( xHyph, eTmp ); return xHyph->hasLocale( g_pBreakIt->GetLocale(eTmp) ); @@ -1430,8 +1430,8 @@ void SwTextFormatInfo::Init() { // Not initialized: pRest, nLeft, nRight, nFirst, nRealWidth X(0); - bArrowDone = bFull = bFootnoteDone = bErgoDone = bNumDone = bNoEndHyph = - bNoMidHyph = bStop = bNewLine = bUnderflow = bTabOverflow = false; + m_bArrowDone = m_bFull = m_bFootnoteDone = m_bErgoDone = m_bNumDone = m_bNoEndHyph = + m_bNoMidHyph = m_bStop = m_bNewLine = m_bUnderflow = m_bTabOverflow = false; // generally we do not allow number portions in follows, except... if ( GetTextFrm()->IsFollow() ) @@ -1442,22 +1442,22 @@ void SwTextFormatInfo::Init() // there is a master for this follow and the master does not have // any contents (especially it does not have a number portion) - bNumDone = ! pTmpPara || + m_bNumDone = ! pTmpPara || ! static_cast<const SwParaPortion*>(pTmpPara)->GetFirstPortion()->IsFlyPortion(); } - pRoot = 0; - pLast = 0; - pFly = 0; - pLastField = 0; - pLastTab = 0; - pUnderflow = 0; - cTabDecimal = 0; - nWidth = nRealWidth; - nForcedLeftMargin = 0; - nSoftHyphPos = 0; - nUnderScorePos = COMPLETE_STRING; - cHookChar = 0; + m_pRoot = 0; + m_pLast = 0; + m_pFly = 0; + m_pLastField = 0; + m_pLastTab = 0; + m_pUnderflow = 0; + m_cTabDecimal = 0; + m_nWidth = m_nRealWidth; + m_nForcedLeftMargin = 0; + m_nSoftHyphPos = 0; + m_nUnderScorePos = COMPLETE_STRING; + m_cHookChar = 0; SetIdx(0); SetLen( GetText().getLength() ); SetPaintOfst(0); @@ -1479,53 +1479,53 @@ SwTextFormatInfo::SwTextFormatInfo(OutputDevice* pRenderContext, SwTextFrm *pFra */ SwTextFormatInfo::SwTextFormatInfo( const SwTextFormatInfo& rInf, SwLineLayout& rLay, SwTwips nActWidth ) : SwTextPaintInfo( rInf ), - bTabOverflow( false ) + m_bTabOverflow( false ) { - pRoot = &rLay; - pLast = &rLay; - pFly = NULL; - pLastField = NULL; - pUnderflow = NULL; - pRest = NULL; - pLastTab = NULL; - - nSoftHyphPos = 0; - nUnderScorePos = COMPLETE_STRING; - nLineStart = rInf.GetIdx(); - nLeft = rInf.nLeft; - nRight = rInf.nRight; - nFirst = rInf.nLeft; - nRealWidth = sal_uInt16(nActWidth); - nWidth = nRealWidth; - nLineHeight = 0; - nLineNetHeight = 0; - nForcedLeftMargin = 0; - - nMinLeading = 0; - nMinTrailing = 0; - nMinWordLength = 0; - bFull = false; - bFootnoteDone = true; - bErgoDone = true; - bNumDone = true; - bArrowDone = true; - bStop = false; - bNewLine = true; - bShift = false; - bUnderflow = false; - bInterHyph = false; - bAutoHyph = false; - bDropInit = false; - bQuick = rInf.bQuick; - bNoEndHyph = false; - bNoMidHyph = false; - bIgnoreFly = false; - bFakeLineStart = false; - - cTabDecimal = 0; - cHookChar = 0; - nMaxHyph = 0; - bTestFormat = rInf.bTestFormat; + m_pRoot = &rLay; + m_pLast = &rLay; + m_pFly = NULL; + m_pLastField = NULL; + m_pUnderflow = NULL; + m_pRest = NULL; + m_pLastTab = NULL; + + m_nSoftHyphPos = 0; + m_nUnderScorePos = COMPLETE_STRING; + m_nLineStart = rInf.GetIdx(); + m_nLeft = rInf.m_nLeft; + m_nRight = rInf.m_nRight; + m_nFirst = rInf.m_nLeft; + m_nRealWidth = sal_uInt16(nActWidth); + m_nWidth = m_nRealWidth; + m_nLineHeight = 0; + m_nLineNetHeight = 0; + m_nForcedLeftMargin = 0; + + m_nMinLeading = 0; + m_nMinTrailing = 0; + m_nMinWordLength = 0; + m_bFull = false; + m_bFootnoteDone = true; + m_bErgoDone = true; + m_bNumDone = true; + m_bArrowDone = true; + m_bStop = false; + m_bNewLine = true; + m_bShift = false; + m_bUnderflow = false; + m_bInterHyph = false; + m_bAutoHyph = false; + m_bDropInit = false; + m_bQuick = rInf.m_bQuick; + m_bNoEndHyph = false; + m_bNoMidHyph = false; + m_bIgnoreFly = false; + m_bFakeLineStart = false; + + m_cTabDecimal = 0; + m_cHookChar = 0; + m_nMaxHyph = 0; + m_bTestFormat = rInf.m_bTestFormat; SetMulti( true ); SetFirstMulti( rInf.IsFirstMulti() ); } @@ -1548,7 +1548,7 @@ bool SwTextFormatInfo::_CheckFootnotePortion( SwLineLayout* pCurr ) sal_Int32 SwTextFormatInfo::ScanPortionEnd( const sal_Int32 nStart, const sal_Int32 nEnd ) { - cHookChar = 0; + m_cHookChar = 0; sal_Int32 i = nStart; // Used for decimal tab handling: @@ -1579,12 +1579,12 @@ sal_Int32 SwTextFormatInfo::ScanPortionEnd( const sal_Int32 nStart, case CH_BREAK: case CHAR_ZWSP : case CHAR_ZWNBSP : - cHookChar = cPos; + m_cHookChar = cPos; return i; case CHAR_UNDERSCORE: - if ( COMPLETE_STRING == nUnderScorePos ) - nUnderScorePos = i; + if ( COMPLETE_STRING == m_nUnderScorePos ) + m_nUnderScorePos = i; break; default: @@ -1595,7 +1595,7 @@ sal_Int32 SwTextFormatInfo::ScanPortionEnd( const sal_Int32 nStart, OSL_ENSURE( cPos, "Unexpected end of string" ); if( cPos ) // robust { - cHookChar = cPos; + m_cHookChar = cPos; return i; } } @@ -1613,7 +1613,7 @@ sal_Int32 SwTextFormatInfo::ScanPortionEnd( const sal_Int32 nStart, { if ( bNumFound ) { - cHookChar = cPos; + m_cHookChar = cPos; SetTabDecimal( cPos ); return i; } @@ -1630,8 +1630,8 @@ sal_Int32 SwTextFormatInfo::ScanPortionEnd( const sal_Int32 nStart, const sal_Unicode cPos = GetChar( i ); if ( cPos != cTabDec && cPos != cThousandSep && cPos !=cThousandSep2 && ( 0x2F >= cPos || cPos >= 0x3A ) ) { - cHookChar = GetChar( i ); - SetTabDecimal( cHookChar ); + m_cHookChar = GetChar( i ); + SetTabDecimal( m_cHookChar ); } } @@ -1814,10 +1814,10 @@ SwFontSave::~SwFontSave() bool SwTextFormatInfo::ChgHyph( const bool bNew ) { - const bool bOld = bAutoHyph; - if( bAutoHyph != bNew ) + const bool bOld = m_bAutoHyph; + if( m_bAutoHyph != bNew ) { - bAutoHyph = bNew; + m_bAutoHyph = bNew; InitHyph( bNew ); // Set language in the Hyphenator if( m_pFnt ) diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 0d5a592aa414..7637c42473c0 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -486,59 +486,59 @@ public: class SwTextFormatInfo : public SwTextPaintInfo { // temporary arguments for hyphenation - com::sun::star::beans::PropertyValues aHyphVals; + com::sun::star::beans::PropertyValues m_aHyphVals; - SwLineLayout *pRoot; // The Root of the current line (pCurr) - SwLinePortion *pLast; // The last Portion - SwFlyPortion *pFly; // The following FlyPortion - SwFieldPortion *pLastField; // Wrapped Field - SwLinePortion *pUnderflow; // Underflow: Last Portion - SwLinePortion *pRest; // The Rest is the start of the next Line + SwLineLayout *m_pRoot; // The Root of the current line (pCurr) + SwLinePortion *m_pLast; // The last Portion + SwFlyPortion *m_pFly; // The following FlyPortion + SwFieldPortion *m_pLastField; // Wrapped Field + SwLinePortion *m_pUnderflow; // Underflow: Last Portion + SwLinePortion *m_pRest; // The Rest is the start of the next Line - SwTabPortion *pLastTab; // The _last_ TabPortion + SwTabPortion *m_pLastTab; // The _last_ TabPortion - sal_Int32 nSoftHyphPos; // SoftHyphPos for Hyphenation - sal_Int32 nLineStart; // Current line start in rText - sal_Int32 nUnderScorePos; // enlarge repaint if underscore has been found + sal_Int32 m_nSoftHyphPos; // SoftHyphPos for Hyphenation + sal_Int32 m_nLineStart; // Current line start in rText + sal_Int32 m_nUnderScorePos; // enlarge repaint if underscore has been found // #i34348# Changed type from sal_uInt16 to SwTwips - SwTwips nLeft; // Left margin - SwTwips nRight; // Right margin - SwTwips nFirst; // EZE - sal_uInt16 nRealWidth; // "real" line width - sal_uInt16 nWidth; // "virtual" line width - sal_uInt16 nLineHeight; // Final height after CalcLine - sal_uInt16 nLineNetHeight; // line height without spacing - sal_uInt16 nForcedLeftMargin; // Shift of left margin due to frame - - sal_Int16 nMinLeading; // minimum number of chars before hyphenation point - sal_Int16 nMinTrailing; // minimum number of chars after hyphenation point - sal_Int16 nMinWordLength; // minimum length of word to be hyphenated - - bool bFull : 1; // Line is full - bool bFootnoteDone : 1; // Footnote already formatted - bool bErgoDone : 1; // ErgoDone already formatted - bool bNumDone : 1; // bNumDone already formatted - bool bArrowDone : 1; // Arrow to the left for scrolling paragraphs - bool bStop : 1; // Cancel immediately, discarding the line - bool bNewLine : 1; // Format another line - bool bShift : 1; // Position change: Repaint until further notice - bool bUnderflow : 1; // Context: Underflow() ? - bool bInterHyph : 1; // Interactive hyphenation? - bool bAutoHyph : 1; // Automatic hyphenation? - bool bDropInit : 1; // Set DropWidth - bool bQuick : 1; // FormatQuick() - bool bNoEndHyph : 1; // Switch off hyphenation at the line end (due to MaxHyphens) - bool bNoMidHyph : 1; // Switch off hyphenation before flys (due to MaxHyphens) - bool bIgnoreFly : 1; // FitToContent ignores flys - bool bFakeLineStart : 1; // String has been replaced by field portion + SwTwips m_nLeft; // Left margin + SwTwips m_nRight; // Right margin + SwTwips m_nFirst; // EZE + sal_uInt16 m_nRealWidth; // "real" line width + sal_uInt16 m_nWidth; // "virtual" line width + sal_uInt16 m_nLineHeight; // Final height after CalcLine + sal_uInt16 m_nLineNetHeight; // line height without spacing + sal_uInt16 m_nForcedLeftMargin; // Shift of left margin due to frame + + sal_Int16 m_nMinLeading; // minimum number of chars before hyphenation point + sal_Int16 m_nMinTrailing; // minimum number of chars after hyphenation point + sal_Int16 m_nMinWordLength; // minimum length of word to be hyphenated + + bool m_bFull : 1; // Line is full + bool m_bFootnoteDone : 1; // Footnote already formatted + bool m_bErgoDone : 1; // ErgoDone already formatted + bool m_bNumDone : 1; // bNumDone already formatted + bool m_bArrowDone : 1; // Arrow to the left for scrolling paragraphs + bool m_bStop : 1; // Cancel immediately, discarding the line + bool m_bNewLine : 1; // Format another line + bool m_bShift : 1; // Position change: Repaint until further notice + bool m_bUnderflow : 1; // Context: Underflow() ? + bool m_bInterHyph : 1; // Interactive hyphenation? + bool m_bAutoHyph : 1; // Automatic hyphenation? + bool m_bDropInit : 1; // Set DropWidth + bool m_bQuick : 1; // FormatQuick() + bool m_bNoEndHyph : 1; // Switch off hyphenation at the line end (due to MaxHyphens) + bool m_bNoMidHyph : 1; // Switch off hyphenation before flys (due to MaxHyphens) + bool m_bIgnoreFly : 1; // FitToContent ignores flys + bool m_bFakeLineStart : 1; // String has been replaced by field portion // info structure only pretends that we are at // the beginning of a line - bool bTabOverflow : 1; // Tabs are expanding after the end margin - bool bTestFormat : 1; // Test formatting from WouldFit, no notification etc. + bool m_bTabOverflow : 1; // Tabs are expanding after the end margin + bool m_bTestFormat : 1; // Test formatting from WouldFit, no notification etc. - sal_Unicode cTabDecimal; // the current decimal delimiter - sal_Unicode cHookChar; // For tabs in fields etc. - sal_uInt8 nMaxHyph; // Max. line count of followup hyphenations + sal_Unicode m_cTabDecimal; // the current decimal delimiter + sal_Unicode m_cHookChar; // For tabs in fields etc. + sal_uInt8 m_nMaxHyph; // Max. line count of followup hyphenations // Hyphenating ... bool InitHyph( const bool bAuto = false ); @@ -555,112 +555,112 @@ public: SwTextFormatInfo( const SwTextFormatInfo& rInf, SwLineLayout& rLay, SwTwips nActWidth ); - inline sal_uInt16 Width() const { return nWidth; } - inline void Width( const sal_uInt16 nNew ) { nWidth = nNew; } + inline sal_uInt16 Width() const { return m_nWidth; } + inline void Width( const sal_uInt16 nNew ) { m_nWidth = nNew; } void Init(); // Returns the first changed position of the paragraph inline sal_Int32 GetReformatStart() const; // Margins - inline SwTwips Left() const { return nLeft; } - inline void Left( const SwTwips nNew ) { nLeft = nNew; } - inline SwTwips Right() const { return nRight; } - inline void Right( const SwTwips nNew ) { nRight = nNew; } - inline SwTwips First() const { return nFirst; } - inline void First( const SwTwips nNew ) { nFirst = nNew; } - inline sal_uInt16 RealWidth() const { return nRealWidth; } - inline void RealWidth( const sal_uInt16 nNew ) { nRealWidth = nNew; } - inline sal_uInt16 ForcedLeftMargin() const { return nForcedLeftMargin; } - inline void ForcedLeftMargin( const sal_uInt16 nN ) { nForcedLeftMargin = nN; } - - inline sal_uInt8 &MaxHyph() { return nMaxHyph; } - inline const sal_uInt8 &MaxHyph() const { return nMaxHyph; } - - inline SwLineLayout *GetRoot() { return pRoot; } - inline const SwLineLayout *GetRoot() const { return pRoot; } - - inline void SetRoot( SwLineLayout *pNew ) { pRoot = pNew; } - inline SwLinePortion *GetLast() { return pLast; } - inline void SetLast( SwLinePortion *pNewLast ) { pLast = pNewLast; } - inline bool IsFull() const { return bFull; } - inline void SetFull( const bool bNew ) { bFull = bNew; } + inline SwTwips Left() const { return m_nLeft; } + inline void Left( const SwTwips nNew ) { m_nLeft = nNew; } + inline SwTwips Right() const { return m_nRight; } + inline void Right( const SwTwips nNew ) { m_nRight = nNew; } + inline SwTwips First() const { return m_nFirst; } + inline void First( const SwTwips nNew ) { m_nFirst = nNew; } + inline sal_uInt16 RealWidth() const { return m_nRealWidth; } + inline void RealWidth( const sal_uInt16 nNew ) { m_nRealWidth = nNew; } + inline sal_uInt16 ForcedLeftMargin() const { return m_nForcedLeftMargin; } + inline void ForcedLeftMargin( const sal_uInt16 nN ) { m_nForcedLeftMargin = nN; } + + inline sal_uInt8 &MaxHyph() { return m_nMaxHyph; } + inline const sal_uInt8 &MaxHyph() const { return m_nMaxHyph; } + + inline SwLineLayout *GetRoot() { return m_pRoot; } + inline const SwLineLayout *GetRoot() const { return m_pRoot; } + + inline void SetRoot( SwLineLayout *pNew ) { m_pRoot = pNew; } + inline SwLinePortion *GetLast() { return m_pLast; } + inline void SetLast( SwLinePortion *pNewLast ) { m_pLast = pNewLast; } + inline bool IsFull() const { return m_bFull; } + inline void SetFull( const bool bNew ) { m_bFull = bNew; } inline bool IsHyphForbud() const - { return pFly ? bNoMidHyph : bNoEndHyph; } + { return m_pFly ? m_bNoMidHyph : m_bNoEndHyph; } inline void ChkNoHyph( const sal_uInt8 bEnd, const sal_uInt8 bMid ) - { bNoEndHyph = (nMaxHyph && bEnd >= nMaxHyph); - bNoMidHyph = (nMaxHyph && bMid >= nMaxHyph); } - inline bool IsIgnoreFly() const { return bIgnoreFly; } - inline void SetIgnoreFly( const bool bNew ) { bIgnoreFly = bNew; } - inline bool IsFakeLineStart() const { return bFakeLineStart; } - inline void SetFakeLineStart( const bool bNew ) { bFakeLineStart = bNew; } - inline bool IsStop() const { return bStop; } - inline void SetStop( const bool bNew ) { bStop = bNew; } - inline SwLinePortion *GetRest() { return pRest; } - inline void SetRest( SwLinePortion *pNewRest ) { pRest = pNewRest; } - inline bool IsNewLine() const { return bNewLine; } - inline void SetNewLine( const bool bNew ) { bNewLine = bNew; } - inline bool IsShift() const { return bShift; } - inline void SetShift( const bool bNew ) { bShift = bNew; } - inline bool IsInterHyph() const { return bInterHyph; } - inline bool IsUnderflow() const { return bUnderflow; } - inline void ClrUnderflow() { bUnderflow = false; } - inline bool IsDropInit() const { return bDropInit; } - inline void SetDropInit( const bool bNew ) { bDropInit = bNew; } - inline bool IsQuick() const { return bQuick; } - inline bool IsTest() const { return bTestFormat; } - - inline sal_Int32 GetLineStart() const { return nLineStart; } - inline void SetLineStart( const sal_Int32 nNew ) { nLineStart = nNew; } + { m_bNoEndHyph = (m_nMaxHyph && bEnd >= m_nMaxHyph); + m_bNoMidHyph = (m_nMaxHyph && bMid >= m_nMaxHyph); } + inline bool IsIgnoreFly() const { return m_bIgnoreFly; } + inline void SetIgnoreFly( const bool bNew ) { m_bIgnoreFly = bNew; } + inline bool IsFakeLineStart() const { return m_bFakeLineStart; } + inline void SetFakeLineStart( const bool bNew ) { m_bFakeLineStart = bNew; } + inline bool IsStop() const { return m_bStop; } + inline void SetStop( const bool bNew ) { m_bStop = bNew; } + inline SwLinePortion *GetRest() { return m_pRest; } + inline void SetRest( SwLinePortion *pNewRest ) { m_pRest = pNewRest; } + inline bool IsNewLine() const { return m_bNewLine; } + inline void SetNewLine( const bool bNew ) { m_bNewLine = bNew; } + inline bool IsShift() const { return m_bShift; } + inline void SetShift( const bool bNew ) { m_bShift = bNew; } + inline bool IsInterHyph() const { return m_bInterHyph; } + inline bool IsUnderflow() const { return m_bUnderflow; } + inline void ClrUnderflow() { m_bUnderflow = false; } + inline bool IsDropInit() const { return m_bDropInit; } + inline void SetDropInit( const bool bNew ) { m_bDropInit = bNew; } + inline bool IsQuick() const { return m_bQuick; } + inline bool IsTest() const { return m_bTestFormat; } + + inline sal_Int32 GetLineStart() const { return m_nLineStart; } + inline void SetLineStart( const sal_Int32 nNew ) { m_nLineStart = nNew; } // these are used during fly calculation - inline sal_uInt16 GetLineHeight() const { return nLineHeight; } - inline void SetLineHeight( const sal_uInt16 nNew ) { nLineHeight = nNew; } - inline sal_uInt16 GetLineNetHeight() const { return nLineNetHeight; } - inline void SetLineNetHeight( const sal_uInt16 nNew ) { nLineNetHeight = nNew; } + inline sal_uInt16 GetLineHeight() const { return m_nLineHeight; } + inline void SetLineHeight( const sal_uInt16 nNew ) { m_nLineHeight = nNew; } + inline sal_uInt16 GetLineNetHeight() const { return m_nLineNetHeight; } + inline void SetLineNetHeight( const sal_uInt16 nNew ) { m_nLineNetHeight = nNew; } - inline const SwLinePortion *GetUnderflow() const { return pUnderflow; } - inline SwLinePortion *GetUnderflow() { return pUnderflow; } + inline const SwLinePortion *GetUnderflow() const { return m_pUnderflow; } + inline SwLinePortion *GetUnderflow() { return m_pUnderflow; } inline void SetUnderflow( SwLinePortion *pNew ) - { pUnderflow = pNew; bUnderflow = true; } - inline sal_Int32 GetSoftHyphPos() const { return nSoftHyphPos; } - inline void SetSoftHyphPos( const sal_Int32 nNew ) { nSoftHyphPos = nNew; } + { m_pUnderflow = pNew; m_bUnderflow = true; } + inline sal_Int32 GetSoftHyphPos() const { return m_nSoftHyphPos; } + inline void SetSoftHyphPos( const sal_Int32 nNew ) { m_nSoftHyphPos = nNew; } inline void SetParaFootnote(); // FlyFrms - inline SwFlyPortion *GetFly() { return pFly; } - inline void SetFly( SwFlyPortion *pNew ) { pFly = pNew; } + inline SwFlyPortion *GetFly() { return m_pFly; } + inline void SetFly( SwFlyPortion *pNew ) { m_pFly = pNew; } inline const SwAttrSet& GetCharAttr() const; // Tabs - inline SwTabPortion *GetLastTab() { return pLastTab; } - inline void SetLastTab( SwTabPortion *pNew ) { pLastTab = pNew; } - inline sal_Unicode GetTabDecimal() const { return cTabDecimal; } - inline void SetTabDecimal( const sal_Unicode cNew ) { cTabDecimal = cNew;} + inline SwTabPortion *GetLastTab() { return m_pLastTab; } + inline void SetLastTab( SwTabPortion *pNew ) { m_pLastTab = pNew; } + inline sal_Unicode GetTabDecimal() const { return m_cTabDecimal; } + inline void SetTabDecimal( const sal_Unicode cNew ) { m_cTabDecimal = cNew;} - inline void ClearHookChar() { cHookChar = 0; } - inline void SetHookChar( const sal_Unicode cNew ) { cHookChar = cNew; } - inline sal_Unicode GetHookChar() const { return cHookChar; } + inline void ClearHookChar() { m_cHookChar = 0; } + inline void SetHookChar( const sal_Unicode cNew ) { m_cHookChar = cNew; } + inline sal_Unicode GetHookChar() const { return m_cHookChar; } // Done-Flags - inline bool IsFootnoteDone() const { return bFootnoteDone; } - inline void SetFootnoteDone( const bool bNew ) { bFootnoteDone = bNew; } - inline bool IsErgoDone() const { return bErgoDone; } - inline void SetErgoDone( const bool bNew ) { bErgoDone = bNew; } - inline bool IsNumDone() const { return bNumDone; } - inline void SetNumDone( const bool bNew ) { bNumDone = bNew; } - inline bool IsArrowDone() const { return bArrowDone; } - inline void SetArrowDone( const bool bNew ) { bArrowDone = bNew; } + inline bool IsFootnoteDone() const { return m_bFootnoteDone; } + inline void SetFootnoteDone( const bool bNew ) { m_bFootnoteDone = bNew; } + inline bool IsErgoDone() const { return m_bErgoDone; } + inline void SetErgoDone( const bool bNew ) { m_bErgoDone = bNew; } + inline bool IsNumDone() const { return m_bNumDone; } + inline void SetNumDone( const bool bNew ) { m_bNumDone = bNew; } + inline bool IsArrowDone() const { return m_bArrowDone; } + inline void SetArrowDone( const bool bNew ) { m_bArrowDone = bNew; } // For SwTextPortion::Hyphenate bool ChgHyph( const bool bNew ); // Should the hyphenate helper be discarded? bool IsHyphenate() const; - inline sal_Int32 GetUnderScorePos() const { return nUnderScorePos; } - inline void SetUnderScorePos( sal_Int32 nNew ) { nUnderScorePos = nNew; } + inline sal_Int32 GetUnderScorePos() const { return m_nUnderScorePos; } + inline void SetUnderScorePos( sal_Int32 nNew ) { m_nUnderScorePos = nNew; } // Calls HyphenateWord() of Hyphenator ::com::sun::star::uno::Reference< @@ -682,8 +682,8 @@ public: // Return: Position; sets cHookChar if necessary sal_Int32 ScanPortionEnd( const sal_Int32 nStart, const sal_Int32 nEnd ); - inline void SetTabOverflow( bool bOverflow ) { bTabOverflow = bOverflow; } - inline bool IsTabOverflow() { return bTabOverflow; } + inline void SetTabOverflow( bool bOverflow ) { m_bTabOverflow = bOverflow; } + inline bool IsTabOverflow() { return m_bTabOverflow; } }; |