Index: xfa/fxfa/app/xfa_ffwidgethandler.cpp |
diff --git a/xfa/fxfa/app/xfa_ffwidgethandler.cpp b/xfa/fxfa/app/xfa_ffwidgethandler.cpp |
index 314b22731a01a93a2845f0b032596b8f134ebc91..13cee333a54f520b825afc4c06b87df152b33a58 100644 |
--- a/xfa/fxfa/app/xfa_ffwidgethandler.cpp |
+++ b/xfa/fxfa/app/xfa_ffwidgethandler.cpp |
@@ -328,7 +328,7 @@ CXFA_Node* CXFA_FFWidgetHandler::CreatePushButton(CXFA_Node* pParent, |
CXFA_Node* pCaption = CreateCopyNode(XFA_ELEMENT_Caption, pField); |
CXFA_Node* pValue = CreateCopyNode(XFA_ELEMENT_Value, pCaption); |
CXFA_Node* pText = CreateCopyNode(XFA_ELEMENT_Text, pValue); |
- pText->SetContent(FX_WSTRC(L"Button"), FX_WSTRC(L"Button"), FALSE); |
+ pText->SetContent(L"Button", L"Button", FALSE); |
CXFA_Node* pPara = CreateCopyNode(XFA_ELEMENT_Para, pCaption); |
pPara->SetEnum(XFA_ATTRIBUTE_VAlign, XFA_ATTRIBUTEENUM_Middle, FALSE); |
@@ -343,7 +343,7 @@ CXFA_Node* CXFA_FFWidgetHandler::CreatePushButton(CXFA_Node* pParent, |
CXFA_Node* pFill = CreateCopyNode(XFA_ELEMENT_Fill, pBorder); |
CXFA_Node* pColor = CreateCopyNode(XFA_ELEMENT_Color, pFill); |
- pColor->SetCData(XFA_ATTRIBUTE_Value, FX_WSTRC(L"212, 208, 200"), FALSE); |
+ pColor->SetCData(XFA_ATTRIBUTE_Value, L"212, 208, 200", FALSE); |
CXFA_Node* pBind = CreateCopyNode(XFA_ELEMENT_Bind, pField); |
pBind->SetEnum(XFA_ATTRIBUTE_Match, XFA_ATTRIBUTEENUM_None); |
@@ -515,7 +515,7 @@ CXFA_Node* CXFA_FFWidgetHandler::CreateTemplateNode(XFA_ELEMENT eElement, |
CXFA_Node* CXFA_FFWidgetHandler::CreateFontNode(CXFA_Node* pParent) const { |
CXFA_Node* pFont = CreateCopyNode(XFA_ELEMENT_Font, pParent); |
- pFont->SetCData(XFA_ATTRIBUTE_Typeface, FX_WSTRC(L"Myriad Pro"), FALSE); |
+ pFont->SetCData(XFA_ATTRIBUTE_Typeface, L"Myriad Pro", FALSE); |
return pFont; |
} |