diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-08 07:17:00 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-11 00:26:54 +0000 |
| commit | 9db5cfc889403e923a41dc88b07d0c973d227552 (patch) | |
| tree | 7378e18b7138d8ff1a03293c44f8203587141ec5 /editeng/source | |
| parent | d5e7e817980bfce29196dc55a20270201f77c673 (diff) | |
Drop ComplexDisabled flags that does nothing
There is no such thing as simple text layout in this brave new world.
Change-Id: I641b7efa5ec8fdd9839c291e7f2fdb736361ef1e
Reviewed-on: https://gerrit.libreoffice.org/31824
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'editeng/source')
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 10 | ||||
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index bcfb89e8bddc..cd90dbbbc3d8 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -679,8 +679,6 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) } } - // 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 ); @@ -4255,14 +4253,14 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_Int32 nPara, if ( !bCTL && !bR2L) { - // No CTL/Bidi checking necessary - nLayoutMode |= ( ComplexTextLayoutFlags::ComplexDisabled | ComplexTextLayoutFlags::BiDiStrong ); + // No Bidi checking necessary + nLayoutMode |= ComplexTextLayoutFlags::BiDiStrong; } else { - // CTL/Bidi checking necessary + // Bidi checking necessary // Don't use BIDI_STRONG, VCL must do some checks. - nLayoutMode &= ~ComplexTextLayoutFlags( ComplexTextLayoutFlags::ComplexDisabled | ComplexTextLayoutFlags::BiDiStrong ); + nLayoutMode &= ~ComplexTextLayoutFlags( ComplexTextLayoutFlags::BiDiStrong ); if ( bR2L ) nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl|ComplexTextLayoutFlags::TextOriginLeft; diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index a77e88199fa4..3e50f60bd605 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -955,7 +955,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos, // VCL will take care of brackets and so on... ComplexTextLayoutFlags nLayoutMode = pOutDev->GetLayoutMode(); - nLayoutMode &= ~ComplexTextLayoutFlags(ComplexTextLayoutFlags::BiDiRtl|ComplexTextLayoutFlags::ComplexDisabled|ComplexTextLayoutFlags::BiDiStrong); + nLayoutMode &= ~ComplexTextLayoutFlags(ComplexTextLayoutFlags::BiDiRtl|ComplexTextLayoutFlags::BiDiStrong); if ( bRightToLeftPara ) nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::TextOriginLeft | ComplexTextLayoutFlags::BiDiStrong; pOutDev->SetLayoutMode( nLayoutMode ); |