diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-09-10 21:23:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-09-11 09:08:47 +0200 |
| commit | b3e4ba69b70a30bbcc32ac59ce90e2eda2bc76de (patch) | |
| tree | 12453ac9bdf40752a5cf9d07e7c2d69fbcb9f20a /include | |
| parent | 72b5478390457fa2dcf90e310bb3903e910ca8f2 (diff) | |
convert IMAP_FORMAT to scoped enum
Change-Id: I58090ced672267614ade2e3e81e6264d01b77901
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102405
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/imap.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/imapobj.hxx | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx index 5cf03071b22a..02d8f2ddf96b 100644 --- a/include/vcl/imap.hxx +++ b/include/vcl/imap.hxx @@ -58,7 +58,7 @@ private: static OUString ImpReadNCSAURL( const char** ppStr ); static Point ImpReadNCSACoords( const char** ppStr ); - static sal_uLong ImpDetectFormat( SvStream& rIStm ); + static IMapFormat ImpDetectFormat( SvStream& rIStm ); public: @@ -113,8 +113,8 @@ public: void Write ( SvStream& rOStm ) const; void Read( SvStream& rIStm ); - void Write( SvStream& rOStm, sal_uLong nFormat ) const; - sal_uLong Read( SvStream& rIStm, sal_uLong nFormat ); + void Write( SvStream& rOStm, IMapFormat nFormat ) const; + sal_uLong Read( SvStream& rIStm, IMapFormat nFormat ); }; class IMapCompat diff --git a/include/vcl/imapobj.hxx b/include/vcl/imapobj.hxx index 902b5f908cdf..982e350547e2 100644 --- a/include/vcl/imapobj.hxx +++ b/include/vcl/imapobj.hxx @@ -38,10 +38,13 @@ class SvStream; #define IMAP_MIRROR_HORZ 0x00000001L #define IMAP_MIRROR_VERT 0x00000002L -#define IMAP_FORMAT_BIN 0x00000001L -#define IMAP_FORMAT_CERN 0x00000002L -#define IMAP_FORMAT_NCSA 0x00000004L -#define IMAP_FORMAT_DETECT 0xffffffffL +enum class IMapFormat +{ + Binary = 1, + CERN = 2, + NCSA = 3, + Detect = 15, +}; #define IMAP_ERR_OK 0x00000000L #define IMAP_ERR_FORMAT 0x00000001L |