diff options
Diffstat (limited to 'xfa/fxfa/include')
| -rw-r--r-- | xfa/fxfa/include/fxfa.h | 4 | ||||
| -rw-r--r-- | xfa/fxfa/include/fxfa_widget.h | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/xfa/fxfa/include/fxfa.h b/xfa/fxfa/include/fxfa.h index 672ca302fd..a7d1a282ba 100644 --- a/xfa/fxfa/include/fxfa.h +++ b/xfa/fxfa/include/fxfa.h @@ -414,7 +414,7 @@ class IXFA_DocProvider { virtual FX_BOOL IsCalculationsEnabled(CXFA_FFDoc* hDoc) = 0; virtual void SetCalculationsEnabled(CXFA_FFDoc* hDoc, FX_BOOL bEnabled) = 0; virtual void GetTitle(CXFA_FFDoc* hDoc, CFX_WideString& wsTitle) = 0; - virtual void SetTitle(CXFA_FFDoc* hDoc, const CFX_WideStringC& wsTitle) = 0; + virtual void SetTitle(CXFA_FFDoc* hDoc, const CFX_WideString& wsTitle) = 0; virtual void ExportData(CXFA_FFDoc* hDoc, const CFX_WideStringC& wsFilePath, FX_BOOL bXDP = TRUE) = 0; @@ -546,7 +546,7 @@ class IXFA_WidgetIterator { virtual FX_BOOL SetCurrentWidget(CXFA_FFWidget* hWidget) = 0; protected: - ~IXFA_WidgetIterator() {} + virtual ~IXFA_WidgetIterator() {} }; #endif // XFA_FXFA_INCLUDE_FXFA_H_ diff --git a/xfa/fxfa/include/fxfa_widget.h b/xfa/fxfa/include/fxfa_widget.h index acd800dcd4..3745a38ec0 100644 --- a/xfa/fxfa/include/fxfa_widget.h +++ b/xfa/fxfa/include/fxfa_widget.h @@ -35,13 +35,11 @@ class CXFA_WidgetAcc : public CXFA_WidgetData { FX_BOOL GetName(CFX_WideString& wsName, int32_t iNameType = 0); FX_BOOL ProcessValueChanged(); - - public: void ResetData(); - void SetImageEdit(const CFX_WideStringC& wsContentType, - const CFX_WideStringC& wsHref, - const CFX_WideStringC& wsData); + void SetImageEdit(const CFX_WideString& wsContentType, + const CFX_WideString& wsHref, + const CFX_WideString& wsData); CXFA_WidgetAcc* GetExclGroup(); CXFA_FFDocView* GetDocView(); |