diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-03-04 16:56:53 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-03-04 16:56:53 +0100 |
| commit | 08e4a33966786b29550406fbd20ec8bb4f04d5b4 (patch) | |
| tree | 1b184355689670680ac48eeefb4144babc76bea9 /editeng | |
| parent | bafef6a9e36380c7c75169e600632914fe099453 (diff) | |
| parent | 5b932053079c0ed73ea23fd802d5f2f7c291ec25 (diff) | |
Merge tag 'libreoffice-3.6.5.2' into suse-3.6
Tag libreoffice-3.6.5.2
Conflicts:
editeng/source/editeng/impedit3.cxx
instsetoo_native/util/openoffice.lst
oovbaapi/UnoApi_oovbaapi.mk
sc/source/filter/oox/workbookhelper.cxx
sc/source/ui/app/scmod.cxx
sc/source/ui/cctrl/checklistmenu.cxx
solenv/inc/minor.mk
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/DomainMapper_Impl.hxx
writerfilter/source/dmapper/PropertyMap.cxx
Change-Id: I7ea70b82b3b874cbe78354d5dd97307e63842e72
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/misc/svxacorr.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 6d2440b25009..084a79f0346c 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -888,7 +888,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, { // valid separator -> replace String sChar( *pWordStt ); - sChar = rCC.uppercase( sChar ); + sChar = rCC.titlecase( sChar ); //see fdo#56740 return sChar != *pWordStt && rDoc.ReplaceRange( xub_StrLen( pWordStt - pStart ), 1, sChar ); } @@ -1064,7 +1064,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, sal_Unicode cSave = *pWordStt; nSttPos = sal::static_int_cast< xub_StrLen >( pWordStt - rTxt.GetBuffer() ); String sChar( cSave ); - sChar = rCC.uppercase( sChar ); + sChar = rCC.titlecase( sChar ); //see fdo#56740 sal_Bool bRet = sChar.GetChar(0) != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar ); // Parahaps someone wants to have the word |