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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 12 | ||||
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 4d8f67403d95..f52df1fed348 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -678,7 +678,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) } } - // SW disables TEXT_LAYOUT_COMPLEX_DISABLED, so maybe I have to enable it... + // SW disables ComplexTextLayoutFlags::ComplexDisabled, so maybe I have to enable it... // Saving both layout mode and language (since I'm potentially changing both) GetRefDevice()->Push( PushFlags::TEXTLAYOUTMODE|PushFlags::TEXTLANGUAGE ); @@ -4203,24 +4203,24 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_Int32 nPara, // it also works for issue 55927 } - ComplexTextLayoutMode nLayoutMode = pOutDev->GetLayoutMode(); + ComplexTextLayoutFlags nLayoutMode = pOutDev->GetLayoutMode(); // We always use the left position for DrawText() - nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL); + nLayoutMode &= ~(ComplexTextLayoutFlags::BiDiRtl); if ( !bCTL && !bR2L) { // No CTL/Bidi checking necessary - nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED | TEXT_LAYOUT_BIDI_STRONG ); + nLayoutMode |= ( ComplexTextLayoutFlags::ComplexDisabled | ComplexTextLayoutFlags::BiDiStrong ); } else { // CTL/Bidi checking necessary // Don't use BIDI_STRONG, VCL must do some checks. - nLayoutMode &= ~( TEXT_LAYOUT_COMPLEX_DISABLED | TEXT_LAYOUT_BIDI_STRONG ); + nLayoutMode &= ~ComplexTextLayoutFlags( ComplexTextLayoutFlags::ComplexDisabled | ComplexTextLayoutFlags::BiDiStrong ); if ( bR2L ) - nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT; + nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl|ComplexTextLayoutFlags::TextOriginLeft; } pOutDev->SetLayoutMode( nLayoutMode ); diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 8b2d79420a56..5ed9ff583329 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -963,10 +963,10 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos, } // VCL will take care of brackets and so on... - ComplexTextLayoutMode nLayoutMode = pOutDev->GetLayoutMode(); - nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG); + ComplexTextLayoutFlags nLayoutMode = pOutDev->GetLayoutMode(); + nLayoutMode &= ~ComplexTextLayoutFlags(ComplexTextLayoutFlags::BiDiRtl|ComplexTextLayoutFlags::ComplexDisabled|ComplexTextLayoutFlags::BiDiStrong); if ( bRightToLeftPara ) - nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT | TEXT_LAYOUT_BIDI_STRONG; + nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::TextOriginLeft | ComplexTextLayoutFlags::BiDiStrong; pOutDev->SetLayoutMode( nLayoutMode ); if(bStrippingPortions) |