diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-14 15:32:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-14 15:32:35 -0700 |
| commit | 70c5520270ab41b71e8ae8d2e888b9ba25383190 (patch) | |
| tree | edfa22ea2a5eec835fa13394b034b416fe58312d /xfa/fxfa/include | |
| parent | ff242e0b62173718a6e98aee1306ac48f6372572 (diff) | |
| download | pdfium-70c5520270ab41b71e8ae8d2e888b9ba25383190.tar.xz | |
Pass CFX_WideString to CXFA_FFDocView::GetWidgetByName.
Avoids downgrade followed by duplication of existing strings.
Review URL: https://codereview.chromium.org/1891673003
Diffstat (limited to 'xfa/fxfa/include')
| -rw-r--r-- | xfa/fxfa/include/xfa_ffdocview.h | 16 | ||||
| -rw-r--r-- | xfa/fxfa/include/xfa_ffpageview.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/include/xfa_ffdocview.h b/xfa/fxfa/include/xfa_ffdocview.h index 27ef8e96d4..dc9598850a 100644 --- a/xfa/fxfa/include/xfa_ffdocview.h +++ b/xfa/fxfa/include/xfa_ffdocview.h @@ -38,16 +38,16 @@ class CXFA_FFDocView { CXFA_FFDoc* GetDoc() { return m_pDoc; } int32_t StartLayout(int32_t iStartPage = 0); - int32_t DoLayout(IFX_Pause* pPause = NULL); + int32_t DoLayout(IFX_Pause* pPause = nullptr); void StopLayout(); int32_t GetLayoutStatus(); void UpdateDocView(); int32_t CountPageViews(); CXFA_FFPageView* GetPageView(int32_t nIndex); - void ResetWidgetData(CXFA_WidgetAcc* pWidgetAcc = NULL); + void ResetWidgetData(CXFA_WidgetAcc* pWidgetAcc = nullptr); int32_t ProcessWidgetEvent(CXFA_EventParam* pParam, - CXFA_WidgetAcc* pWidgetAcc = NULL); + CXFA_WidgetAcc* pWidgetAcc = nullptr); CXFA_FFWidgetHandler* GetWidgetHandler(); IXFA_WidgetIterator* CreateWidgetIterator(); CXFA_WidgetAccIterator* CreateWidgetAccIterator( @@ -55,10 +55,10 @@ class CXFA_FFDocView { CXFA_FFWidget* GetFocusWidget(); void KillFocus(); FX_BOOL SetFocus(CXFA_FFWidget* hWidget); - CXFA_FFWidget* GetWidgetByName(const CFX_WideStringC& wsName, - CXFA_FFWidget* pRefWidget = NULL); - CXFA_WidgetAcc* GetWidgetAccByName(const CFX_WideStringC& wsName, - CXFA_WidgetAcc* pRefWidgetAcc = NULL); + CXFA_FFWidget* GetWidgetByName(const CFX_WideString& wsName, + CXFA_FFWidget* pRefWidget = nullptr); + CXFA_WidgetAcc* GetWidgetAccByName(const CFX_WideString& wsName, + CXFA_WidgetAcc* pRefWidgetAcc = nullptr); CXFA_LayoutProcessor* GetXFALayout() const; void OnPageEvent(CXFA_ContainerLayoutItem* pSender, XFA_PAGEEVENT eEvent, @@ -95,7 +95,7 @@ class CXFA_FFDocView { XFA_EVENTTYPE eEventType, FX_BOOL bIsFormReady = FALSE, FX_BOOL bRecursive = TRUE, - CXFA_Node* pExclude = NULL); + CXFA_Node* pExclude = nullptr); FX_BOOL m_bLayoutEvent; CFX_WideStringArray m_arrNullTestMsg; CXFA_FFWidget* m_pListFocusWidget; diff --git a/xfa/fxfa/include/xfa_ffpageview.h b/xfa/fxfa/include/xfa_ffpageview.h index dcac3f1106..75e418b25b 100644 --- a/xfa/fxfa/include/xfa_ffpageview.h +++ b/xfa/fxfa/include/xfa_ffpageview.h @@ -87,7 +87,7 @@ class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator { protected: CXFA_FFWidget* GetTraverseWidget(CXFA_FFWidget* pWidget); - CXFA_FFWidget* FindWidgetByName(const CFX_WideStringC& wsWidgetName, + CXFA_FFWidget* FindWidgetByName(const CFX_WideString& wsWidgetName, CXFA_FFWidget* pRefWidget); void CreateTabOrderWidgetArray(); void CreateSpaceOrderWidgetArray(CXFA_WidgetArray& WidgetArray); |