configure.ac | 5 ++++- drawinglayer/source/processor2d/vclprocessor2d.cxx | 4 ++-- editeng/source/editeng/impedit3.cxx | 18 +++++------------- 3 files changed, 11 insertions(+), 16 deletions(-)
New commits: commit 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3 Author: navin patidar <pati...@kacst.edu.sa> Date: Sun Feb 10 09:40:50 2013 +0300 fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag. Stop ImplLayoutArgs::ImplLayoutArgs() to perform ubidi algo on text by setting TEXT_LAYOUT_BIDI_STRONG flag. Change-Id: I7222517c1db6649eef0c0d9c11cbbbed1fc6bb04 Reviewed-on: https://gerrit.libreoffice.org/2076 Reviewed-by: Ahmad Harthi <aalhar...@kacst.edu.sa> Tested-by: Ahmad Harthi <aalhar...@kacst.edu.sa> diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index aeb83c2..adde6aa 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -268,8 +268,8 @@ namespace drawinglayer if(rTextCandidate.getFontAttribute().getRTL()) { - sal_uInt32 nRTLLayoutMode(nOldLayoutMode & ~(TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG)); - nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT; + sal_uInt32 nRTLLayoutMode(nOldLayoutMode & ~(TEXT_LAYOUT_COMPLEX_DISABLED)); + nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_TEXTORIGIN_LEFT; mpOutputDevice->SetLayoutMode(nRTLLayoutMode); } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 9860c84..f6f091b 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4274,18 +4274,13 @@ void ImpEditEngine::ImplInitDigitMode(OutputDevice* pOutDev, LanguageType eCurLa void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara, sal_uInt16 nIndex ) { - sal_Bool bCTL = sal_False; sal_Bool bR2L = sal_False; if ( nIndex == 0xFFFF ) { - bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX ); bR2L = IsRightToLeft( nPara ); } else { - ContentNode* pNode = GetEditDoc().GetObject( nPara ); - short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) ); - bCTL = nScriptType == i18n::ScriptType::COMPLEX; // this change was discussed in issue 37190 bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False; // it also works for issue 55927 @@ -4294,21 +4289,18 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara, sal_uLong nLayoutMode = pOutDev->GetLayoutMode(); // We always use the left postion for DrawText() - nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL); + // Let VCL do CTL checking + nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED); - if ( !bCTL && !bR2L) + if ( !bR2L ) { // No CTL/Bidi checking neccessary nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED | TEXT_LAYOUT_BIDI_STRONG ); } else { - // CTL/Bidi checking neccessary - // Don't use BIDI_STRONG, VCL must do some checks. - nLayoutMode &= ~( TEXT_LAYOUT_COMPLEX_DISABLED | TEXT_LAYOUT_BIDI_STRONG ); - - if ( bR2L ) - nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT; + //Use BIDI_STRONG, Stop VCL to perform ubidi algo on text. + nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT | TEXT_LAYOUT_BIDI_STRONG; } pOutDev->SetLayoutMode( nLayoutMode ); commit 69800aa08845955a1a8cedd126e27ac1ec352792 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Feb 25 10:18:03 2013 +0200 I am not so sure the --with-system-FOO-for-build options are superseded? Change-Id: If1990e43938c5653cd7444cbaaf8ade1ab4f7d1e diff --git a/configure.ac b/configure.ac index 0ea3acf..3d4166d 100644 --- a/configure.ac +++ b/configure.ac @@ -2011,7 +2011,10 @@ AC_ARG_WITH(macosx-version-max-allowed, dnl =================================================================== dnl options for stuff used during cross-compilation build -dnl These are superseded by --with-build-platform-configure-options +dnl These are superseded by --with-build-platform-configure-options. +dnl Or are they? Look for the complicated tests for "$cross_compiling" = "yes" -a \( +dnl "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force" \) +dnl far below. Could whoever understands MinGW cross-compilation clean up this please. dnl =================================================================== AC_ARG_WITH(system-boost-for-build, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits