diff options
| author | Keith Curtis <keithcu@gmail.com> | 2014-02-22 05:30:00 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-05 09:01:11 -0600 |
| commit | ff6f3164dfc454354bee79eac30d6cc279b8a0ec (patch) | |
| tree | 8eabd42240646136707fccfa46ec297b6230a3a3 /sw/source/core/inc/wrong.hxx | |
| parent | 9d4c3a2a217e02444601bea9e0eae7ae342fe0e8 (diff) | |
Simplify DrawWave
This patch simplifies the DrawWave logic. Callers of that code would try to
figure out what size wave to draw and pass down a style integer to
DrawWaveLine, but DrawWaveLine already has logic which trims the height of the
wave so it doesn't need the hint.
This doesn't change the UNO API
(::com::sun::star::awt::FontUnderline::SMALLWAVE), but it does get rid of
internal usages and maps those small waves to normal.
Note that changing the zoom in Calc right now causes spelling underlines to
disappear. That bug is not related to these changes.
Conflicts:
editeng/source/editeng/impedit3.cxx
Change-Id: I3caa2a74a0f5228b924d4e1b0a77f96eaef5fa00
Reviewed-on: https://gerrit.libreoffice.org/8168
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/core/inc/wrong.hxx')
| -rw-r--r-- | sw/source/core/inc/wrong.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 89d6c0bac095..f2a8831156b4 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -38,9 +38,6 @@ enum WrongAreaLineType { WRONGAREA_DASHED, WRONGAREA_WAVE, - WRONGAREA_WAVE_NORMAL, - WRONGAREA_WAVE_SMALL, - WRONGAREA_WAVE_FLAT, WRONGAREA_NONE }; @@ -122,11 +119,11 @@ private: } if (::com::sun::star::awt::FontUnderline::WAVE == lineType) { - return WRONGAREA_WAVE_NORMAL; + return WRONGAREA_WAVE; } if (::com::sun::star::awt::FontUnderline::SMALLWAVE == lineType) { - return WRONGAREA_WAVE_SMALL; + return WRONGAREA_WAVE; //Code draws wave height based on space that fits. } } } |