diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 12:08:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 12:08:12 -0700 |
| commit | 8d2aae7ee320da3a8ffe01c57e38b3f98443257d (patch) | |
| tree | e694c6f82ec72fa46e6172b4475996b30d3f6a3a /fpdfsdk/include/fsdk_baseannot.h | |
| parent | ff46aaf499edcf153ee2f57c7016587aa96dcfa0 (diff) | |
| download | pdfium-8d2aae7ee320da3a8ffe01c57e38b3f98443257d.tar.xz | |
Revert "FX Bool considered harmful, part 3"
This reverts commit ff46aaf499edcf153ee2f57c7016587aa96dcfa0.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1255293002 .
Diffstat (limited to 'fpdfsdk/include/fsdk_baseannot.h')
| -rw-r--r-- | fpdfsdk/include/fsdk_baseannot.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index b9f1fcd4b1..dcd295de9f 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -38,12 +38,12 @@ public: CPDFSDK_DateTime& operator = (const CPDFSDK_DateTime& datetime); CPDFSDK_DateTime& operator = (const FX_SYSTEMTIME& st); - bool operator == (CPDFSDK_DateTime& datetime); - bool operator != (CPDFSDK_DateTime& datetime); - bool operator > (CPDFSDK_DateTime& datetime); - bool operator >= (CPDFSDK_DateTime& datetime); - bool operator < (CPDFSDK_DateTime& datetime); - bool operator <= (CPDFSDK_DateTime& datetime); + FX_BOOL operator == (CPDFSDK_DateTime& datetime); + FX_BOOL operator != (CPDFSDK_DateTime& datetime); + FX_BOOL operator > (CPDFSDK_DateTime& datetime); + FX_BOOL operator >= (CPDFSDK_DateTime& datetime); + FX_BOOL operator < (CPDFSDK_DateTime& datetime); + FX_BOOL operator <= (CPDFSDK_DateTime& datetime); operator time_t(); CPDFSDK_DateTime& FromPDFDateTimeString(const CFX_ByteString& dtStr); @@ -92,8 +92,8 @@ public: void SetTabOrder(int iTabOrder); // Selection - bool IsSelected(); - void SetSelected(bool bSelected); + FX_BOOL IsSelected(); + void SetSelected(FX_BOOL bSelected); CFX_ByteString GetType() const; virtual CFX_ByteString GetSubType() const; @@ -146,9 +146,9 @@ public: void SetColor(FX_COLORREF color); void RemoveColor(); - bool GetColor(FX_COLORREF& color) const; + FX_BOOL GetColor(FX_COLORREF& color) const; - bool IsVisible() const; + FX_BOOL IsVisible() const; //action CPDF_Action GetAction() const; @@ -162,8 +162,8 @@ public: virtual CPDF_Action GetAAction(CPDF_AAction::AActionType eAAT); public: - bool IsAppearanceValid(); - bool IsAppearanceValid(CPDF_Annot::AppearanceMode mode); + FX_BOOL IsAppearanceValid(); + FX_BOOL IsAppearanceValid(CPDF_Annot::AppearanceMode mode); void DrawAppearance(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device, CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions); void DrawBorder(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device, @@ -181,11 +181,11 @@ public: private: - bool CreateFormFiller(); + FX_BOOL CreateFormFiller(); protected: CPDF_Annot* m_pAnnot; CPDFSDK_PageView* m_pPageView; - bool m_bSelected; + FX_BOOL m_bSelected; int m_nTabOrder; }; |