diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-09 11:40:25 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-14 11:38:31 +0000 |
| commit | bf369b2c653297d722d41e56fd71425526a44a72 (patch) | |
| tree | 5499eb085d35e26389d3253f89b2ae4e4e27ab70 /editeng/source | |
| parent | 8b91fab964710f109bb1beb3be119560621ab466 (diff) | |
Resolves: fdo#67743 user autocorr file not written
regression since c9c2fbe485de2bb831bd2e58faef87a19ceff622
revert the logic change and keep the OUString conversion
Change-Id: Ia4f8c3be2b6e325122ae7b21c431c301b8afecad
(cherry picked from commit d2c3297eed9917c110da67b2a4c19265aecb38ed)
Reviewed-on: https://gerrit.libreoffice.org/5325
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 447c22283f7e7d592a5653925f9c1bbc7fa3766a)
Reviewed-on: https://gerrit.libreoffice.org/5390
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'editeng/source')
| -rw-r--r-- | editeng/source/misc/svxacorr.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index e7a3d311dbc2..7be7da15137a 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1545,7 +1545,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 ); @@ -1559,17 +1561,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); |