summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa/parser')
-rw-r--r--xfa/fxfa/parser/cxfa_captiondata.cpp (renamed from xfa/fxfa/parser/cxfa_caption.cpp)16
-rw-r--r--xfa/fxfa/parser/cxfa_captiondata.h (renamed from xfa/fxfa/parser/cxfa_caption.h)10
-rw-r--r--xfa/fxfa/parser/cxfa_widgetdata.cpp4
-rw-r--r--xfa/fxfa/parser/cxfa_widgetdata.h4
4 files changed, 17 insertions, 17 deletions
diff --git a/xfa/fxfa/parser/cxfa_caption.cpp b/xfa/fxfa/parser/cxfa_captiondata.cpp
index 3f820e437e..db18f9a159 100644
--- a/xfa/fxfa/parser/cxfa_caption.cpp
+++ b/xfa/fxfa/parser/cxfa_captiondata.cpp
@@ -4,42 +4,42 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fxfa/parser/cxfa_caption.h"
+#include "xfa/fxfa/parser/cxfa_captiondata.h"
#include "xfa/fxfa/parser/cxfa_measurement.h"
#include "xfa/fxfa/parser/cxfa_node.h"
-CXFA_Caption::CXFA_Caption(CXFA_Node* pNode) : CXFA_Data(pNode) {}
+CXFA_CaptionData::CXFA_CaptionData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
-int32_t CXFA_Caption::GetPresence() {
+int32_t CXFA_CaptionData::GetPresence() {
XFA_ATTRIBUTEENUM eAttr = XFA_ATTRIBUTEENUM_Visible;
m_pNode->JSNode()->TryEnum(XFA_ATTRIBUTE_Presence, eAttr, true);
return eAttr;
}
-int32_t CXFA_Caption::GetPlacementType() {
+int32_t CXFA_CaptionData::GetPlacementType() {
XFA_ATTRIBUTEENUM eAttr = XFA_ATTRIBUTEENUM_Left;
m_pNode->JSNode()->TryEnum(XFA_ATTRIBUTE_Placement, eAttr, true);
return eAttr;
}
-float CXFA_Caption::GetReserve() {
+float CXFA_CaptionData::GetReserve() {
CXFA_Measurement ms;
m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_Reserve, ms, true);
return ms.ToUnit(XFA_UNIT_Pt);
}
-CXFA_Margin CXFA_Caption::GetMargin() {
+CXFA_Margin CXFA_CaptionData::GetMargin() {
return CXFA_Margin(m_pNode ? m_pNode->GetChild(0, XFA_Element::Margin, false)
: nullptr);
}
-CXFA_Font CXFA_Caption::GetFont() {
+CXFA_Font CXFA_CaptionData::GetFont() {
return CXFA_Font(m_pNode ? m_pNode->GetChild(0, XFA_Element::Font, false)
: nullptr);
}
-CXFA_Value CXFA_Caption::GetValue() {
+CXFA_Value CXFA_CaptionData::GetValue() {
return CXFA_Value(m_pNode ? m_pNode->GetChild(0, XFA_Element::Value, false)
: nullptr);
}
diff --git a/xfa/fxfa/parser/cxfa_caption.h b/xfa/fxfa/parser/cxfa_captiondata.h
index 74650ef9a2..605a837a1b 100644
--- a/xfa/fxfa/parser/cxfa_caption.h
+++ b/xfa/fxfa/parser/cxfa_captiondata.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXFA_PARSER_CXFA_CAPTION_H_
-#define XFA_FXFA_PARSER_CXFA_CAPTION_H_
+#ifndef XFA_FXFA_PARSER_CXFA_CAPTIONDATA_H_
+#define XFA_FXFA_PARSER_CXFA_CAPTIONDATA_H_
#include "xfa/fxfa/parser/cxfa_data.h"
#include "xfa/fxfa/parser/cxfa_font.h"
@@ -14,9 +14,9 @@
class CXFA_Node;
-class CXFA_Caption : public CXFA_Data {
+class CXFA_CaptionData : public CXFA_Data {
public:
- explicit CXFA_Caption(CXFA_Node* pNode);
+ explicit CXFA_CaptionData(CXFA_Node* pNode);
int32_t GetPresence();
int32_t GetPlacementType();
@@ -26,4 +26,4 @@ class CXFA_Caption : public CXFA_Data {
CXFA_Value GetValue();
};
-#endif // XFA_FXFA_PARSER_CXFA_CAPTION_H_
+#endif // XFA_FXFA_PARSER_CXFA_CAPTIONDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index d8d5cfcc1d..ccce8cf501 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -284,8 +284,8 @@ CXFA_BorderData CXFA_WidgetData::GetBorderData(bool bModified) {
m_pNode->JSNode()->GetProperty(0, XFA_Element::Border, bModified));
}
-CXFA_Caption CXFA_WidgetData::GetCaption() {
- return CXFA_Caption(
+CXFA_CaptionData CXFA_WidgetData::GetCaptionData() {
+ return CXFA_CaptionData(
m_pNode->JSNode()->GetProperty(0, XFA_Element::Caption, false));
}
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h
index 4689878e9f..92fc4484b2 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.h
+++ b/xfa/fxfa/parser/cxfa_widgetdata.h
@@ -16,7 +16,7 @@
#include "xfa/fxfa/parser/cxfa_binddata.h"
#include "xfa/fxfa/parser/cxfa_borderdata.h"
#include "xfa/fxfa/parser/cxfa_calculatedata.h"
-#include "xfa/fxfa/parser/cxfa_caption.h"
+#include "xfa/fxfa/parser/cxfa_captiondata.h"
#include "xfa/fxfa/parser/cxfa_data.h"
#include "xfa/fxfa/parser/cxfa_font.h"
#include "xfa/fxfa/parser/cxfa_margin.h"
@@ -51,7 +51,7 @@ class CXFA_WidgetData : public CXFA_Data {
CXFA_AssistData GetAssistData();
CXFA_BorderData GetBorderData(bool bModified);
- CXFA_Caption GetCaption();
+ CXFA_CaptionData GetCaptionData();
CXFA_Font GetFont(bool bModified);
CXFA_Margin GetMargin();
CXFA_Para GetPara();