diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 12:29:07 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 12:29:07 +0000 |
| commit | 50f04a716eb7c34827980c47e065e59b93966001 (patch) | |
| tree | 905d14a395ba27bc9b079821555285eac9ecda32 /svx/source/editeng/impedit2.cxx | |
| parent | INTEGRATION: CWS tl53 (1.112.8); FILE MERGED (diff) | |
| download | core-50f04a716eb7c34827980c47e065e59b93966001.tar.gz core-50f04a716eb7c34827980c47e065e59b93966001.zip | |
INTEGRATION: CWS tl53 (1.120.8); FILE MERGED
2008/06/25 12:42:36 tl 1.120.8.2: RESYNC: (1.120-1.121); FILE MERGED
2008/06/10 08:15:42 tl 1.120.8.1: #i67789# warning-free code corrected
Diffstat (limited to 'svx/source/editeng/impedit2.cxx')
| -rw-r--r-- | svx/source/editeng/impedit2.cxx | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx index d51edae22cb2..e7c7a258c22d 100644 --- a/svx/source/editeng/impedit2.cxx +++ b/svx/source/editeng/impedit2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: impedit2.cxx,v $ - * $Revision: 1.121 $ + * $Revision: 1.122 $ * * This file is part of OpenOffice.org. * @@ -972,10 +972,8 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM& UErrorCode nError = U_ZERO_ERROR; UBiDi* pBidi = ubidi_openSized( aLine.Len(), 0, &nError ); - //TODO The following line needs to be fixed, see #i67789#: - const BYTE nDefaultDir = sal::static_int_cast< BYTE >( - IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR ); - ubidi_setPara( pBidi, pLineString, aLine.Len(), nDefaultDir, NULL, &nError ); + const UBiDiLevel nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 /*LTR*/; + ubidi_setPara( pBidi, pLineString, aLine.Len(), nBidiLevel, NULL, &nError ); USHORT nVisPos = bStart ? 0 : aLine.Len()-1; USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError ); @@ -1096,10 +1094,8 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM UErrorCode nError = U_ZERO_ERROR; UBiDi* pBidi = ubidi_openSized( aLine.Len(), 0, &nError ); - //TODO The following line needs to be fixed, see #i67789#: - const BYTE nDefaultDir = sal::static_int_cast< BYTE >( - IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR); - ubidi_setPara( pBidi, pLineString, aLine.Len(), nDefaultDir, NULL, &nError ); + const UBiDiLevel nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 /*LTR*/; + ubidi_setPara( pBidi, pLineString, aLine.Len(), nBidiLevel, NULL, &nError ); if ( !pEditView->IsInsertMode() ) { @@ -1856,10 +1852,8 @@ void ImpEditEngine::InitWritingDirections( USHORT nPara ) } } - //TODO The following line needs to be fixed, see #i67789#: - const BYTE nDefaultDir = sal::static_int_cast< BYTE >( - IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR ); - if ( ( bCTL || ( nDefaultDir == UBIDI_RTL ) ) && pParaPortion->GetNode()->Len() ) + const UBiDiLevel nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 /*LTR*/; + if ( ( bCTL || ( nBidiLevel == 1 /*RTL*/ ) ) && pParaPortion->GetNode()->Len() ) { String aText( *pParaPortion->GetNode() ); @@ -1871,7 +1865,7 @@ void ImpEditEngine::InitWritingDirections( USHORT nPara ) UBiDi* pBidi = ubidi_openSized( aText.Len(), 0, &nError ); nError = U_ZERO_ERROR; - ubidi_setPara( pBidi, aText.GetBuffer(), aText.Len(), nDefaultDir, NULL, &nError ); + ubidi_setPara( pBidi, aText.GetBuffer(), aText.Len(), nBidiLevel, NULL, &nError ); nError = U_ZERO_ERROR; long nCount = ubidi_countRuns( pBidi, &nError ); |