diff options
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_ffline.cpp | 8 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_linedata.cpp (renamed from xfa/fxfa/parser/cxfa_line.cpp) | 8 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_linedata.h (renamed from xfa/fxfa/parser/cxfa_line.h) | 10 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_value.cpp | 6 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_value.h | 4 |
6 files changed, 20 insertions, 20 deletions
@@ -1838,8 +1838,8 @@ if (pdf_enable_xfa) { "xfa/fxfa/parser/cxfa_layoutpagemgr.h", "xfa/fxfa/parser/cxfa_layoutprocessor.cpp", "xfa/fxfa/parser/cxfa_layoutprocessor.h", - "xfa/fxfa/parser/cxfa_line.cpp", - "xfa/fxfa/parser/cxfa_line.h", + "xfa/fxfa/parser/cxfa_linedata.cpp", + "xfa/fxfa/parser/cxfa_linedata.h", "xfa/fxfa/parser/cxfa_localemgr.cpp", "xfa/fxfa/parser/cxfa_localemgr.h", "xfa/fxfa/parser/cxfa_localevalue.cpp", diff --git a/xfa/fxfa/cxfa_ffline.cpp b/xfa/fxfa/cxfa_ffline.cpp index cc52ce1763..a5e9441061 100644 --- a/xfa/fxfa/cxfa_ffline.cpp +++ b/xfa/fxfa/cxfa_ffline.cpp @@ -57,12 +57,12 @@ void CXFA_FFLine::RenderWidget(CXFA_Graphics* pGS, if (!value) return; - CXFA_Line lineObj = value.GetLine(); + CXFA_LineData lineData = value.GetLineData(); FX_ARGB lineColor = 0xFF000000; int32_t iStrokeType = 0; float fLineWidth = 1.0f; int32_t iCap = 0; - CXFA_EdgeData edgeData = lineObj.GetEdgeData(); + CXFA_EdgeData edgeData = lineData.GetEdgeData(); if (edgeData) { if (edgeData.GetPresence() != XFA_ATTRIBUTEENUM_Visible) return; @@ -80,9 +80,9 @@ void CXFA_FFLine::RenderWidget(CXFA_Graphics* pGS, if (CXFA_Margin mgWidget = m_pDataAcc->GetMargin()) XFA_RectWidthoutMargin(rtLine, mgWidget); - GetRectFromHand(rtLine, lineObj.GetHand(), fLineWidth); + GetRectFromHand(rtLine, lineData.GetHand(), fLineWidth); CXFA_Path linePath; - if (lineObj.GetSlope() && rtLine.right() > 0.0f && rtLine.bottom() > 0.0f) + if (lineData.GetSlope() && rtLine.right() > 0.0f && rtLine.bottom() > 0.0f) linePath.AddLine(rtLine.TopRight(), rtLine.BottomLeft()); else linePath.AddLine(rtLine.TopLeft(), rtLine.BottomRight()); diff --git a/xfa/fxfa/parser/cxfa_line.cpp b/xfa/fxfa/parser/cxfa_linedata.cpp index 5216bd4622..a6f4e4c6cf 100644 --- a/xfa/fxfa/parser/cxfa_line.cpp +++ b/xfa/fxfa/parser/cxfa_linedata.cpp @@ -4,19 +4,19 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxfa/parser/cxfa_line.h" +#include "xfa/fxfa/parser/cxfa_linedata.h" #include "xfa/fxfa/parser/cxfa_node.h" -int32_t CXFA_Line::GetHand() { +int32_t CXFA_LineData::GetHand() { return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_Hand); } -bool CXFA_Line::GetSlope() { +bool CXFA_LineData::GetSlope() { return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_Slope) == XFA_ATTRIBUTEENUM_Slash; } -CXFA_EdgeData CXFA_Line::GetEdgeData() { +CXFA_EdgeData CXFA_LineData::GetEdgeData() { return CXFA_EdgeData(m_pNode->GetChild(0, XFA_Element::Edge, false)); } diff --git a/xfa/fxfa/parser/cxfa_line.h b/xfa/fxfa/parser/cxfa_linedata.h index b167e39810..596bef76f0 100644 --- a/xfa/fxfa/parser/cxfa_line.h +++ b/xfa/fxfa/parser/cxfa_linedata.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_PARSER_CXFA_LINE_H_ -#define XFA_FXFA_PARSER_CXFA_LINE_H_ +#ifndef XFA_FXFA_PARSER_CXFA_LINEDATA_H_ +#define XFA_FXFA_PARSER_CXFA_LINEDATA_H_ #include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_data.h" @@ -13,13 +13,13 @@ class CXFA_Node; -class CXFA_Line : public CXFA_Data { +class CXFA_LineData : public CXFA_Data { public: - explicit CXFA_Line(CXFA_Node* pNode) : CXFA_Data(pNode) {} + explicit CXFA_LineData(CXFA_Node* pNode) : CXFA_Data(pNode) {} int32_t GetHand(); bool GetSlope(); CXFA_EdgeData GetEdgeData(); }; -#endif // XFA_FXFA_PARSER_CXFA_LINE_H_ +#endif // XFA_FXFA_PARSER_CXFA_LINEDATA_H_ diff --git a/xfa/fxfa/parser/cxfa_value.cpp b/xfa/fxfa/parser/cxfa_value.cpp index 5b812a9f7f..bad1681031 100644 --- a/xfa/fxfa/parser/cxfa_value.cpp +++ b/xfa/fxfa/parser/cxfa_value.cpp @@ -29,9 +29,9 @@ CXFA_ArcData CXFA_Value::GetArcData() { : nullptr); } -CXFA_Line CXFA_Value::GetLine() { - return CXFA_Line(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) - : nullptr); +CXFA_LineData CXFA_Value::GetLineData() { + return CXFA_LineData(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) + : nullptr); } CXFA_Rectangle CXFA_Value::GetRectangle() { diff --git a/xfa/fxfa/parser/cxfa_value.h b/xfa/fxfa/parser/cxfa_value.h index 65a9c36b00..d13d90fe8a 100644 --- a/xfa/fxfa/parser/cxfa_value.h +++ b/xfa/fxfa/parser/cxfa_value.h @@ -12,7 +12,7 @@ #include "xfa/fxfa/parser/cxfa_data.h" #include "xfa/fxfa/parser/cxfa_exdata.h" #include "xfa/fxfa/parser/cxfa_imagedata.h" -#include "xfa/fxfa/parser/cxfa_line.h" +#include "xfa/fxfa/parser/cxfa_linedata.h" #include "xfa/fxfa/parser/cxfa_rectangle.h" #include "xfa/fxfa/parser/cxfa_text.h" @@ -25,7 +25,7 @@ class CXFA_Value : public CXFA_Data { XFA_Element GetChildValueClassID(); bool GetChildValueContent(WideString& wsContent); CXFA_ArcData GetArcData(); - CXFA_Line GetLine(); + CXFA_LineData GetLineData(); CXFA_Rectangle GetRectangle(); CXFA_Text GetText(); CXFA_ExData GetExData(); |