strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[cbosdo05] Misc fixes in nbsp autocorrection

Browse source
This commit is contained in:
Cédric Bosdonnat 2010-03-16 11:50:00 +01:00
parent 81e58ee7da
commit a0656615e7
1 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
editeng/source/misc/svxacorr.cxx
View file

@ -669,7 +669,7 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
// Check the presence of "://" in the word
xub_StrLen nStrPos = rTxt.Search( String::CreateFromAscii( "://" ), nSttWdPos + 1 );
if ( STRING_NOTFOUND == nStrPos )
if ( STRING_NOTFOUND == nStrPos && nEndPos > 0 )
{
// Check the previous char
sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 );
@ -693,9 +693,12 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
// Add the non-breaking space at the end pos
if ( bHasSpace )
rDoc.Insert( nPos, CHAR_HARDBLANK );
bRunNext = true;
bRet = true;
}
}
else if ( chars.indexOf( sal_Unicode( cPrevChar ) ) != -1 )
bRunNext = true;
}
}
else if ( cChar == '/' )
@ -711,9 +714,6 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
}
}
// Run on the next character if nbsp added
bRunNext = bRet;
return bRet;
}
@ -1192,21 +1192,12 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
BOOL bInsert )
{
ULONG nRet = 0;
bool bIsNextRun = bRunNext;
bRunNext = false; // if it was set, then it has to be turned off
do{ // only for middle check loop !!
if( cChar )
{
// Remove the NBSP if it wasn't an autocorrection
if ( !IsAutoCorrectChar( cChar ) && IsAutoCorrFlag( AddNonBrkSpace ) )
{
if ( NeedsHardspaceAutocorr( rTxt.GetChar( nInsPos - 1 ) ) &&
isblank( (unsigned char) cChar) == 0 )
{
rDoc.Delete( nInsPos - 2, nInsPos - 1 );
}
}
//JP 10.02.97: doppelte Spaces verhindern
if( nInsPos && ' ' == cChar &&
IsAutoCorrFlag( IgnoreDoubleSpace ) &&
@ -1242,10 +1233,38 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
rDoc.Replace( nInsPos, cChar );
// Hardspaces autocorrection
if ( NeedsHardspaceAutocorr( cChar ) && IsAutoCorrFlag( AddNonBrkSpace ) &&
FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos, FALSE ) ) )
if ( IsAutoCorrFlag( AddNonBrkSpace ) )
{
nRet = AddNonBrkSpace;
if ( NeedsHardspaceAutocorr( cChar ) &&
FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos, FALSE ) ) )
{
nRet = AddNonBrkSpace;
}
else if ( bIsNextRun && !IsAutoCorrectChar( cChar ) )
{
// Remove the NBSP if it wasn't an autocorrection
if ( NeedsHardspaceAutocorr( rTxt.GetChar( nInsPos - 1 ) ) && isblank( (unsigned char) cChar) == 0 )
{
// Look for the last HARD_SPACE
xub_StrLen nPos = nInsPos - 1;
bool bFound = false;
while ( nPos != STRING_NOTFOUND && !bFound )
{
sal_Unicode cTmpChar = rTxt.GetChar( nPos );
if ( cTmpChar == CHAR_HARDBLANK )
bFound = true;
else if ( !NeedsHardspaceAutocorr( cTmpChar ) )
nPos = STRING_NOTFOUND;
nPos--;
}
if ( bFound && nPos != STRING_NOTFOUND )
{
rDoc.Delete( nPos + 1, nPos + 2 );
nRet = AddNonBrkSpace;
}
}
}
}
}