diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-08-18 09:25:40 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-18 12:53:31 +0200 |
commit | 88bf1749f1eb7322106da1254e349f51f5df0df5 (patch) | |
tree | 9dede2758a1cdc913b04b0bd76aca981f838254e /include/tools | |
parent | 821ae763cc03f69e226cdba66bb9c82c03483a23 (diff) |
undo changes to TextAlign
revert commit 8689bd5490b473a7ffb149bbe5f7f0683f679c72
Author: Caolán McNamara <caolanm@redhat.com>
Date: Thu Jul 29 20:49:29 2021 +0100
convert TextAlign to scoped enum
lets leave this as it always was
Change-Id: Id4d2a5644974cdd2b0ed6d361d5c52629674d057
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120626
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/tools')
-rw-r--r-- | include/tools/fontenum.hxx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/tools/fontenum.hxx b/include/tools/fontenum.hxx index 419a6baaeb62..eeb35be1985c 100644 --- a/include/tools/fontenum.hxx +++ b/include/tools/fontenum.hxx @@ -27,15 +27,7 @@ enum FontFamily { FAMILY_DONTKNOW, FAMILY_DECORATIVE, FAMILY_MODERN, enum FontPitch { PITCH_DONTKNOW, PITCH_FIXED, PITCH_VARIABLE, FontPitch_FORCE_EQUAL_SIZE=SAL_MAX_ENUM }; -enum class TextAlign : sal_Int16 { - Top = 0x0000, - Baseline = 0x0001, - Bottom = 0x0002, -}; -namespace o3tl -{ - template<> struct typed_flags<TextAlign> : is_typed_flags<TextAlign, 0x3> {}; -} +enum TextAlign { ALIGN_TOP, ALIGN_BASELINE, ALIGN_BOTTOM, TextAlign_FORCE_EQUAL_SIZE=SAL_MAX_ENUM }; enum FontWeight { WEIGHT_DONTKNOW, WEIGHT_THIN, WEIGHT_ULTRALIGHT, WEIGHT_LIGHT, WEIGHT_SEMILIGHT, WEIGHT_NORMAL, |