From ac8c3b6ddc4ea3e5c0f365db6951a4c9bb406a57 Mon Sep 17 00:00:00 2001 From: Jun Fang Date: Thu, 10 Dec 2015 22:10:20 -0800 Subject: Fix compiling warnings on Linux (part2) BUG=pdfium:261 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1500313002 . --- xfa/src/fwl/src/core/include/fwl_contentimp.h | 8 ++++---- xfa/src/fwl/src/core/include/fwl_gridimp.h | 16 ++++++++-------- xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp | 15 --------------- xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h | 11 ----------- xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp | 19 ------------------- xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h | 12 ------------ xfa/src/fxfa/src/app/xfa_ffsignature.cpp | 7 ------- xfa/src/fxfa/src/app/xfa_ffsignature.h | 4 +--- 8 files changed, 13 insertions(+), 79 deletions(-) (limited to 'xfa') diff --git a/xfa/src/fwl/src/core/include/fwl_contentimp.h b/xfa/src/fwl/src/core/include/fwl_contentimp.h index dc7ff7b681..6c83ae1b22 100644 --- a/xfa/src/fwl/src/core/include/fwl_contentimp.h +++ b/xfa/src/fwl/src/core/include/fwl_contentimp.h @@ -18,10 +18,10 @@ class CFWL_ContentImp : public CFWL_WidgetImp { virtual FWL_ERR InsertWidget(IFWL_Widget* pChild, int32_t nIndex = -1); virtual FWL_ERR RemoveWidget(IFWL_Widget* pWidget); virtual FWL_ERR RemoveAllWidgets(); - virtual FWL_ERR GetMinSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); - virtual FWL_ERR SetMinSize(FX_FLOAT fWidth, FX_FLOAT fHeight); - virtual FWL_ERR GetMaxSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); - virtual FWL_ERR SetMaxSize(FX_FLOAT fWidth, FX_FLOAT fHeight); + FWL_ERR GetMinSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); + FWL_ERR SetMinSize(FX_FLOAT fWidth, FX_FLOAT fHeight); + FWL_ERR GetMaxSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); + FWL_ERR SetMaxSize(FX_FLOAT fWidth, FX_FLOAT fHeight); protected: FX_FLOAT m_fWidthMin; diff --git a/xfa/src/fwl/src/core/include/fwl_gridimp.h b/xfa/src/fwl/src/core/include/fwl_gridimp.h index 94042c16f8..ef0022eb4a 100644 --- a/xfa/src/fwl/src/core/include/fwl_gridimp.h +++ b/xfa/src/fwl/src/core/include/fwl_gridimp.h @@ -92,14 +92,14 @@ class CFWL_GridImp : public CFWL_ContentImp { virtual FWL_ERR SetSize(FWL_HGRIDCOLROW hColRow, FX_FLOAT fSize, FWL_GRIDUNIT eUnit); - virtual FX_FLOAT GetMinSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT& eUnit); - virtual FWL_ERR SetMinSize(FWL_HGRIDCOLROW hColRow, - FX_FLOAT fSize, - FWL_GRIDUNIT eUnit); - virtual FX_FLOAT GetMaxSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT& eUnit); - virtual FWL_ERR SetMaxSize(FWL_HGRIDCOLROW hColRow, - FX_FLOAT fSize, - FWL_GRIDUNIT eUnit); + FX_FLOAT GetMinSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT& eUnit); + FWL_ERR SetMinSize(FWL_HGRIDCOLROW hColRow, + FX_FLOAT fSize, + FWL_GRIDUNIT eUnit); + FX_FLOAT GetMaxSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT& eUnit); + FWL_ERR SetMaxSize(FWL_HGRIDCOLROW hColRow, + FX_FLOAT fSize, + FWL_GRIDUNIT eUnit); virtual FX_BOOL DeleteColRow(FWL_HGRIDCOLROW hColRow); virtual FX_BOOL IsColumn(FWL_HGRIDCOLROW hColRow); virtual int32_t GetWidgetPos(IFWL_Widget* pWidget, FX_BOOL bColumn); diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index 408a5980ff..25438f389a 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -86,21 +86,6 @@ uint8_t* CBC_DataMatrixWriter::Encode(const CFX_WideString& contents, delete placement; return result; } -uint8_t* CBC_DataMatrixWriter::Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t& e) { - return NULL; -} -uint8_t* CBC_DataMatrixWriter::Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t hints, - int32_t& e) { - return NULL; -} CBC_CommonByteMatrix* CBC_DataMatrixWriter::encodeLowLevel( CBC_DefaultPlacement* placement, CBC_SymbolInfo* symbolInfo, diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h index 808e35f11f..4c74205f2c 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h @@ -21,17 +21,6 @@ class CBC_DataMatrixWriter : public CBC_TwoDimWriter { int32_t& outWidth, int32_t& outHeight, int32_t& e); - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t& e); - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t hints, - int32_t& e); FX_BOOL SetErrorCorrectionLevel(int32_t level); private: diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp index b3263f5559..457b30b750 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp @@ -44,25 +44,6 @@ FX_BOOL CBC_PDF417Writer::SetErrorCorrectionLevel(int32_t level) { void CBC_PDF417Writer::SetTruncated(FX_BOOL truncated) { m_bTruncated = truncated; } -uint8_t* CBC_PDF417Writer::Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t& e) { - if (format != BCFORMAT_PDF_417) { - return NULL; - } - CFX_WideString encodeContents = contents.UTF8Decode(); - return Encode(encodeContents, outWidth, outHeight, e); -} -uint8_t* CBC_PDF417Writer::Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t hints, - int32_t& e) { - return NULL; -} uint8_t* CBC_PDF417Writer::Encode(const CFX_WideString& contents, int32_t& outWidth, int32_t& outHeight, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h index 9ec5bcda98..8e5cb432c8 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h @@ -16,18 +16,6 @@ class CBC_PDF417Writer : public CBC_TwoDimWriter { int32_t& outWidth, int32_t& outHeight, int32_t& e); - - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t& e); - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t hints, - int32_t& e); FX_BOOL SetErrorCorrectionLevel(int32_t level); void SetTruncated(FX_BOOL truncated); diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp index b81f16f4bc..7b5930d1e4 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp @@ -87,13 +87,6 @@ FX_BOOL CXFA_FFSignature::OnRButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fy) { return FALSE; } - -FX_BOOL CXFA_FFSignature::OnSetFocus() { - return FALSE; -} -FX_BOOL CXFA_FFSignature::OnKillFocus() { - return FALSE; -} FX_BOOL CXFA_FFSignature::OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags) { return FALSE; } diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.h b/xfa/src/fxfa/src/app/xfa_ffsignature.h index 002b4a0e4b..c1d15fd2fc 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsignature.h +++ b/xfa/src/fxfa/src/app/xfa_ffsignature.h @@ -6,7 +6,7 @@ #ifndef _FXFA_FORMFILLER_SIGNATURE_IMP_H #define _FXFA_FORMFILLER_SIGNATURE_IMP_H -class CXFA_FFSignature : public CXFA_FFField { +class CXFA_FFSignature final : public CXFA_FFField { public: CXFA_FFSignature(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); virtual ~CXFA_FFSignature(); @@ -30,8 +30,6 @@ class CXFA_FFSignature : public CXFA_FFField { virtual FX_BOOL OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnRButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnSetFocus(); - virtual FX_BOOL OnKillFocus(); virtual FX_BOOL OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags); virtual FX_BOOL OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags); virtual FX_BOOL OnChar(FX_DWORD dwChar, FX_DWORD dwFlags); -- cgit v1.2.3