Cleanup CJX_Node::GetAttribute

This CL renames GetAttribute to TryAttribute and changes to return a
pdfium::Optional instead of a boolean with an out parameter.
GetAttribute is then added to call TryAttribute to mirror the other
methods in the file.
Change-Id: I875dac120776af7c53fe069e4dd36e5486838447
Reviewed-on: https://pdfium-review.googlesource.com/18514
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

1 files changed, 21 insertions, 19 deletions

diff --git a/xfa/fxfa/parser/cxfa_measurement.cpp b/xfa/fxfa/parser/cxfa_measurement.cpp
index 053f9d1c47..91e39af969 100644
--- a/xfa/fxfa/parser/cxfa_measurement.cpp
+++ b/xfa/fxfa/parser/cxfa_measurement.cpp
@@ -45,36 +45,38 @@ void CXFA_Measurement::SetString(const WideStringView& wsMeasure) {
   Set(fValue, eUnit);
 }
 
-bool CXFA_Measurement::ToString(WideString* wsMeasure) const {
+WideString CXFA_Measurement::ToString() const {
+  WideString wsMeasure;
   switch (GetUnit()) {
     case XFA_Unit::Mm:
-      wsMeasure->Format(L"%.8gmm", GetValue());
-      return true;
+      wsMeasure.Format(L"%.8gmm", GetValue());
+      break;
     case XFA_Unit::Pt:
-      wsMeasure->Format(L"%.8gpt", GetValue());
-      return true;
+      wsMeasure.Format(L"%.8gpt", GetValue());
+      break;
     case XFA_Unit::In:
-      wsMeasure->Format(L"%.8gin", GetValue());
-      return true;
+      wsMeasure.Format(L"%.8gin", GetValue());
+      break;
     case XFA_Unit::Cm:
-      wsMeasure->Format(L"%.8gcm", GetValue());
-      return true;
+      wsMeasure.Format(L"%.8gcm", GetValue());
+      break;
     case XFA_Unit::Mp:
-      wsMeasure->Format(L"%.8gmp", GetValue());
-      return true;
+      wsMeasure.Format(L"%.8gmp", GetValue());
+      break;
     case XFA_Unit::Pc:
-      wsMeasure->Format(L"%.8gpc", GetValue());
-      return true;
+      wsMeasure.Format(L"%.8gpc", GetValue());
+      break;
     case XFA_Unit::Em:
-      wsMeasure->Format(L"%.8gem", GetValue());
-      return true;
+      wsMeasure.Format(L"%.8gem", GetValue());
+      break;
     case XFA_Unit::Percent:
-      wsMeasure->Format(L"%.8g%%", GetValue());
-      return true;
+      wsMeasure.Format(L"%.8g%%", GetValue());
+      break;
     default:
-      wsMeasure->Format(L"%.8g", GetValue());
-      return false;
+      wsMeasure.Format(L"%.8g", GetValue());
+      break;
   }
+  return wsMeasure;
 }
 
 float CXFA_Measurement::ToUnit(XFA_Unit eUnit) const {