summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUILD.gn2
-rw-r--r--xfa/fxfa/cxfa_ffrectangle.cpp3
-rw-r--r--xfa/fxfa/parser/cxfa_rectangledata.h (renamed from xfa/fxfa/parser/cxfa_rectangle.h)10
-rw-r--r--xfa/fxfa/parser/cxfa_value.cpp6
-rw-r--r--xfa/fxfa/parser/cxfa_value.h4
5 files changed, 12 insertions, 13 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 1e45ef301b..e64fe8a11a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1862,7 +1862,7 @@ if (pdf_enable_xfa) {
"xfa/fxfa/parser/cxfa_occurdata.h",
"xfa/fxfa/parser/cxfa_paradata.cpp",
"xfa/fxfa/parser/cxfa_paradata.h",
- "xfa/fxfa/parser/cxfa_rectangle.h",
+ "xfa/fxfa/parser/cxfa_rectangledata.h",
"xfa/fxfa/parser/cxfa_script.cpp",
"xfa/fxfa/parser/cxfa_script.h",
"xfa/fxfa/parser/cxfa_simple_parser.cpp",
diff --git a/xfa/fxfa/cxfa_ffrectangle.cpp b/xfa/fxfa/cxfa_ffrectangle.cpp
index 7c6035cd07..5305d17950 100644
--- a/xfa/fxfa/cxfa_ffrectangle.cpp
+++ b/xfa/fxfa/cxfa_ffrectangle.cpp
@@ -21,7 +21,6 @@ void CXFA_FFRectangle::RenderWidget(CXFA_Graphics* pGS,
if (!value)
return;
- CXFA_Rectangle rtObj = value.GetRectangle();
CFX_RectF rect = GetRectWithoutRotate();
if (CXFA_MarginData marginData = m_pDataAcc->GetMarginData())
XFA_RectWidthoutMargin(rect, marginData);
@@ -29,5 +28,5 @@ void CXFA_FFRectangle::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
- DrawBorder(pGS, rtObj, rect, mtRotate);
+ DrawBorder(pGS, value.GetRectangleData(), rect, mtRotate);
}
diff --git a/xfa/fxfa/parser/cxfa_rectangle.h b/xfa/fxfa/parser/cxfa_rectangledata.h
index 07a4d7de70..f0abadc3b6 100644
--- a/xfa/fxfa/parser/cxfa_rectangle.h
+++ b/xfa/fxfa/parser/cxfa_rectangledata.h
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXFA_PARSER_CXFA_RECTANGLE_H_
-#define XFA_FXFA_PARSER_CXFA_RECTANGLE_H_
+#ifndef XFA_FXFA_PARSER_CXFA_RECTANGLEDATA_H_
+#define XFA_FXFA_PARSER_CXFA_RECTANGLEDATA_H_
#include "xfa/fxfa/parser/cxfa_boxdata.h"
class CXFA_Node;
-class CXFA_Rectangle : public CXFA_BoxData {
+class CXFA_RectangleData : public CXFA_BoxData {
public:
- explicit CXFA_Rectangle(CXFA_Node* pNode) : CXFA_BoxData(pNode) {}
+ explicit CXFA_RectangleData(CXFA_Node* pNode) : CXFA_BoxData(pNode) {}
};
-#endif // XFA_FXFA_PARSER_CXFA_RECTANGLE_H_
+#endif // XFA_FXFA_PARSER_CXFA_RECTANGLEDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_value.cpp b/xfa/fxfa/parser/cxfa_value.cpp
index bad1681031..fcfaf6b9ce 100644
--- a/xfa/fxfa/parser/cxfa_value.cpp
+++ b/xfa/fxfa/parser/cxfa_value.cpp
@@ -34,9 +34,9 @@ CXFA_LineData CXFA_Value::GetLineData() {
: nullptr);
}
-CXFA_Rectangle CXFA_Value::GetRectangle() {
- return CXFA_Rectangle(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild)
- : nullptr);
+CXFA_RectangleData CXFA_Value::GetRectangleData() {
+ return CXFA_RectangleData(
+ m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) : nullptr);
}
CXFA_Text CXFA_Value::GetText() {
diff --git a/xfa/fxfa/parser/cxfa_value.h b/xfa/fxfa/parser/cxfa_value.h
index d13d90fe8a..c6683238f5 100644
--- a/xfa/fxfa/parser/cxfa_value.h
+++ b/xfa/fxfa/parser/cxfa_value.h
@@ -13,7 +13,7 @@
#include "xfa/fxfa/parser/cxfa_exdata.h"
#include "xfa/fxfa/parser/cxfa_imagedata.h"
#include "xfa/fxfa/parser/cxfa_linedata.h"
-#include "xfa/fxfa/parser/cxfa_rectangle.h"
+#include "xfa/fxfa/parser/cxfa_rectangledata.h"
#include "xfa/fxfa/parser/cxfa_text.h"
class CXFA_Node;
@@ -26,7 +26,7 @@ class CXFA_Value : public CXFA_Data {
bool GetChildValueContent(WideString& wsContent);
CXFA_ArcData GetArcData();
CXFA_LineData GetLineData();
- CXFA_Rectangle GetRectangle();
+ CXFA_RectangleData GetRectangleData();
CXFA_Text GetText();
CXFA_ExData GetExData();
CXFA_ImageData GetImageData();