diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-06-21 15:02:24 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-21 15:02:24 +0000 |
commit | 9c292fef316739f43730f11b9a2b6d3e4b725b54 (patch) | |
tree | e286b6c7a36c50eba235c7b69b30b95fc36cb906 /core/fpdfdoc | |
parent | bcd66f54de1291ddf8b7b7caca3e7360e14fcc8d (diff) | |
download | pdfium-9c292fef316739f43730f11b9a2b6d3e4b725b54.tar.xz |
Avoid const-refs to implicitly constructed strings.
Because the invisible temporary goes out of scope at the next
semicolon.
Also avoid returning const string references since the cost is
low to properly keep the string alive.
Change-Id: Id283e4fd99f79a02d79d739a533a4ce05e831e2a
Reviewed-on: https://pdfium-review.googlesource.com/35710
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfdoc')
-rw-r--r-- | core/fpdfdoc/cpdf_filespec.cpp | 4 | ||||
-rw-r--r-- | core/fpdfdoc/cpdf_interform.cpp | 4 | ||||
-rw-r--r-- | core/fpdfdoc/cpdf_structelement.h | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/core/fpdfdoc/cpdf_filespec.cpp b/core/fpdfdoc/cpdf_filespec.cpp index 88abea30d5..95254b7bb8 100644 --- a/core/fpdfdoc/cpdf_filespec.cpp +++ b/core/fpdfdoc/cpdf_filespec.cpp @@ -138,7 +138,7 @@ const CPDF_Stream* CPDF_FileSpec::GetFileStream() const { size_t end = pDict->GetStringFor("FS") == "URL" ? 2 : FX_ArraySize(kKeys); for (size_t i = 0; i < end; ++i) { - const ByteString& key = kKeys[i]; + ByteString key = kKeys[i]; if (!pDict->GetUnicodeTextFor(key).IsEmpty()) { const CPDF_Stream* pStream = pFiles->GetStreamFor(key); if (pStream) @@ -160,7 +160,7 @@ CPDF_Stream* CPDF_FileSpec::GetFileStream() { size_t end = pDict->GetStringFor("FS") == "URL" ? 2 : FX_ArraySize(kKeys); for (size_t i = 0; i < end; ++i) { - const ByteString& key = kKeys[i]; + ByteString key = kKeys[i]; if (!pDict->GetUnicodeTextFor(key).IsEmpty()) { CPDF_Stream* pStream = pFiles->GetStreamFor(key); if (pStream) diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp index b18310cfde..d7cee35704 100644 --- a/core/fpdfdoc/cpdf_interform.cpp +++ b/core/fpdfdoc/cpdf_interform.cpp @@ -379,9 +379,7 @@ class CFieldTree { } CPDF_FormField* GetField() const { return m_pField.get(); } - - const WideString& GetShortName() const { return m_ShortName; } - + WideString GetShortName() const { return m_ShortName; } int GetLevel() const { return m_level; } private: diff --git a/core/fpdfdoc/cpdf_structelement.h b/core/fpdfdoc/cpdf_structelement.h index 4e590cb879..79e8dd92c8 100644 --- a/core/fpdfdoc/cpdf_structelement.h +++ b/core/fpdfdoc/cpdf_structelement.h @@ -39,8 +39,8 @@ class CPDF_StructElement : public Retainable { template <typename T, typename... Args> friend RetainPtr<T> pdfium::MakeRetain(Args&&... args); - const ByteString& GetType() const { return m_Type; } - const ByteString& GetTitle() const { return m_Title; } + ByteString GetType() const { return m_Type; } + ByteString GetTitle() const { return m_Title; } const CPDF_Dictionary* GetDict() const { return m_pDict.Get(); } size_t CountKids() const; |