summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa')
-rw-r--r--xfa/fxfa/cxfa_ffwidget.cpp6
-rw-r--r--xfa/fxfa/parser/cxfa_assistdata.cpp4
-rw-r--r--xfa/fxfa/parser/cxfa_assistdata.h4
-rw-r--r--xfa/fxfa/parser/cxfa_tooltipdata.cpp (renamed from xfa/fxfa/parser/cxfa_tooltip.cpp)6
-rw-r--r--xfa/fxfa/parser/cxfa_tooltipdata.h (renamed from xfa/fxfa/parser/cxfa_tooltip.h)10
5 files changed, 15 insertions, 15 deletions
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index baa9aaf592..708c666c3d 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -974,9 +974,9 @@ CXFA_WidgetAcc* CXFA_FFWidget::GetDataAcc() {
bool CXFA_FFWidget::GetToolTip(WideString& wsToolTip) {
CXFA_AssistData assist = m_pDataAcc->GetAssistData();
if (assist) {
- CXFA_ToolTip toolTip = assist.GetToolTip();
- if (toolTip)
- return toolTip.GetTip(wsToolTip);
+ CXFA_ToolTipData toolTipData = assist.GetToolTipData();
+ if (toolTipData)
+ return toolTipData.GetTip(wsToolTip);
}
return GetCaptionText(wsToolTip);
}
diff --git a/xfa/fxfa/parser/cxfa_assistdata.cpp b/xfa/fxfa/parser/cxfa_assistdata.cpp
index e480d0ba68..051661f0c7 100644
--- a/xfa/fxfa/parser/cxfa_assistdata.cpp
+++ b/xfa/fxfa/parser/cxfa_assistdata.cpp
@@ -10,6 +10,6 @@
CXFA_AssistData::CXFA_AssistData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
-CXFA_ToolTip CXFA_AssistData::GetToolTip() {
- return CXFA_ToolTip(m_pNode->GetChild(0, XFA_Element::ToolTip, false));
+CXFA_ToolTipData CXFA_AssistData::GetToolTipData() {
+ return CXFA_ToolTipData(m_pNode->GetChild(0, XFA_Element::ToolTip, false));
}
diff --git a/xfa/fxfa/parser/cxfa_assistdata.h b/xfa/fxfa/parser/cxfa_assistdata.h
index f77ffc4245..8b37473483 100644
--- a/xfa/fxfa/parser/cxfa_assistdata.h
+++ b/xfa/fxfa/parser/cxfa_assistdata.h
@@ -8,7 +8,7 @@
#define XFA_FXFA_PARSER_CXFA_ASSISTDATA_H_
#include "xfa/fxfa/parser/cxfa_data.h"
-#include "xfa/fxfa/parser/cxfa_tooltip.h"
+#include "xfa/fxfa/parser/cxfa_tooltipdata.h"
class CXFA_Node;
@@ -16,7 +16,7 @@ class CXFA_AssistData : public CXFA_Data {
public:
explicit CXFA_AssistData(CXFA_Node* pNode);
- CXFA_ToolTip GetToolTip();
+ CXFA_ToolTipData GetToolTipData();
};
#endif // XFA_FXFA_PARSER_CXFA_ASSISTDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_tooltip.cpp b/xfa/fxfa/parser/cxfa_tooltipdata.cpp
index 7e56c669d5..6e2ceb5abc 100644
--- a/xfa/fxfa/parser/cxfa_tooltip.cpp
+++ b/xfa/fxfa/parser/cxfa_tooltipdata.cpp
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fxfa/parser/cxfa_tooltip.h"
+#include "xfa/fxfa/parser/cxfa_tooltipdata.h"
#include "xfa/fxfa/parser/cxfa_node.h"
-CXFA_ToolTip::CXFA_ToolTip(CXFA_Node* pNode) : CXFA_Data(pNode) {}
+CXFA_ToolTipData::CXFA_ToolTipData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
-bool CXFA_ToolTip::GetTip(WideString& wsTip) {
+bool CXFA_ToolTipData::GetTip(WideString& wsTip) {
return m_pNode->JSNode()->TryContent(wsTip, false, true);
}
diff --git a/xfa/fxfa/parser/cxfa_tooltip.h b/xfa/fxfa/parser/cxfa_tooltipdata.h
index cc4bc31841..447bf8154f 100644
--- a/xfa/fxfa/parser/cxfa_tooltip.h
+++ b/xfa/fxfa/parser/cxfa_tooltipdata.h
@@ -4,19 +4,19 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXFA_PARSER_CXFA_TOOLTIP_H_
-#define XFA_FXFA_PARSER_CXFA_TOOLTIP_H_
+#ifndef XFA_FXFA_PARSER_CXFA_TOOLTIPDATA_H_
+#define XFA_FXFA_PARSER_CXFA_TOOLTIPDATA_H_
#include "core/fxcrt/fx_string.h"
#include "xfa/fxfa/parser/cxfa_data.h"
class CXFA_Node;
-class CXFA_ToolTip : public CXFA_Data {
+class CXFA_ToolTipData : public CXFA_Data {
public:
- explicit CXFA_ToolTip(CXFA_Node* pNode);
+ explicit CXFA_ToolTipData(CXFA_Node* pNode);
bool GetTip(WideString& wsTip);
};
-#endif // XFA_FXFA_PARSER_CXFA_TOOLTIP_H_
+#endif // XFA_FXFA_PARSER_CXFA_TOOLTIPDATA_H_