diff options
| author | os <os@openoffice.org> | 2011-02-16 13:23:44 +0100 |
|---|---|---|
| committer | os <os@openoffice.org> | 2011-02-16 13:23:44 +0100 |
| commit | 9310807dd3af0d878d0989dbab48ea10cb71780d (patch) | |
| tree | 0cd06b57b07e25453830c4d337c506695402a2f4 /editeng | |
| parent | b18b90648ef628467de81b23986954e25f9c268f (diff) | |
merge errors fixed
Diffstat (limited to 'editeng')
| -rwxr-xr-x[-rw-r--r--] | editeng/source/misc/svxacorr.cxx | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index c4133d6ffefe..1eebd5349fe4 100644..100755 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -140,7 +140,6 @@ inline int IsUpperLetter( sal_Int32 nCharType ) 0 == ( ::com::sun::star::i18n::KCharacterType::LOWER & nCharType); } -<<<<<<< local bool lcl_IsUnsupportedUnicodeChar( CharClass& rCC, const String& rTxt, xub_StrLen nStt, xub_StrLen nEnd ) { @@ -176,10 +175,7 @@ bool lcl_IsUnsupportedUnicodeChar( CharClass& rCC, const String& rTxt, return false; } -BOOL lcl_IsSymbolChar( CharClass& rCC, const String& rTxt, -======= sal_Bool lcl_IsSymbolChar( CharClass& rCC, const String& rTxt, ->>>>>>> other xub_StrLen nStt, xub_StrLen nEnd ) { for( ; nStt < nEnd; ++nStt ) @@ -1108,11 +1104,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, nSttPos = sal::static_int_cast< xub_StrLen >( pWordStt - rTxt.GetBuffer() ); String sChar( cSave ); rCC.toUpper( sChar ); -<<<<<<< local - BOOL bRet = sChar.GetChar(0) != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar ); -======= - sal_Bool bRet = sChar.GetChar(0) != cSave && rDoc.Replace( nSttPos, sChar ); ->>>>>>> other + sal_Bool bRet = sChar.GetChar(0) != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar ); // das Wort will vielleicht jemand haben if( bRet && SaveWordCplSttLst & nFlags ) @@ -1412,17 +1404,11 @@ sal_uLong SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, else { nRet = 0; -<<<<<<< local bool bUnsupported = lcl_IsUnsupportedUnicodeChar( rCC, rTxt, nCapLttrPos, nInsPos ); // Grossbuchstabe am Satz-Anfang ?? if( !bUnsupported && IsAutoCorrFlag( CptlSttSntnc ) && - FnCptlSttSntnc( rDoc, rTxt, TRUE, nCapLttrPos, nInsPos, eLang ) ) -======= - // Grossbuchstabe am Satz-Anfang ?? - if( IsAutoCorrFlag( CptlSttSntnc ) && FnCptlSttSntnc( rDoc, rTxt, sal_True, nCapLttrPos, nInsPos, eLang ) ) ->>>>>>> other nRet |= CptlSttSntnc; // Zwei Grossbuchstaben am Wort-Anfang ?? |