diff options
| author | Malte Timmermann <mt@openoffice.org> | 2002-07-17 09:01:18 +0000 |
|---|---|---|
| committer | Malte Timmermann <mt@openoffice.org> | 2002-07-17 09:01:18 +0000 |
| commit | e314e1b8aa3f1d98f2b33ce3f546d07eafa0f799 (patch) | |
| tree | 5e8c69b12e3d40cd6761bcc391c10dae3acfd730 /svx | |
| parent | 111ee0eb2c893deacac89cb8ff044a05bb5440a7 (diff) | |
#101117# Use Script Spacing only between CJK and other, not between CTL and LATIN
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/editeng/impedit3.cxx | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx index b827d1d17738..fe6083842153 100644 --- a/svx/source/editeng/impedit3.cxx +++ b/svx/source/editeng/impedit3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impedit3.cxx,v $ * - * $Revision: 1.67 $ + * $Revision: 1.68 $ * - * last change: $Author: mt $ $Date: 2002-07-17 09:39:10 $ + * last change: $Author: mt $ $Date: 2002-07-17 10:01:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1050,20 +1050,11 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) USHORT nPortionEnd = nTmpPos + pPortion->GetLen(); if( bScriptSpace && ( nPortionEnd < pNode->Len() ) && ( nTmpWidth < nXWidth ) && IsScriptChange( EditPaM( pNode, nPortionEnd ) ) ) { - // itrform2.cxx: - // BOOL bAllowBefore = rCC.isLetterNumeric( *pNode, nPortionEnd - 1 ); - // BOOL bAllowBehind = rCC.isLetterNumeric( *pNode, nPortionEnd ); - - BOOL bAllow = TRUE; - if ( pPortion->GetRightToLeft() ) - { - if ( nTmpPortion && pParaPortion->GetTextPortions().GetObject( nTmpPortion-1 )->GetRightToLeft() ) - bAllow = FALSE; - } - else - { - // Check if paragraph writing direction is R2L... - } + BOOL bAllow = FALSE; + USHORT nScriptTypeLeft = GetScriptType( EditPaM( pNode, nPortionEnd ) ); + USHORT nScriptTypeRight = GetScriptType( EditPaM( pNode, nPortionEnd+1 ) ); + if ( ( nScriptTypeLeft == i18n::ScriptType::ASIAN ) || ( nScriptTypeRight == i18n::ScriptType::ASIAN ) ) + bAllow = TRUE; // No spacing within L2R/R2L nesting if ( bAllow ) |