summaryrefslogtreecommitdiff
path: root/xfa/fgas
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fgas')
-rw-r--r--xfa/fgas/font/cfgas_gefont.cpp3
-rw-r--r--xfa/fgas/layout/fgas_rtfbreak.cpp2
-rw-r--r--xfa/fgas/layout/fgas_textbreak.cpp4
3 files changed, 1 insertions, 8 deletions
diff --git a/xfa/fgas/font/cfgas_gefont.cpp b/xfa/fgas/font/cfgas_gefont.cpp
index d0e7f13c3a..a175202e7d 100644
--- a/xfa/fgas/font/cfgas_gefont.cpp
+++ b/xfa/fgas/font/cfgas_gefont.cpp
@@ -325,8 +325,7 @@ bool CFGAS_GEFont::GetCharBBoxInternal(FX_WCHAR wUnicode,
if (pFont.Get() == this) {
FX_RECT rtBBox;
if (m_pFont->GetGlyphBBox(iGlyph, rtBBox)) {
- CFX_Rect rt;
- rt.Set(rtBBox.left, rtBBox.top, rtBBox.Width(), rtBBox.Height());
+ CFX_Rect rt(rtBBox.left, rtBBox.top, rtBBox.Width(), rtBBox.Height());
int32_t index = m_pRectArray->Add(rt);
pRect = m_pRectArray->GetPtrAt(index);
m_BBoxMap[wUnicode] = pRect;
diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp
index 7463eaa6c1..62e33fe9c2 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.cpp
+++ b/xfa/fgas/layout/fgas_rtfbreak.cpp
@@ -1302,7 +1302,6 @@ int32_t CFX_RTFBreak::GetDisplayPos(const FX_RTFTEXTOBJ* pText,
}
if (!bAdjusted && bVerticalChar && (dwProps & 0x00010000) != 0) {
CFX_Rect rtBBox;
- rtBBox.Reset();
if (pFont->GetCharBBox(wForm, &rtBBox, bMBCSCode)) {
ptOffset.x = fFontSize * (850 - rtBBox.right()) / 1000.0f;
ptOffset.y = fFontSize * (1000 - rtBBox.height) / 2000.0f;
@@ -1418,7 +1417,6 @@ int32_t CFX_RTFBreak::GetCharRects(const FX_RTFTEXTOBJ* pText,
bCharBBox = false;
CFX_Rect bbox;
- bbox.Set(0, 0, 0, 0);
if (bCharBBox)
bCharBBox = pFont->GetBBox(&bbox);
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp
index 74f8cb4756..69773f8eb0 100644
--- a/xfa/fgas/layout/fgas_textbreak.cpp
+++ b/xfa/fgas/layout/fgas_textbreak.cpp
@@ -1461,7 +1461,6 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
}
if (chartype == FX_CHARTYPE_Combination) {
CFX_Rect rtBBox;
- rtBBox.Reset();
if (pFont->GetCharBBox(wForm, &rtBBox, false)) {
pCharPos->m_OriginY =
fYBase + fFontSize -
@@ -1472,7 +1471,6 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
if ((dwLastProps & FX_CHARTYPEBITSMASK) ==
FX_CHARTYPE_Combination) {
CFX_Rect rtBox;
- rtBox.Reset();
if (pFont->GetCharBBox(wLast, &rtBox, false)) {
pCharPos->m_OriginY -= fFontSize * rtBox.height / iMaxHeight;
}
@@ -1487,7 +1485,6 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
}
if (!bAdjusted && bVerticalChar && (dwProps & 0x00010000) != 0) {
CFX_Rect rtBBox;
- rtBBox.Reset();
if (pFont->GetCharBBox(wForm, &rtBBox, false)) {
ptOffset.x = fFontSize * (850 - rtBBox.right()) / iMaxHeight;
ptOffset.y = fFontSize * (iAscent - rtBBox.top - 150) / iMaxHeight;
@@ -1602,7 +1599,6 @@ int32_t CFX_TxtBreak::GetCharRects(const FX_TXTRUN* pTxtRun,
bCharBBox = false;
CFX_Rect bbox;
- bbox.Set(0, 0, 0, 0);
if (bCharBBox)
bCharBBox = pFont->GetBBox(&bbox);