Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / src / fxfa / src / app / xfa_ffpageview.cpp
index 11384b1..97c5b71 100644 (file)
@@ -290,7 +290,7 @@ CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::GetTraverseWidget(CXFA_FFWidge
     }\r
     return NULL;\r
 }\r
-CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::FindWidgetByName(FX_WSTR wsWidgetName, CXFA_FFWidget* pRefWidget)\r
+CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::FindWidgetByName(const CFX_WideStringC& wsWidgetName, CXFA_FFWidget* pRefWidget)\r
 {\r
     return pRefWidget->GetDocView()->GetWidgetByName(wsWidgetName, pRefWidget);\r
 }\r
@@ -383,7 +383,7 @@ void CXFA_FFTabOrderPageWidgetIterator::OrderContainer(CXFA_LayoutItemIterator*
     }\r
     int32_t iChildren = tabParams.GetSize();\r
     if (iChildren > 1) {\r
-        FXSYS_qsort(tabParams.GetData(), iChildren, sizeof(FX_LPVOID), XFA_TabOrderWidgetComparator);\r
+        FXSYS_qsort(tabParams.GetData(), iChildren, sizeof(void*), XFA_TabOrderWidgetComparator);\r
     }\r
     for (int32_t iStart = 0; iStart < iChildren; iStart++) {\r
         CXFA_TabParam* pParam = (CXFA_TabParam*)tabParams[iStart];\r