summaryrefslogtreecommitdiff
path: root/xfa/fee/fde_txtedtpage.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-04-19 12:03:15 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-19 12:03:15 -0700
commitd403329fa818ffd650221cee366c837f867e3df6 (patch)
treef3bea020aa7d558fc1b0bcb1a0669ea406571ed7 /xfa/fee/fde_txtedtpage.cpp
parentc37b04e80aafc8437d458ced2366f825749ae2d7 (diff)
downloadpdfium-d403329fa818ffd650221cee366c837f867e3df6.tar.xz
Store WideString, not raw pointer, in FX_TXTRUN
Storing raw pointers in structs is a questionable idea, given that we've got string classes to auto-manage lifetimes of the underlying storage. Also, return FX_TXTRUN while we're at it, since we count on RVO removing copies nowadays. BUG=pdfium:480 Review URL: https://codereview.chromium.org/1900743004
Diffstat (limited to 'xfa/fee/fde_txtedtpage.cpp')
-rw-r--r--xfa/fee/fde_txtedtpage.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/xfa/fee/fde_txtedtpage.cpp b/xfa/fee/fde_txtedtpage.cpp
index eaf2627b56..4aadb397da 100644
--- a/xfa/fee/fde_txtedtpage.cpp
+++ b/xfa/fee/fde_txtedtpage.cpp
@@ -81,8 +81,6 @@ int32_t CFDE_TxtEdtTextSet::GetDisplayPos(FDE_HVISUALOBJ hText,
FX_TXTRUN tr;
tr.pAccess = m_pPage;
tr.pIdentity = (void*)hText;
- tr.pStr = NULL;
- tr.pWidths = NULL;
tr.iLength = nLength;
tr.pFont = pTextParams->pFont;
tr.fFontSize = pTextParams->fFontSize;
@@ -114,8 +112,6 @@ int32_t CFDE_TxtEdtTextSet::GetCharRects_Impl(FDE_HVISUALOBJ hText,
FX_TXTRUN tr;
tr.pAccess = m_pPage;
tr.pIdentity = (void*)hText;
- tr.pStr = NULL;
- tr.pWidths = NULL;
tr.iLength = nLength;
tr.pFont = pTextParams->pFont;
tr.fFontSize = pTextParams->fFontSize;