Resolves: fdo#67743 user autocorr file not written

regression since c9c2fbe485de2bb831bd2e58faef87a19ceff622

revert the logic change and keep the OUString conversion

Change-Id: Ia4f8c3be2b6e325122ae7b21c431c301b8afecad
This commit is contained in:
Caolán McNamara 2013-08-09 11:40:25 +01:00
parent 0136b4e524
commit d2c3297eed

View File

@ -1542,7 +1542,9 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi
{
OSL_ENSURE(pLangTable->find(eLang) == pLangTable->end(), "Language already exists ");
OUString sShareDirFile( GetAutoCorrFileName( eLang, sal_True, sal_False ));
OUString sUserDirFile( GetAutoCorrFileName( eLang, sal_True, sal_False ));
OUString sShareDirFile( sUserDirFile );
SvxAutoCorrectLanguageListsPtr pLists = 0;
Time nMinTime( 0, 2 ), nAktTime( Time::SYSTEM ), nLastCheckTime( Time::EMPTY );
@ -1556,17 +1558,18 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi
// 2 minutes.
if( bNewFile )
{
pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sShareDirFile );
sShareDirFile = sUserDirFile;
pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sUserDirFile );
pLangTable->insert(eLang, pLists);
aLastFileTable.erase(nFndPos);
}
}
else if( ( FStatHelper::IsDocument( sShareDirFile ) ||
else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
FStatHelper::IsDocument( sShareDirFile =
GetAutoCorrFileName( eLang, sal_False, sal_False ) ) ) ||
( sShareDirFile = sShareDirFile, bNewFile ))
( sShareDirFile = sUserDirFile, bNewFile ))
{
pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sShareDirFile );
pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sUserDirFile );
pLangTable->insert(eLang, pLists);
if (nFndPos != aLastFileTable.end())
aLastFileTable.erase(nFndPos);