diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-07 20:59:30 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-07 20:59:30 +0000 |
commit | 5fe712cb6c605e597f65f6b4cd0afa3213234639 (patch) | |
tree | 666bf236e5a213f7baa23fbd1d407baef794942e /xfa/fxfa/parser | |
parent | c3ef52cf3c26d47877740dc46faa3088be44cfae (diff) | |
download | pdfium-5fe712cb6c605e597f65f6b4cd0afa3213234639.tar.xz |
Rename CXFA_Para to CXFA_ParaData
This CL renames CXFA_Para to CXFA_ParaData to show it is part of the
data hierarchy.
Change-Id: I71f58c87416b17d1e59252ca374aad13935fc430
Reviewed-on: https://pdfium-review.googlesource.com/17989
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser')
-rw-r--r-- | xfa/fxfa/parser/cxfa_paradata.cpp (renamed from xfa/fxfa/parser/cxfa_para.cpp) | 20 | ||||
-rw-r--r-- | xfa/fxfa/parser/cxfa_paradata.h (renamed from xfa/fxfa/parser/cxfa_para.h) | 10 | ||||
-rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.cpp | 5 | ||||
-rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.h | 4 |
4 files changed, 20 insertions, 19 deletions
diff --git a/xfa/fxfa/parser/cxfa_para.cpp b/xfa/fxfa/parser/cxfa_paradata.cpp index 34555a9732..44d5c941fd 100644 --- a/xfa/fxfa/parser/cxfa_para.cpp +++ b/xfa/fxfa/parser/cxfa_paradata.cpp @@ -4,56 +4,56 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxfa/parser/cxfa_para.h" +#include "xfa/fxfa/parser/cxfa_paradata.h" #include "xfa/fxfa/parser/cxfa_measurement.h" #include "xfa/fxfa/parser/cxfa_node.h" -CXFA_Para::CXFA_Para(CXFA_Node* pNode) : CXFA_Data(pNode) {} +CXFA_ParaData::CXFA_ParaData(CXFA_Node* pNode) : CXFA_Data(pNode) {} -int32_t CXFA_Para::GetHorizontalAlign() { +int32_t CXFA_ParaData::GetHorizontalAlign() { XFA_ATTRIBUTEENUM eAttr = XFA_ATTRIBUTEENUM_Left; m_pNode->JSNode()->TryEnum(XFA_ATTRIBUTE_HAlign, eAttr, true); return eAttr; } -int32_t CXFA_Para::GetVerticalAlign() { +int32_t CXFA_ParaData::GetVerticalAlign() { XFA_ATTRIBUTEENUM eAttr = XFA_ATTRIBUTEENUM_Top; m_pNode->JSNode()->TryEnum(XFA_ATTRIBUTE_VAlign, eAttr, true); return eAttr; } -float CXFA_Para::GetLineHeight() { +float CXFA_ParaData::GetLineHeight() { CXFA_Measurement ms; m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_LineHeight, ms, true); return ms.ToUnit(XFA_UNIT_Pt); } -float CXFA_Para::GetMarginLeft() { +float CXFA_ParaData::GetMarginLeft() { CXFA_Measurement ms; m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_MarginLeft, ms, true); return ms.ToUnit(XFA_UNIT_Pt); } -float CXFA_Para::GetMarginRight() { +float CXFA_ParaData::GetMarginRight() { CXFA_Measurement ms; m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_MarginRight, ms, true); return ms.ToUnit(XFA_UNIT_Pt); } -float CXFA_Para::GetSpaceAbove() { +float CXFA_ParaData::GetSpaceAbove() { CXFA_Measurement ms; m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_SpaceAbove, ms, true); return ms.ToUnit(XFA_UNIT_Pt); } -float CXFA_Para::GetSpaceBelow() { +float CXFA_ParaData::GetSpaceBelow() { CXFA_Measurement ms; m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_SpaceBelow, ms, true); return ms.ToUnit(XFA_UNIT_Pt); } -float CXFA_Para::GetTextIndent() { +float CXFA_ParaData::GetTextIndent() { CXFA_Measurement ms; m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_TextIndent, ms, true); return ms.ToUnit(XFA_UNIT_Pt); diff --git a/xfa/fxfa/parser/cxfa_para.h b/xfa/fxfa/parser/cxfa_paradata.h index c2d67b8a19..3e0afb36e5 100644 --- a/xfa/fxfa/parser/cxfa_para.h +++ b/xfa/fxfa/parser/cxfa_paradata.h @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_PARSER_CXFA_PARA_H_ -#define XFA_FXFA_PARSER_CXFA_PARA_H_ +#ifndef XFA_FXFA_PARSER_CXFA_PARADATA_H_ +#define XFA_FXFA_PARSER_CXFA_PARADATA_H_ #include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; -class CXFA_Para : public CXFA_Data { +class CXFA_ParaData : public CXFA_Data { public: - explicit CXFA_Para(CXFA_Node* pNode); + explicit CXFA_ParaData(CXFA_Node* pNode); int32_t GetHorizontalAlign(); int32_t GetVerticalAlign(); @@ -26,4 +26,4 @@ class CXFA_Para : public CXFA_Data { float GetTextIndent(); }; -#endif // XFA_FXFA_PARSER_CXFA_PARA_H_ +#endif // XFA_FXFA_PARSER_CXFA_PARADATA_H_ diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 5edbc7fad4..841fbd065a 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -299,8 +299,9 @@ CXFA_MarginData CXFA_WidgetData::GetMarginData() { m_pNode->JSNode()->GetProperty(0, XFA_Element::Margin, false)); } -CXFA_Para CXFA_WidgetData::GetPara() { - return CXFA_Para(m_pNode->JSNode()->GetProperty(0, XFA_Element::Para, false)); +CXFA_ParaData CXFA_WidgetData::GetParaData() { + return CXFA_ParaData( + m_pNode->JSNode()->GetProperty(0, XFA_Element::Para, false)); } std::vector<CXFA_Node*> CXFA_WidgetData::GetEventList() { diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h index 3df30dc5f1..d076b9b01e 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.h +++ b/xfa/fxfa/parser/cxfa_widgetdata.h @@ -20,7 +20,7 @@ #include "xfa/fxfa/parser/cxfa_data.h" #include "xfa/fxfa/parser/cxfa_fontdata.h" #include "xfa/fxfa/parser/cxfa_margindata.h" -#include "xfa/fxfa/parser/cxfa_para.h" +#include "xfa/fxfa/parser/cxfa_paradata.h" #include "xfa/fxfa/parser/cxfa_validate.h" enum XFA_CHECKSTATE { @@ -54,7 +54,7 @@ class CXFA_WidgetData : public CXFA_Data { CXFA_CaptionData GetCaptionData(); CXFA_FontData GetFontData(bool bModified); CXFA_MarginData GetMarginData(); - CXFA_Para GetPara(); + CXFA_ParaData GetParaData(); std::vector<CXFA_Node*> GetEventList(); std::vector<CXFA_Node*> GetEventByActivity(int32_t iActivity, bool bIsFormReady); |