diff options
Diffstat (limited to 'xfa/fgas')
| -rw-r--r-- | xfa/fgas/layout/fgas_rtfbreak.cpp | 2 | ||||
| -rw-r--r-- | xfa/fgas/localization/fgas_locale.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp index c6a43d3b56..62b3f5f28e 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.cpp +++ b/xfa/fgas/layout/fgas_rtfbreak.cpp @@ -1317,7 +1317,7 @@ int32_t CFX_RTFBreak::GetDisplayPos(const FX_RTFTEXTOBJ* pText, bAdjusted = pAdjustPos(wForm, bMBCSCode, pFont, fFontSize, bVerticalChar, ptOffset); } - if (!pAdjustPos && bVerticalChar && (dwProps & 0x00010000) != 0) { + if (!bAdjusted && bVerticalChar && (dwProps & 0x00010000) != 0) { CFX_Rect rtBBox; rtBBox.Reset(); if (pFont->GetCharBBox(wForm, rtBBox, bMBCSCode)) { diff --git a/xfa/fgas/localization/fgas_locale.cpp b/xfa/fgas/localization/fgas_locale.cpp index 6eed202643..f0d1066397 100644 --- a/xfa/fgas/localization/fgas_locale.cpp +++ b/xfa/fgas/localization/fgas_locale.cpp @@ -3655,9 +3655,8 @@ FX_BOOL FX_TimeFromCanonical(const CFX_WideStringC& wsTime, } millisecond = millisecond * 10 + str[cc++] - '0'; } - if (cc < cc_start + 3 || millisecond >= 1000) { + if (cc < cc_start + 3) return FALSE; - } } if (cc < len) { FX_TIMEZONE tzDiff; |