diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-01-26 22:41:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-01-26 22:42:11 +0100 |
| commit | cef2ecd0f56c8ff15b8d37e908cec625e1ab28c9 (patch) | |
| tree | 538c054ca1777e6ddc0795d1206e951495ac49a3 /vcl/inc/salptype.hxx | |
| parent | bd572464fad9baec754d299562f95b4921f79ecf (diff) | |
Use o3tl::typed_flags
Change-Id: I6b43fecc6a45161d419826bc10385b26db5148e5
Diffstat (limited to 'vcl/inc/salptype.hxx')
| -rw-r--r-- | vcl/inc/salptype.hxx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/vcl/inc/salptype.hxx b/vcl/inc/salptype.hxx index b121a12f9e6e..1fb904908ef3 100644 --- a/vcl/inc/salptype.hxx +++ b/vcl/inc/salptype.hxx @@ -20,19 +20,10 @@ #ifndef INCLUDED_VCL_INC_SALPTYPE_HXX #define INCLUDED_VCL_INC_SALPTYPE_HXX -#include <sal/types.h> - -enum class JobSetFlags : sal_uInt16; +#include <sal/config.h> -inline SAL_CONSTEXPR JobSetFlags operator |(const JobSetFlags a, const JobSetFlags b) -{ - return static_cast<JobSetFlags>(static_cast<sal_uInt16>(a) & static_cast<sal_uInt16>(b)); -} - -inline SAL_CONSTEXPR bool operator &(const JobSetFlags a, const JobSetFlags b) -{ - return (static_cast<sal_uInt16>(a) & static_cast<sal_uInt16>(b)) != 0; -} +#include <o3tl/typed_flags_set.hxx> +#include <sal/types.h> enum class JobSetFlags : sal_uInt16 { ORIENTATION = 1, @@ -42,6 +33,12 @@ enum class JobSetFlags : sal_uInt16 { ALL = ORIENTATION | PAPERBIN | PAPERSIZE | DUPLEXMODE }; +namespace o3tl { + +template<> struct typed_flags<JobSetFlags>: is_typed_flags<JobSetFlags, 0xF> {}; + +} + // - SalPrinterError - #define SAL_PRINTER_ERROR_GENERALERROR 1 |