From 3f1c832dda209cf6682bb75316c07d71332fe6c3 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 16 Nov 2017 21:45:18 +0000 Subject: Make WideString::{Format|FormatV} static This CL moves the Format and FormatV methods from WideString to be static. Bug: pdfium:934 Change-Id: I9941d6a2a5bbf0a82087cd0ea5d0f8fc42eecd3e Reviewed-on: https://pdfium-review.googlesource.com/18630 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_measurement.cpp | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_measurement.cpp') diff --git a/xfa/fxfa/parser/cxfa_measurement.cpp b/xfa/fxfa/parser/cxfa_measurement.cpp index 91e39af969..288ed0cd31 100644 --- a/xfa/fxfa/parser/cxfa_measurement.cpp +++ b/xfa/fxfa/parser/cxfa_measurement.cpp @@ -46,37 +46,27 @@ void CXFA_Measurement::SetString(const WideStringView& wsMeasure) { } WideString CXFA_Measurement::ToString() const { - WideString wsMeasure; switch (GetUnit()) { case XFA_Unit::Mm: - wsMeasure.Format(L"%.8gmm", GetValue()); - break; + return WideString::Format(L"%.8gmm", GetValue()); case XFA_Unit::Pt: - wsMeasure.Format(L"%.8gpt", GetValue()); - break; + return WideString::Format(L"%.8gpt", GetValue()); case XFA_Unit::In: - wsMeasure.Format(L"%.8gin", GetValue()); - break; + return WideString::Format(L"%.8gin", GetValue()); case XFA_Unit::Cm: - wsMeasure.Format(L"%.8gcm", GetValue()); - break; + return WideString::Format(L"%.8gcm", GetValue()); case XFA_Unit::Mp: - wsMeasure.Format(L"%.8gmp", GetValue()); - break; + return WideString::Format(L"%.8gmp", GetValue()); case XFA_Unit::Pc: - wsMeasure.Format(L"%.8gpc", GetValue()); - break; + return WideString::Format(L"%.8gpc", GetValue()); case XFA_Unit::Em: - wsMeasure.Format(L"%.8gem", GetValue()); - break; + return WideString::Format(L"%.8gem", GetValue()); case XFA_Unit::Percent: - wsMeasure.Format(L"%.8g%%", GetValue()); - break; + return WideString::Format(L"%.8g%%", GetValue()); default: - wsMeasure.Format(L"%.8g", GetValue()); break; } - return wsMeasure; + return WideString::Format(L"%.8g", GetValue()); } float CXFA_Measurement::ToUnit(XFA_Unit eUnit) const { -- cgit v1.2.3