commit 8eeee77cbe0a2eb5729697767a3c503fc5570005
author Ryan Harrison <rharrison@chromium.org> Fri Jan 05 13:39:22 2018 -0500
committer Chromium commit bot <commit-bot@chromium.org> Fri Jan 05 18:49:58 2018 +0000
tree a54c03ab0c620567f840b3c92c8759c3c41f36d5
parent 2c0ca7ddbc38e33cc692b2be02c32419b97927e0

Convert CPDF_PageLabel::GetLabel to return Optional<WideString>

Change-Id: I53b91aa89c0fd1e7ab766f6d3c27a0fc7573c360
Reviewed-on: https://pdfium-review.googlesource.com/22290
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>

fpdfsdk/fpdfdoc.cpp

diff --git a/fpdfsdk/fpdfdoc.cpp b/fpdfsdk/fpdfdoc.cpp
index 51a1c61..14e4361 100644
--- a/fpdfsdk/fpdfdoc.cpp
+++ b/fpdfsdk/fpdfdoc.cpp
@@ -424,8 +424,8 @@
 
   // CPDF_PageLabel can deal with NULL |document|.
   CPDF_PageLabel label(CPDFDocumentFromFPDFDocument(document));
-  WideString str;
-  if (!label.GetLabel(page_index, &str))
-    return 0;
-  return Utf16EncodeMaybeCopyAndReturnLength(str, buffer, buflen);
+  Optional<WideString> str = label.GetLabel(page_index);
+  return str.has_value()
+             ? Utf16EncodeMaybeCopyAndReturnLength(str.value(), buffer, buflen)
+             : 0;
 }