diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-20 21:16:43 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-20 21:16:43 +0000 |
| commit | 1699413c207c228ae7eae3d47e89adacc1146d65 (patch) | |
| tree | 2a6020ff5b1d658c618ea32a04f86aaa9ee86b72 /xfa/fxfa/parser/cxfa_boxdata.h | |
| parent | ef2b74990f4f2a82e279ef5b8a911d89be1e83e2 (diff) | |
| download | pdfium-1699413c207c228ae7eae3d47e89adacc1146d65.tar.xz | |
Cleanup return types in CXFA_BoxData
This CL cleans up the return types in CXFA_BoxData to use std::tuple and
pdfium::Optional where appropriate.
Change-Id: I0790fb43769185fa4cbdd7460411a3d1120e9fa1
Reviewed-on: https://pdfium-review.googlesource.com/18812
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_boxdata.h')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_boxdata.h | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/xfa/fxfa/parser/cxfa_boxdata.h b/xfa/fxfa/parser/cxfa_boxdata.h index 14f8b35235..d3d1887719 100644 --- a/xfa/fxfa/parser/cxfa_boxdata.h +++ b/xfa/fxfa/parser/cxfa_boxdata.h @@ -7,6 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_BOXDATA_H_ #define XFA_FXFA_PARSER_CXFA_BOXDATA_H_ +#include <tuple> #include <vector> #include "core/fxcrt/fx_system.h" @@ -26,29 +27,21 @@ class CXFA_BoxData : public CXFA_DataData { bool IsRectangle() const { return GetElementType() == XFA_Element::Rectangle; } + bool IsCircular() const; + int32_t GetHand() const; int32_t GetPresence() const; + std::tuple<int32_t, bool, float> Get3DStyle() const; + int32_t CountEdges() const; CXFA_EdgeData GetEdgeData(int32_t nIndex) const; - std::vector<CXFA_StrokeData> GetStrokes() const; - bool IsCircular() const; - bool GetStartAngle(float& fStartAngle) const; - float GetStartAngle() const { - float fStartAngle; - GetStartAngle(fStartAngle); - return fStartAngle; - } - - bool GetSweepAngle(float& fSweepAngle) const; - float GetSweepAngle() const { - float fSweepAngle; - GetSweepAngle(fSweepAngle); - return fSweepAngle; - } - CXFA_FillData GetFillData(bool bModified) const; CXFA_MarginData GetMarginData() const; - int32_t Get3DStyle(bool& bVisible, float& fThickness) const; + + std::vector<CXFA_StrokeData> GetStrokes() const; + + pdfium::Optional<float> GetStartAngle() const; + pdfium::Optional<float> GetSweepAngle() const; }; #endif // XFA_FXFA_PARSER_CXFA_BOXDATA_H_ |