diff options
| author | Andras Timar <andras.timar@collabora.com> | 2023-02-23 22:24:19 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-02-23 22:24:19 +0100 |
| commit | 0bfc9106aa25680ebcca8464c0e79eac26d73403 (patch) | |
| tree | 6eac290ec66342019b998fccbd6ed91afa78da6c | |
| parent | d822af70d46ff46c4a0e4a6ab70dd13c27c96401 (diff) | |
Revert "editeng: add flag EEControlBits::SINGLELINE"
This reverts commit 16504e240caeac4d1b63cfc1022133028ecaabf7.
| -rw-r--r-- | editeng/source/editeng/editstt2.hxx | 3 | ||||
| -rw-r--r-- | include/editeng/editstat.hxx | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/editeng/source/editeng/editstt2.hxx b/editeng/source/editeng/editstt2.hxx index 334622b23495..4474df8b429b 100644 --- a/editeng/source/editeng/editstt2.hxx +++ b/editeng/source/editeng/editstt2.hxx @@ -91,9 +91,6 @@ public: bool ULSpaceSummation() const { return bool( nControlBits & EEControlBits::ULSPACESUMMATION ); } - - bool IsSingleLine() const - { return bool( nControlBits & EEControlBits::SINGLELINE ); } }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx index f05ff8acf82f..e23007899267 100644 --- a/include/editeng/editstat.hxx +++ b/include/editeng/editstat.hxx @@ -49,11 +49,10 @@ enum class EEControlBits AUTOPAGESIZE = (AUTOPAGESIZEX | AUTOPAGESIZEY), FORMAT100 = 0x01000000, // Always format to 100% ULSPACESUMMATION = 0x02000000, // MS Compat: sum SA and SB, not maximum value - SINGLELINE = 0x04000000, // One line for all text }; namespace o3tl { - template<> struct typed_flags<EEControlBits> : is_typed_flags<EEControlBits, 0x07ffffff> {}; + template<> struct typed_flags<EEControlBits> : is_typed_flags<EEControlBits, 0x037afff9> {}; } enum class EVControlBits |