summaryrefslogtreecommitdiff
path: root/xfa/fxfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa')
-rw-r--r--xfa/fxfa/app/xfa_checksum.cpp2
-rw-r--r--xfa/fxfa/app/xfa_fwltheme.cpp2
-rw-r--r--xfa/fxfa/app/xfa_textlayout.cpp8
-rw-r--r--xfa/fxfa/fm2js/xfa_fm2jsapi.cpp2
-rw-r--r--xfa/fxfa/fm2js/xfa_fm2jscontext.cpp2
-rw-r--r--xfa/fxfa/include/fxfa.h24
-rw-r--r--xfa/fxfa/parser/cxfa_widgetdata.cpp10
-rw-r--r--xfa/fxfa/parser/xfa_document_datamerger_imp.cpp2
-rw-r--r--xfa/fxfa/parser/xfa_document_serialize.cpp4
-rw-r--r--xfa/fxfa/parser/xfa_localemgr.cpp2
-rw-r--r--xfa/fxfa/parser/xfa_localevalue.cpp8
-rw-r--r--xfa/fxfa/parser/xfa_object_imp.cpp2
-rw-r--r--xfa/fxfa/parser/xfa_parser_imp.cpp18
-rw-r--r--xfa/fxfa/parser/xfa_script_nodehelper.cpp2
-rw-r--r--xfa/fxfa/parser/xfa_script_resolveprocessor.cpp6
15 files changed, 47 insertions, 47 deletions
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();
diff --git a/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp b/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp
index 38e5f2389f..147869dfb1 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp
@@ -20,7 +20,7 @@ int32_t XFA_FM2JS_Translate(const CFX_WideStringC& wsFormcalc,
CFX_WideString& wsError) {
if (wsFormcalc.IsEmpty()) {
wsJavascript.Clear();
- wsError.Empty();
+ wsError.clear();
return 0;
}
int32_t status = 0;
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index ee7e6223fe..cc148c72ea 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -4127,7 +4127,7 @@ void CXFA_FM2JSContext::EncodeHTML(const CFX_ByteStringC& szHTMLString,
CFX_WideString htmlReserve;
while (i < iLen) {
ch = *(pData + i);
- htmlReserve.Empty();
+ htmlReserve.clear();
if (HTMLCode2STR(ch, htmlReserve)) {
wsResultBuf.AppendChar(L'&');
wsResultBuf << htmlReserve;
diff --git a/xfa/fxfa/include/fxfa.h b/xfa/fxfa/include/fxfa.h
index eb99e59110..1f2b00b4ec 100644
--- a/xfa/fxfa/include/fxfa.h
+++ b/xfa/fxfa/include/fxfa.h
@@ -150,7 +150,7 @@ class IXFA_AppProvider {
virtual void GetAppType(CFX_WideString& wsAppType) = 0;
virtual void SetFoxitAppType(const CFX_WideStringC& wsFoxitAppType) {}
virtual void GetFoxitAppType(CFX_WideString& wsFoxitAppType) {
- wsFoxitAppType.Empty();
+ wsFoxitAppType.clear();
}
/**
@@ -174,7 +174,7 @@ class IXFA_AppProvider {
*/
virtual void GetVersion(CFX_WideString& wsVersion) = 0;
virtual void GetFoxitVersion(CFX_WideString& wsFoxitVersion) {
- wsFoxitVersion.Empty();
+ wsFoxitVersion.clear();
}
/**
@@ -182,7 +182,7 @@ class IXFA_AppProvider {
*/
virtual void GetAppName(CFX_WideString& wsName) = 0;
virtual void GetFoxitAppName(CFX_WideString& wsFoxitName) {
- wsFoxitName.Empty();
+ wsFoxitName.clear();
}
/**
@@ -436,25 +436,25 @@ class CXFA_EventParam {
CXFA_EventParam() {
m_pTarget = NULL;
m_eType = XFA_EVENT_Unknown;
- m_wsResult.Empty();
+ m_wsResult.clear();
Reset();
}
void Reset() {
- m_wsChange.Empty();
+ m_wsChange.clear();
m_iCommitKey = 0;
- m_wsFullText.Empty();
+ m_wsFullText.clear();
m_bKeyDown = FALSE;
m_bModifier = FALSE;
- m_wsNewContentType.Empty();
- m_wsNewText.Empty();
- m_wsPrevContentType.Empty();
- m_wsPrevText.Empty();
+ m_wsNewContentType.clear();
+ m_wsNewText.clear();
+ m_wsPrevContentType.clear();
+ m_wsPrevText.clear();
m_bReenter = FALSE;
m_iSelEnd = 0;
m_iSelStart = 0;
m_bShift = FALSE;
- m_wsSoapFaultCode.Empty();
- m_wsSoapFaultString.Empty();
+ m_wsSoapFaultCode.clear();
+ m_wsSoapFaultString.clear();
m_bIsFormReady = FALSE;
m_iValidateActivities = XFA_VALIDATE_preSubmit;
}
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index 681516d8e8..16380011fe 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -413,7 +413,7 @@ void CXFA_WidgetData::SetCheckState(XFA_CHECKSTATE eCheckState,
if (pItemchild)
wsChildValue = pItemchild->GetContent();
else
- wsChildValue.Empty();
+ wsChildValue.clear();
}
CXFA_WidgetData ch(pChild);
ch.SyncValue(wsChildValue, bNotify);
@@ -504,7 +504,7 @@ void CXFA_WidgetData::SetSelectedMemberByValue(const CFX_WideStringC& wsValue,
if (pItemchild)
wsChildValue = pItemchild->GetContent();
else
- wsChildValue.Empty();
+ wsChildValue.clear();
} else {
wsExclGroup = wsValue;
}
@@ -606,7 +606,7 @@ int32_t CXFA_WidgetData::CountChoiceListItems(FX_BOOL bSaveValue) {
FX_BOOL CXFA_WidgetData::GetChoiceListItem(CFX_WideString& wsText,
int32_t nIndex,
FX_BOOL bSaveValue) {
- wsText.Empty();
+ wsText.clear();
CXFA_NodeArray pItemsArray;
CXFA_Node* pItems = NULL;
int32_t iCount = 0;
@@ -1507,7 +1507,7 @@ FX_BOOL CXFA_WidgetData::GetValue(CFX_WideString& wsValue,
int32_t iSelItemIndex = GetSelectedItem(0);
if (iSelItemIndex >= 0) {
GetChoiceListItem(wsValue, iSelItemIndex);
- wsPicture.Empty();
+ wsPicture.clear();
}
}
} break;
@@ -1709,7 +1709,7 @@ void CXFA_WidgetData::FormatNumStr(const CFX_WideString& wsValue,
int32_t cc = dot_index - 1;
if (cc >= 0) {
int nPos = dot_index % 3;
- wsOutput.Empty();
+ wsOutput.clear();
for (int32_t i = 0; i < dot_index; i++) {
if (i % 3 == nPos && i != 0)
wsOutput += wsGroupSymbol;
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index a75a8ea72c..a271b10286 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -290,7 +290,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,
pDataNode->GetNodeList(items);
int32_t iCounts = items.GetSize();
if (iCounts > 0) {
- wsNormailizeValue.Empty();
+ wsNormailizeValue.clear();
CFX_WideString wsItem;
for (int32_t i = 0; i < iCounts; i++) {
items[i]->TryContent(wsItem);
diff --git a/xfa/fxfa/parser/xfa_document_serialize.cpp b/xfa/fxfa/parser/xfa_document_serialize.cpp
index 4c826b6e59..87707d84e6 100644
--- a/xfa/fxfa/parser/xfa_document_serialize.cpp
+++ b/xfa/fxfa/parser/xfa_document_serialize.cpp
@@ -189,7 +189,7 @@ FX_BOOL XFA_DataExporter_ContentNodeNeedtoExport(CXFA_Node* pContentNode) {
static void XFA_DataExporter_RecognizeXFAVersionNumber(
CXFA_Node* pTemplateRoot,
CFX_WideString& wsVersionNumber) {
- wsVersionNumber.Empty();
+ wsVersionNumber.clear();
if (!pTemplateRoot) {
return;
}
@@ -336,7 +336,7 @@ static void XFA_DataExporter_RegenerateFormFile_Changed(
}
if (!bSaveXML && !wsChildren.IsEmpty() &&
pNode->GetClassID() == XFA_ELEMENT_Items) {
- wsChildren.Empty();
+ wsChildren.clear();
bSaveXML = TRUE;
CXFA_Node* pChildNode = pNode->GetNodeItem(XFA_NODEITEM_FirstChild);
while (pChildNode) {
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp
index f2b3f1f000..9b605b0844 100644
--- a/xfa/fxfa/parser/xfa_localemgr.cpp
+++ b/xfa/fxfa/parser/xfa_localemgr.cpp
@@ -1247,7 +1247,7 @@ void CXFA_LocaleMgr::SetDefLocale(IFX_Locale* pLocale) {
}
CFX_WideStringC CXFA_LocaleMgr::GetConfigLocaleName(CXFA_Node* pConfig) {
if (!(m_dwLocaleFlags & 0x01)) {
- m_wsConfigLocale.Empty();
+ m_wsConfigLocale.clear();
if (pConfig) {
CXFA_Node* pChildfConfig =
pConfig->GetFirstChildByClass(XFA_ELEMENT_Acrobat);
diff --git a/xfa/fxfa/parser/xfa_localevalue.cpp b/xfa/fxfa/parser/xfa_localevalue.cpp
index e36595d840..6dd8377465 100644
--- a/xfa/fxfa/parser/xfa_localevalue.cpp
+++ b/xfa/fxfa/parser/xfa_localevalue.cpp
@@ -142,7 +142,7 @@ FX_BOOL CXFA_LocaleValue::ValidateValue(const CFX_WideString& wsValue,
}
case FX_LOCALECATEGORY_Text:
bRet = pFormat->ParseText(wsValue, wsFormat, wsOutput);
- wsOutput.Empty();
+ wsOutput.clear();
if (!bRet) {
bRet = pFormat->FormatText(wsValue, wsFormat, wsOutput);
}
@@ -464,7 +464,7 @@ FX_BOOL CXFA_LocaleValue::FormatPatterns(CFX_WideString& wsResult,
const CFX_WideString& wsFormat,
IFX_Locale* pLocale,
XFA_VALUEPICTURE eValueType) const {
- wsResult.Empty();
+ wsResult.clear();
FX_BOOL bRet = FALSE;
CFX_FormatString* pFormat = nullptr;
@@ -492,7 +492,7 @@ FX_BOOL CXFA_LocaleValue::FormatSinglePattern(
if (pLocale) {
m_pLocaleMgr->SetDefLocale(pLocale);
}
- wsResult.Empty();
+ wsResult.clear();
FX_BOOL bRet = FALSE;
CFX_FormatString* pFormat = nullptr;
@@ -822,7 +822,7 @@ FX_BOOL CXFA_LocaleValue::ParsePatternValue(const CFX_WideString& wsValue,
case FX_LOCALECATEGORY_Null:
bRet = pFormat->ParseNull(wsValue, wsFormat);
if (bRet) {
- m_wsValue.Empty();
+ m_wsValue.clear();
}
break;
case FX_LOCALECATEGORY_Zero:
diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp
index 87941af070..2979e3700a 100644
--- a/xfa/fxfa/parser/xfa_object_imp.cpp
+++ b/xfa/fxfa/parser/xfa_object_imp.cpp
@@ -4468,7 +4468,7 @@ CXFA_Node* CXFA_Node::GetModelNode() {
}
}
FX_BOOL CXFA_Node::TryNamespace(CFX_WideString& wsNamespace) {
- wsNamespace.Empty();
+ wsNamespace.clear();
if (GetObjectType() == XFA_OBJECTTYPE_ModelNode ||
GetClassID() == XFA_ELEMENT_Packet) {
CFDE_XMLNode* pXMLNode = GetXMLMappingNode();
diff --git a/xfa/fxfa/parser/xfa_parser_imp.cpp b/xfa/fxfa/parser/xfa_parser_imp.cpp
index 4bb47ddc5d..002197c55d 100644
--- a/xfa/fxfa/parser/xfa_parser_imp.cpp
+++ b/xfa/fxfa/parser/xfa_parser_imp.cpp
@@ -217,7 +217,7 @@ FX_BOOL XFA_FDEExtension_ResolveNamespaceQualifier(
return TRUE;
}
}
- wsNamespaceURI.Empty();
+ wsNamespaceURI.clear();
return bRet;
}
static inline void XFA_FDEExtension_GetElementTagNamespaceURI(
@@ -227,7 +227,7 @@ static inline void XFA_FDEExtension_GetElementTagNamespaceURI(
pElement->GetNamespacePrefix(wsNodeStr);
if (!XFA_FDEExtension_ResolveNamespaceQualifier(
pElement, wsNodeStr.AsStringC(), wsNamespaceURI)) {
- wsNamespaceURI.Empty();
+ wsNamespaceURI.clear();
}
}
static FX_BOOL XFA_FDEExtension_MatchNodeName(
@@ -285,7 +285,7 @@ static FX_BOOL XFA_FDEExtension_ResolveAttribute(
}
if (!XFA_FDEExtension_ResolveNamespaceQualifier(
pElement, wsNSPrefix.AsStringC(), wsNamespaceURI)) {
- wsNamespaceURI.Empty();
+ wsNamespaceURI.clear();
return FALSE;
}
return TRUE;
@@ -1318,7 +1318,7 @@ void CXFA_SimpleParser::ParseInstruction(CXFA_Node* pXFANode,
if (pXMLInstruction->GetData(0, wsData) &&
(pXFANode->GetDocument()->RecognizeXFAVersionNumber(wsData) !=
XFA_VERSION_UNKNOWN)) {
- wsData.Empty();
+ wsData.clear();
if (pXMLInstruction->GetData(1, wsData) &&
wsData == FX_WSTRC(L"v2.7-scripting:1")) {
pXFANode->GetDocument()->SetFlag(XFA_DOCFLAG_Scripting, TRUE);
@@ -1419,8 +1419,8 @@ CXFA_XMLParser::~CXFA_XMLParser() {
m_pParser->Release();
}
m_NodeStack.RemoveAll();
- m_ws1.Empty();
- m_ws2.Empty();
+ m_ws1.clear();
+ m_ws2.clear();
}
int32_t CXFA_XMLParser::DoParser(IFX_Pause* pPause) {
if (m_syntaxParserResult == FDE_XmlSyntaxResult::Error)
@@ -1485,7 +1485,7 @@ int32_t CXFA_XMLParser::DoParser(IFX_Pause* pPause) {
} else {
m_pChild = NULL;
}
- m_ws1.Empty();
+ m_ws1.clear();
break;
case FDE_XmlSyntaxResult::TagName:
m_pParser->GetTagName(m_ws1);
@@ -1520,7 +1520,7 @@ int32_t CXFA_XMLParser::DoParser(IFX_Pause* pPause) {
static_cast<CFDE_XMLElement*>(m_pChild)->SetString(m_ws1, m_ws2);
}
}
- m_ws1.Empty();
+ m_ws1.clear();
break;
case FDE_XmlSyntaxResult::Text:
m_pParser->GetTextData(m_ws1);
@@ -1546,7 +1546,7 @@ int32_t CXFA_XMLParser::DoParser(IFX_Pause* pPause) {
m_pParser->GetTargetData(m_ws1);
static_cast<CFDE_XMLInstruction*>(m_pChild)->AppendData(m_ws1);
}
- m_ws1.Empty();
+ m_ws1.clear();
break;
default:
break;
diff --git a/xfa/fxfa/parser/xfa_script_nodehelper.cpp b/xfa/fxfa/parser/xfa_script_nodehelper.cpp
index 1b79ad94be..bb722c6bb9 100644
--- a/xfa/fxfa/parser/xfa_script_nodehelper.cpp
+++ b/xfa/fxfa/parser/xfa_script_nodehelper.cpp
@@ -261,7 +261,7 @@ void CXFA_NodeHelper::XFA_GetNameExpression(CXFA_Node* refNode,
CFX_WideString& wsName,
FX_BOOL bIsAllPath,
XFA_LOGIC_TYPE eLogicType) {
- wsName.Empty();
+ wsName.clear();
if (bIsAllPath) {
XFA_GetNameExpression(refNode, wsName, FALSE, eLogicType);
CFX_WideString wsParent;
diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
index 09f513714c..38271da656 100644
--- a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
+++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
@@ -262,7 +262,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Normal(
rndFind.m_CurNode = pVariablesNode;
XFA_ResolveNodes_SetStylesForChild(dwStyles, rndFind);
CFX_WideString wsSaveCondition = rndFind.m_wsCondition;
- rndFind.m_wsCondition.Empty();
+ rndFind.m_wsCondition.clear();
XFA_ResolveNodes_Normal(rndFind);
rndFind.m_wsCondition = wsSaveCondition;
if (rndFind.m_Nodes.GetSize() > 0) {
@@ -300,7 +300,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Normal(
}
rndFind.m_CurNode = child;
CFX_WideString wsSaveCondition = rndFind.m_wsCondition;
- rndFind.m_wsCondition.Empty();
+ rndFind.m_wsCondition.clear();
XFA_ResolveNodes_Normal(rndFind);
rndFind.m_wsCondition = wsSaveCondition;
if (rndFind.m_Nodes.GetSize() > 0) {
@@ -444,7 +444,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Normal(
if (bInnerSearch) {
rndFind.m_CurNode = child;
CFX_WideString wsOriginCondition = rndFind.m_wsCondition;
- rndFind.m_wsCondition.Empty();
+ rndFind.m_wsCondition.clear();
uint32_t dwOriginStyle = rndFind.m_dwStyles;
rndFind.m_dwStyles = dwOriginStyle | XFA_RESOLVENODE_ALL;
XFA_ResolveNodes_Normal(rndFind);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 10:13:45 +0000