summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa')
-rw-r--r--xfa/fxfa/parser/cxfa_caption.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_data.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_font.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_layoutpagemgr.cpp20
-rw-r--r--xfa/fxfa/parser/cxfa_para.cpp12
-rw-r--r--xfa/fxfa/parser/cxfa_stroke.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_widgetdata.cpp4
7 files changed, 22 insertions, 22 deletions
diff --git a/xfa/fxfa/parser/cxfa_caption.cpp b/xfa/fxfa/parser/cxfa_caption.cpp
index 5348a45be4..ccfe606b33 100644
--- a/xfa/fxfa/parser/cxfa_caption.cpp
+++ b/xfa/fxfa/parser/cxfa_caption.cpp
@@ -25,7 +25,7 @@ int32_t CXFA_Caption::GetPlacementType() {
float CXFA_Caption::GetReserve() {
CXFA_Measurement ms;
- m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_Reserve, ms);
+ m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_Reserve, ms, true);
return ms.ToUnit(XFA_UNIT_Pt);
}
diff --git a/xfa/fxfa/parser/cxfa_data.cpp b/xfa/fxfa/parser/cxfa_data.cpp
index 37817c3ce2..c54f9b1e68 100644
--- a/xfa/fxfa/parser/cxfa_data.cpp
+++ b/xfa/fxfa/parser/cxfa_data.cpp
@@ -78,5 +78,5 @@ bool CXFA_Data::TryMeasure(XFA_ATTRIBUTE eAttr,
bool CXFA_Data::SetMeasure(XFA_ATTRIBUTE eAttr, float fValue) {
CXFA_Measurement ms(fValue, XFA_UNIT_Pt);
- return m_pNode->JSNode()->SetMeasure(eAttr, ms);
+ return m_pNode->JSNode()->SetMeasure(eAttr, ms, false);
}
diff --git a/xfa/fxfa/parser/cxfa_font.cpp b/xfa/fxfa/parser/cxfa_font.cpp
index 209a3c6778..2674ac5682 100644
--- a/xfa/fxfa/parser/cxfa_font.cpp
+++ b/xfa/fxfa/parser/cxfa_font.cpp
@@ -64,7 +64,7 @@ int32_t CXFA_Font::GetUnderlinePeriod() {
float CXFA_Font::GetFontSize() {
CXFA_Measurement ms;
- m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_Size, ms);
+ m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_Size, ms, true);
return ms.ToUnit(XFA_UNIT_Pt);
}
diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
index a483d71840..568b7ebb19 100644
--- a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
+++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
@@ -327,14 +327,14 @@ bool CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) {
pPageArea->InsertChild(pContentArea, nullptr);
pContentArea->SetFlag(XFA_NodeFlag_Initialized, true);
- pContentArea->JSNode()->SetMeasure(XFA_ATTRIBUTE_X,
- CXFA_Measurement(0.25f, XFA_UNIT_In));
- pContentArea->JSNode()->SetMeasure(XFA_ATTRIBUTE_Y,
- CXFA_Measurement(0.25f, XFA_UNIT_In));
- pContentArea->JSNode()->SetMeasure(XFA_ATTRIBUTE_W,
- CXFA_Measurement(8.0f, XFA_UNIT_In));
- pContentArea->JSNode()->SetMeasure(XFA_ATTRIBUTE_H,
- CXFA_Measurement(10.5f, XFA_UNIT_In));
+ pContentArea->JSNode()->SetMeasure(
+ XFA_ATTRIBUTE_X, CXFA_Measurement(0.25f, XFA_UNIT_In), false);
+ pContentArea->JSNode()->SetMeasure(
+ XFA_ATTRIBUTE_Y, CXFA_Measurement(0.25f, XFA_UNIT_In), false);
+ pContentArea->JSNode()->SetMeasure(
+ XFA_ATTRIBUTE_W, CXFA_Measurement(8.0f, XFA_UNIT_In), false);
+ pContentArea->JSNode()->SetMeasure(
+ XFA_ATTRIBUTE_H, CXFA_Measurement(10.5f, XFA_UNIT_In), false);
}
CXFA_Node* pMedium = pPageArea->GetChild(0, XFA_Element::Medium);
if (!pMedium) {
@@ -346,9 +346,9 @@ bool CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) {
pPageArea->InsertChild(pMedium, nullptr);
pMedium->SetFlag(XFA_NodeFlag_Initialized, true);
pMedium->JSNode()->SetMeasure(XFA_ATTRIBUTE_Short,
- CXFA_Measurement(8.5f, XFA_UNIT_In));
+ CXFA_Measurement(8.5f, XFA_UNIT_In), false);
pMedium->JSNode()->SetMeasure(XFA_ATTRIBUTE_Long,
- CXFA_Measurement(11.0f, XFA_UNIT_In));
+ CXFA_Measurement(11.0f, XFA_UNIT_In), false);
}
return true;
}
diff --git a/xfa/fxfa/parser/cxfa_para.cpp b/xfa/fxfa/parser/cxfa_para.cpp
index 1d7fe2d63c..34555a9732 100644
--- a/xfa/fxfa/parser/cxfa_para.cpp
+++ b/xfa/fxfa/parser/cxfa_para.cpp
@@ -25,36 +25,36 @@ int32_t CXFA_Para::GetVerticalAlign() {
float CXFA_Para::GetLineHeight() {
CXFA_Measurement ms;
- m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_LineHeight, ms);
+ m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_LineHeight, ms, true);
return ms.ToUnit(XFA_UNIT_Pt);
}
float CXFA_Para::GetMarginLeft() {
CXFA_Measurement ms;
- m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_MarginLeft, ms);
+ m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_MarginLeft, ms, true);
return ms.ToUnit(XFA_UNIT_Pt);
}
float CXFA_Para::GetMarginRight() {
CXFA_Measurement ms;
- m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_MarginRight, ms);
+ m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_MarginRight, ms, true);
return ms.ToUnit(XFA_UNIT_Pt);
}
float CXFA_Para::GetSpaceAbove() {
CXFA_Measurement ms;
- m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_SpaceAbove, ms);
+ m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_SpaceAbove, ms, true);
return ms.ToUnit(XFA_UNIT_Pt);
}
float CXFA_Para::GetSpaceBelow() {
CXFA_Measurement ms;
- m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_SpaceBelow, ms);
+ m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_SpaceBelow, ms, true);
return ms.ToUnit(XFA_UNIT_Pt);
}
float CXFA_Para::GetTextIndent() {
CXFA_Measurement ms;
- m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_TextIndent, ms);
+ m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_TextIndent, ms, true);
return ms.ToUnit(XFA_UNIT_Pt);
}
diff --git a/xfa/fxfa/parser/cxfa_stroke.cpp b/xfa/fxfa/parser/cxfa_stroke.cpp
index b83fc79119..753527c263 100644
--- a/xfa/fxfa/parser/cxfa_stroke.cpp
+++ b/xfa/fxfa/parser/cxfa_stroke.cpp
@@ -41,7 +41,7 @@ void CXFA_Stroke::SetMSThickness(CXFA_Measurement msThinkness) {
if (!m_pNode)
return;
- m_pNode->JSNode()->SetMeasure(XFA_ATTRIBUTE_Thickness, msThinkness);
+ m_pNode->JSNode()->SetMeasure(XFA_ATTRIBUTE_Thickness, msThinkness, false);
}
FX_ARGB CXFA_Stroke::GetColor() const {
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index eee383ba63..e44c77d061 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -1270,7 +1270,7 @@ bool CXFA_WidgetData::GetBarcodeAttribute_ModuleWidth(int32_t* val) {
CXFA_Node* pUIChild = GetUIChild();
CXFA_Measurement mModuleWidthHeight;
if (pUIChild->JSNode()->TryMeasure(XFA_ATTRIBUTE_ModuleWidth,
- mModuleWidthHeight)) {
+ mModuleWidthHeight, true)) {
*val = static_cast<int32_t>(mModuleWidthHeight.ToUnit(XFA_UNIT_Pt));
return true;
}
@@ -1281,7 +1281,7 @@ bool CXFA_WidgetData::GetBarcodeAttribute_ModuleHeight(int32_t* val) {
CXFA_Node* pUIChild = GetUIChild();
CXFA_Measurement mModuleWidthHeight;
if (pUIChild->JSNode()->TryMeasure(XFA_ATTRIBUTE_ModuleHeight,
- mModuleWidthHeight)) {
+ mModuleWidthHeight, true)) {
*val = static_cast<int32_t>(mModuleWidthHeight.ToUnit(XFA_UNIT_Pt));
return true;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 03:36:40 +0000