Deduplicate one line in CJX_Object::GetMeasureInUnit().
-- use pdfium::nullopt for clarity in one place.
Change-Id: Icf2e383ad958538553407bf5ea764e097580c3a5
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/74690
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp
index 2262078..9f49d3f 100644
--- a/fxjs/xfa/cjx_object.cpp
+++ b/fxjs/xfa/cjx_object.cpp
@@ -435,7 +435,7 @@
Optional<CXFA_Measurement> measure = TryMeasure(attr, false);
if (measure)
return measure->ToUnit(XFA_Unit::Pt);
- return {};
+ return pdfium::nullopt;
}
CXFA_Measurement CJX_Object::GetMeasure(XFA_Attribute eAttr) const {
@@ -443,8 +443,7 @@
}
float CJX_Object::GetMeasureInUnit(XFA_Attribute eAttr, XFA_Unit unit) const {
- auto measure = TryMeasure(eAttr, true).value_or(CXFA_Measurement());
- return measure.ToUnit(unit);
+ return GetMeasure(eAttr).ToUnit(unit);
}
WideString CJX_Object::GetCData(XFA_Attribute eAttr) const {
