diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-30 14:00:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-03 11:34:23 +0000 |
| commit | 52225a3b7fd48f79e8376caf498564b7cffc152b (patch) | |
| tree | 73fafae95a446e7db3d1908c53cc79749faa30b6 /cppcanvas | |
| parent | 1741c0ff36e57f0629ff360a79b18c2d11bb8092 (diff) | |
Convert ComplexTextLayoutMode to scoped enum
Change-Id: I257f8e15fec92f0701235a6fe4b6a2272498c4f1
Reviewed-on: https://gerrit.libreoffice.org/25667
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index ab398c519186..2c3d0bf7d87c 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1511,22 +1511,22 @@ namespace cppcanvas case MetaActionType::LAYOUTMODE: { // TODO(F2): A lot is missing here - ComplexTextLayoutMode nLayoutMode = static_cast<MetaLayoutModeAction*>(pCurrAct)->GetLayoutMode(); + ComplexTextLayoutFlags nLayoutMode = static_cast<MetaLayoutModeAction*>(pCurrAct)->GetLayoutMode(); ::cppcanvas::internal::OutDevState& rState = rStates.getState(); - ComplexTextLayoutMode nBidiLayoutMode = nLayoutMode & (TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_BIDI_STRONG); - if( nBidiLayoutMode == TEXT_LAYOUT_DEFAULT) + ComplexTextLayoutFlags nBidiLayoutMode = nLayoutMode & (ComplexTextLayoutFlags::BiDiRtl|ComplexTextLayoutFlags::BiDiStrong); + if( nBidiLayoutMode == ComplexTextLayoutFlags::Default) rState.textDirection = rendering::TextDirection::WEAK_LEFT_TO_RIGHT; - else if( nBidiLayoutMode == TEXT_LAYOUT_BIDI_STRONG) + else if( nBidiLayoutMode == ComplexTextLayoutFlags::BiDiStrong) rState.textDirection = rendering::TextDirection::STRONG_LEFT_TO_RIGHT; - else if( nBidiLayoutMode == TEXT_LAYOUT_BIDI_RTL) + else if( nBidiLayoutMode == ComplexTextLayoutFlags::BiDiRtl) rState.textDirection = rendering::TextDirection::WEAK_RIGHT_TO_LEFT; - else if( nBidiLayoutMode == (TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_BIDI_STRONG)) + else if( nBidiLayoutMode == (ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::BiDiStrong)) rState.textDirection = rendering::TextDirection::STRONG_RIGHT_TO_LEFT; rState.textAlignment = 0; // TODO(F2): rendering::TextAlignment::LEFT_ALIGNED; - if( (nLayoutMode & (TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_RIGHT) ) - && !(nLayoutMode & TEXT_LAYOUT_TEXTORIGIN_LEFT ) ) + if( (nLayoutMode & (ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::TextOriginRight) ) + && !(nLayoutMode & ComplexTextLayoutFlags::TextOriginLeft ) ) { rState.textAlignment = 1; // TODO(F2): rendering::TextAlignment::RIGHT_ALIGNED; } |