diff options
| -rw-r--r-- | BUILD.gn | 2 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_ffarc.cpp | 9 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_arcdata.h (renamed from xfa/fxfa/parser/cxfa_arc.h) | 10 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_value.cpp | 6 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_value.h | 4 |
5 files changed, 15 insertions, 16 deletions
@@ -1785,7 +1785,7 @@ if (pdf_enable_xfa) { "xfa/fxfa/parser/cscript_logpseudomodel.h", "xfa/fxfa/parser/cscript_signaturepseudomodel.cpp", "xfa/fxfa/parser/cscript_signaturepseudomodel.h", - "xfa/fxfa/parser/cxfa_arc.h", + "xfa/fxfa/parser/cxfa_arcdata.h", "xfa/fxfa/parser/cxfa_arraynodelist.cpp", "xfa/fxfa/parser/cxfa_arraynodelist.h", "xfa/fxfa/parser/cxfa_assist.cpp", diff --git a/xfa/fxfa/cxfa_ffarc.cpp b/xfa/fxfa/cxfa_ffarc.cpp index 5929cb9001..ddfa1b0b0d 100644 --- a/xfa/fxfa/cxfa_ffarc.cpp +++ b/xfa/fxfa/cxfa_ffarc.cpp @@ -20,13 +20,12 @@ void CXFA_FFArc::RenderWidget(CXFA_Graphics* pGS, if (!value) return; - CXFA_Arc arcObj = value.GetArc(); - CFX_Matrix mtRotate = GetRotateMatrix(); - mtRotate.Concat(matrix); - CFX_RectF rtArc = GetRectWithoutRotate(); if (CXFA_Margin mgWidget = m_pDataAcc->GetMargin()) XFA_RectWidthoutMargin(rtArc, mgWidget); - DrawBorder(pGS, arcObj, rtArc, mtRotate); + CFX_Matrix mtRotate = GetRotateMatrix(); + mtRotate.Concat(matrix); + + DrawBorder(pGS, value.GetArcData(), rtArc, mtRotate); } diff --git a/xfa/fxfa/parser/cxfa_arc.h b/xfa/fxfa/parser/cxfa_arcdata.h index e712d806a7..60c32bad4e 100644 --- a/xfa/fxfa/parser/cxfa_arc.h +++ b/xfa/fxfa/parser/cxfa_arcdata.h @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_PARSER_CXFA_ARC_H_ -#define XFA_FXFA_PARSER_CXFA_ARC_H_ +#ifndef XFA_FXFA_PARSER_CXFA_ARCDATA_H_ +#define XFA_FXFA_PARSER_CXFA_ARCDATA_H_ #include "xfa/fxfa/parser/cxfa_box.h" class CXFA_Node; -class CXFA_Arc : public CXFA_Box { +class CXFA_ArcData : public CXFA_Box { public: - explicit CXFA_Arc(CXFA_Node* pNode) : CXFA_Box(pNode) {} + explicit CXFA_ArcData(CXFA_Node* pNode) : CXFA_Box(pNode) {} }; -#endif // XFA_FXFA_PARSER_CXFA_ARC_H_ +#endif // XFA_FXFA_PARSER_CXFA_ARCDATA_H_ diff --git a/xfa/fxfa/parser/cxfa_value.cpp b/xfa/fxfa/parser/cxfa_value.cpp index f2bdf64805..9b7040c33b 100644 --- a/xfa/fxfa/parser/cxfa_value.cpp +++ b/xfa/fxfa/parser/cxfa_value.cpp @@ -24,9 +24,9 @@ bool CXFA_Value::GetChildValueContent(WideString& wsContent) { return false; } -CXFA_Arc CXFA_Value::GetArc() { - return CXFA_Arc(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) - : nullptr); +CXFA_ArcData CXFA_Value::GetArcData() { + return CXFA_ArcData(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) + : nullptr); } CXFA_Line CXFA_Value::GetLine() { diff --git a/xfa/fxfa/parser/cxfa_value.h b/xfa/fxfa/parser/cxfa_value.h index 52df169ee4..513f37509b 100644 --- a/xfa/fxfa/parser/cxfa_value.h +++ b/xfa/fxfa/parser/cxfa_value.h @@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_CXFA_VALUE_H_ #include "core/fxcrt/fx_string.h" -#include "xfa/fxfa/parser/cxfa_arc.h" +#include "xfa/fxfa/parser/cxfa_arcdata.h" #include "xfa/fxfa/parser/cxfa_data.h" #include "xfa/fxfa/parser/cxfa_exdata.h" #include "xfa/fxfa/parser/cxfa_image.h" @@ -24,7 +24,7 @@ class CXFA_Value : public CXFA_Data { XFA_Element GetChildValueClassID(); bool GetChildValueContent(WideString& wsContent); - CXFA_Arc GetArc(); + CXFA_ArcData GetArcData(); CXFA_Line GetLine(); CXFA_Rectangle GetRectangle(); CXFA_Text GetText(); |