summaryrefslogtreecommitdiff
path: root/xfa/fxfa/cxfa_textlayout.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-08-17 01:11:28 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-17 01:11:28 +0000
commit9faabc5fc37171d9411dc2eb7f7eab4d444066a0 (patch)
treeecad3d8c2c229a2447e96c0ae86dd50ac8ed3c6d /xfa/fxfa/cxfa_textlayout.h
parent136342d950c91cb1266b2a200e9dee5ade99535b (diff)
downloadpdfium-9faabc5fc37171d9411dc2eb7f7eab4d444066a0.tar.xz
Remove optionals from CXFA_TextLayout methods.
Change-Id: I832b694dea58de354ef115bacc11f92e072abe80 Reviewed-on: https://pdfium-review.googlesource.com/40430 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_textlayout.h')
-rw-r--r--xfa/fxfa/cxfa_textlayout.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/xfa/fxfa/cxfa_textlayout.h b/xfa/fxfa/cxfa_textlayout.h
index 25c73874a8..e8c56fd1fc 100644
--- a/xfa/fxfa/cxfa_textlayout.h
+++ b/xfa/fxfa/cxfa_textlayout.h
@@ -78,9 +78,9 @@ class CXFA_TextLayout {
const RetainPtr<CFX_CSSComputedStyle>& pParentStyle,
bool bSavePieces,
RetainPtr<CXFA_LinkUserData> pLinkData,
- bool bEndBreak = true,
- bool bIsOl = false,
- int32_t iLiCount = 0);
+ bool bEndBreak,
+ bool bIsOl,
+ int32_t iLiCount);
bool AppendChar(const WideString& wsText,
float* pLinePos,
float fSpaceAbove,
@@ -88,7 +88,7 @@ class CXFA_TextLayout {
void AppendTextLine(CFX_BreakType dwStatus,
float* pLinePos,
bool bSavePieces,
- bool bEndBreak = false);
+ bool bEndBreak);
void EndBreak(CFX_BreakType dwStatus, float* pLinePos, bool bDefault);
bool IsEnd(bool bSavePieces);
void ProcessText(WideString& wsText);
@@ -103,9 +103,7 @@ class CXFA_TextLayout {
int32_t iPiece,
FXTEXT_CHARPOS* pCharPos,
const CFX_Matrix& tmDoc2Device);
- int32_t GetDisplayPos(const CXFA_TextPiece* pPiece,
- FXTEXT_CHARPOS* pCharPos,
- bool bCharCode = false);
+ int32_t GetDisplayPos(const CXFA_TextPiece* pPiece, FXTEXT_CHARPOS* pCharPos);
bool ToRun(const CXFA_TextPiece* pPiece, FX_RTFTEXTOBJ* tr);
void DoTabstops(CFX_CSSComputedStyle* pStyle, CXFA_PieceLine* pPieceLine);
bool Layout(int32_t iBlock);