From 774bdde253b8394aa2ac791e273508ff006d813a Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 14 Apr 2016 09:49:44 -0700 Subject: Replace calls to deprecated CFX_{Wide,Byte}String::Empty() Use the more standard name "clear()" instead. Review URL: https://codereview.chromium.org/1888103002 --- xfa/fxfa/app/xfa_checksum.cpp | 2 +- xfa/fxfa/app/xfa_fwltheme.cpp | 2 +- xfa/fxfa/app/xfa_textlayout.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'xfa/fxfa/app') diff --git a/xfa/fxfa/app/xfa_checksum.cpp b/xfa/fxfa/app/xfa_checksum.cpp index 69cb8350a3..56b0c88d63 100644 --- a/xfa/fxfa/app/xfa_checksum.cpp +++ b/xfa/fxfa/app/xfa_checksum.cpp @@ -134,7 +134,7 @@ FX_BOOL CXFA_ChecksumContext::StartChecksum() { FinishChecksum(); m_pByteContext = FX_Alloc(uint8_t, 128); CRYPT_SHA1Start(m_pByteContext); - m_bsChecksum.Empty(); + m_bsChecksum.clear(); m_pSAXReader = FX_SAXReader_Create(); return m_pSAXReader != NULL; } diff --git a/xfa/fxfa/app/xfa_fwltheme.cpp b/xfa/fxfa/app/xfa_fwltheme.cpp index 42d0835460..2d1f8ace6e 100644 --- a/xfa/fxfa/app/xfa_fwltheme.cpp +++ b/xfa/fxfa/app/xfa_fwltheme.cpp @@ -268,7 +268,7 @@ void* CXFA_FWLTheme::GetCapacity(CFWL_ThemePart* pThemePart, if (CXFA_FFWidget* pWidget = XFA_ThemeGetOuterWidget(pThemePart->m_pWidget)) { IXFA_AppProvider* pAppProvider = pWidget->GetAppProvider(); - m_wsResource.Empty(); + m_wsResource.clear(); pAppProvider->LoadString( XFA_IDS_StringWeekDay_Sun + dwCapacity - FWL_WGTCAPACITY_MAX - 5, m_wsResource); diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp index ce1ce7021e..80342a383e 100644 --- a/xfa/fxfa/app/xfa_textlayout.cpp +++ b/xfa/fxfa/app/xfa_textlayout.cpp @@ -517,7 +517,7 @@ FX_FLOAT CXFA_TextParser::GetLineHeight(CXFA_TextProvider* pTextProvider, FX_BOOL CXFA_TextParser::GetEmbbedObj(CXFA_TextProvider* pTextProvider, CFDE_XMLNode* pXMLNode, CFX_WideString& wsValue) { - wsValue.Empty(); + wsValue.clear(); if (pXMLNode == NULL) { return FALSE; } @@ -543,7 +543,7 @@ FX_BOOL CXFA_TextParser::GetEmbbedObj(CXFA_TextProvider* pTextProvider, if (!bURI && ws != FX_WSTRC(L"som")) { return FALSE; } - ws.Empty(); + ws.clear(); pElement->GetString(FX_WSTRC(L"xfa:embedMode").c_str(), ws); if (ws.IsEmpty()) { ws = L"formatted"; @@ -645,7 +645,7 @@ FX_BOOL CXFA_TextParser::GetTabstops( CXFA_Measurement ms(CFX_WideStringC(pTabStops + iLast, iCur - iLast)); FX_FLOAT fPos = ms.ToUnit(XFA_UNIT_Pt); pTabstopContext->Append(dwHashCode, fPos); - wsAlign.Empty(); + wsAlign.clear(); eStatus = XFA_TABSTOPSSTATUS_None; } iCur++; @@ -888,7 +888,7 @@ void CXFA_TextLayout::InitBreak(IFDE_CSSComputedStyle* pStyle, } int32_t CXFA_TextLayout::GetText(CFX_WideString& wsText) { GetTextDataNode(); - wsText.Empty(); + wsText.clear(); if (m_bRichText) { } else { wsText = m_pTextDataNode->GetContent(); -- cgit v1.2.3