diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-05 08:46:13 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-05 08:46:13 -0800 |
| commit | 5570d23890cc7bae4903a29fbcf8ac543ba1a2c7 (patch) | |
| tree | 9077948b2f9c187ecc3df125e79a1610db5ce1b7 /xfa/src/fxfa/src/app/xfa_textlayout.cpp | |
| parent | cd39695e618374ae0cfb4d3467602fd9a5365c55 (diff) | |
| download | pdfium-5570d23890cc7bae4903a29fbcf8ac543ba1a2c7.tar.xz | |
Fix XFA compilation warnings, part 2
Mostly unused variables, unused private members, or
initialization order. Added a few missing initializers
for pointer members along the way.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1414903004 .
Diffstat (limited to 'xfa/src/fxfa/src/app/xfa_textlayout.cpp')
| -rw-r--r-- | xfa/src/fxfa/src/app/xfa_textlayout.cpp | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index 06f6b4cff9..ffc471d506 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -671,28 +671,23 @@ FX_BOOL CXFA_TextParser::GetTabstops( return TRUE;
}
CXFA_TextLayout::CXFA_TextLayout(IXFA_TextProvider* pTextProvider)
- : m_pTextProvider(pTextProvider),
- m_pTextDataNode(NULL),
- m_pAllocator(NULL),
- m_pBreak(NULL),
- m_dwTextData(0),
- m_pLoader(NULL),
+ : m_bHasBlock(FALSE),
+ m_pTextProvider(pTextProvider),
+ m_pTextDataNode(nullptr),
+ m_bRichText(FALSE),
+ m_pAllocator(nullptr),
+ m_pBreak(nullptr),
+ m_pLoader(nullptr),
m_iLines(0),
m_fMaxWidth(0),
- m_pTabstopContext(NULL),
- m_bBlockContinue(TRUE),
- m_bRichText(FALSE),
- m_bHasBlock(FALSE) {
- FXSYS_assert(m_pTextProvider != NULL);
+ m_pTabstopContext(nullptr),
+ m_bBlockContinue(TRUE) {
+ FXSYS_assert(m_pTextProvider);
}
CXFA_TextLayout::~CXFA_TextLayout() {
m_textParser.Reset();
- if (m_pLoader != NULL) {
- delete m_pLoader;
- }
- if (m_pTabstopContext != NULL) {
- delete m_pTabstopContext;
- }
+ delete m_pLoader;
+ delete m_pTabstopContext;
Unload();
}
void CXFA_TextLayout::Unload() {
@@ -1571,9 +1566,9 @@ FX_BOOL CXFA_TextLayout::LoadRichText(IFDE_XMLNode* pXMLNode, }
}
if (wsName == FX_WSTRC(L"a")) {
- if (pLinkData != NULL) {
+ if (pLinkData) {
pLinkData->Release();
- pLinkData = NULL;
+ pLinkData = nullptr;
}
}
if (IsEnd(bSavePieces)) {
|