Rename CXFA_TextTabstopsContext::m_bTabStops to m_bHasTabStops Avoids conflict with m_Tabstops if Hungarian prefix is stripped. -- Initialize in header while at it. Change-Id: I67a49432a3594a943b1c6688f9a37e323ea35f2b Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/69610 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp index f95ebdc..f10d706 100644 --- a/xfa/fxfa/cxfa_textlayout.cpp +++ b/xfa/fxfa/cxfa_textlayout.cpp
@@ -941,7 +941,7 @@ if (iCount > 0) { iTabstopsIndex++; - m_pTabstopContext->m_bTabstops = true; + m_pTabstopContext->m_bHasTabstops = true; float fRight = 0; if (iPieces > 1) { CXFA_TextPiece* p = pPieceLine->m_textPieces[iPieces - 2].get(); @@ -951,7 +951,7 @@ pPiece->rtPiece.width + pPiece->rtPiece.left - fRight; } else if (iTabstopsIndex > -1) { float fLeft = 0; - if (m_pTabstopContext->m_bTabstops) { + if (m_pTabstopContext->m_bHasTabstops) { uint32_t dwAlign = m_pTabstopContext->m_tabstops[iTabstopsIndex].dwAlign; if (dwAlign == FX_HashCode_GetW(L"center", false)) { fLeft = pPiece->rtPiece.width / 2.0f; @@ -969,7 +969,7 @@ } m_pTabstopContext->m_fLeft = std::min(fLeft, m_pTabstopContext->m_fTabWidth); - m_pTabstopContext->m_bTabstops = false; + m_pTabstopContext->m_bHasTabstops = false; m_pTabstopContext->m_fTabWidth = 0; } pPiece->rtPiece.left -= m_pTabstopContext->m_fLeft;
diff --git a/xfa/fxfa/cxfa_texttabstopscontext.cpp b/xfa/fxfa/cxfa_texttabstopscontext.cpp index b594f1c..0baf243 100644 --- a/xfa/fxfa/cxfa_texttabstopscontext.cpp +++ b/xfa/fxfa/cxfa_texttabstopscontext.cpp
@@ -8,10 +8,9 @@ #include <algorithm> -CXFA_TextTabstopsContext::CXFA_TextTabstopsContext() - : m_iTabIndex(-1), m_bTabstops(false), m_fTabWidth(0), m_fLeft(0) {} +CXFA_TextTabstopsContext::CXFA_TextTabstopsContext() = default; -CXFA_TextTabstopsContext::~CXFA_TextTabstopsContext() {} +CXFA_TextTabstopsContext::~CXFA_TextTabstopsContext() = default; void CXFA_TextTabstopsContext::Append(uint32_t dwAlign, float fTabstops) { XFA_TABSTOPS tabstop; @@ -28,7 +27,7 @@ void CXFA_TextTabstopsContext::Reset() { m_iTabIndex = -1; - m_bTabstops = false; + m_bHasTabstops = false; m_fTabWidth = 0; m_fLeft = 0; }
diff --git a/xfa/fxfa/cxfa_texttabstopscontext.h b/xfa/fxfa/cxfa_texttabstopscontext.h index 9837e35..956619f 100644 --- a/xfa/fxfa/cxfa_texttabstopscontext.h +++ b/xfa/fxfa/cxfa_texttabstopscontext.h
@@ -29,10 +29,10 @@ void RemoveAll(); void Reset(); - int32_t m_iTabIndex; - bool m_bTabstops; - float m_fTabWidth; - float m_fLeft; + int32_t m_iTabIndex = -1; + bool m_bHasTabstops = false; + float m_fTabWidth = 0.0f; + float m_fLeft = 0.0f; std::vector<XFA_TABSTOPS> m_tabstops; };