sw/source/core/text/inftxt.cxx | 14 +++++++------- sw/source/core/text/porfld.cxx | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit b7f1fadf8ebb133ec43bab046f0b0bb4ae9a981f Author: Mike Kaganski <[email protected]> AuthorDate: Sat Oct 25 23:36:36 2025 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Oct 25 22:26:50 2025 +0200 Use SetHookChar / ClearHookChar, instead of direct use of m_cHookChar Change-Id: I01637339840a14eb35da6de0c4f953e09b14031a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192980 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 567ab6ab8425..d6936a0ec996 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1847,7 +1847,7 @@ void SwTextFormatInfo::Init() m_nExtraDescent = 0; m_nSoftHyphPos = TextFrameIndex(0); m_nLastBookmarkPos = TextFrameIndex(-1); - m_cHookChar = 0; + ClearHookChar(); SetIdx(TextFrameIndex(0)); SetLen(TextFrameIndex(GetText().getLength())); SetPaintOfst(0); @@ -1964,7 +1964,7 @@ bool SwTextFormatInfo::CheckFootnotePortion_( SwLineLayout const * pCurr ) TextFrameIndex SwTextFormatInfo::ScanPortionEnd(TextFrameIndex const nStart, TextFrameIndex const nEnd) { - m_cHookChar = 0; + ClearHookChar(); TextFrameIndex i = nStart; // Used for decimal tab handling: @@ -1995,7 +1995,7 @@ TextFrameIndex SwTextFormatInfo::ScanPortionEnd(TextFrameIndex const nStart, case CH_BREAK: case CHAR_ZWSP : case CHAR_WJ : - m_cHookChar = cPos; + SetHookChar( cPos ); return i; default: @@ -2006,7 +2006,7 @@ TextFrameIndex SwTextFormatInfo::ScanPortionEnd(TextFrameIndex const nStart, OSL_ENSURE( cPos, "Unexpected end of string" ); if( cPos ) // robust { - m_cHookChar = cPos; + SetHookChar( cPos ); return i; } } @@ -2024,7 +2024,7 @@ TextFrameIndex SwTextFormatInfo::ScanPortionEnd(TextFrameIndex const nStart, { if ( bNumFound ) { - m_cHookChar = cPos; + SetHookChar( cPos ); SetTabDecimal( cPos ); return i; } @@ -2041,8 +2041,8 @@ TextFrameIndex SwTextFormatInfo::ScanPortionEnd(TextFrameIndex const nStart, const sal_Unicode cPos = GetChar( i ); if ( cPos != cTabDec && cPos != cThousandSep && cPos !=cThousandSep2 && ( 0x2F >= cPos || cPos >= 0x3A ) ) { - m_cHookChar = GetChar( i ); - SetTabDecimal( m_cHookChar ); + SetHookChar( cPos ); + SetTabDecimal( cPos ); } } diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 6d4c65babfd6..42bb1f124d06 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -334,7 +334,7 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf ) if ( m_nNextScriptChg < nFullLen ) { nFullLen = m_nNextScriptChg; - rInf.SetHookChar( 0 ); + rInf.ClearHookChar(); } rInf.SetLen( nFullLen );
