Resolves: fdo#67743 user autocorr file not written

0001-Resolves-fdo-67743-user-autocorr-file-not-written.patch

@@ -0,0 +1,56 @@
+From 3460b450a13fac7a37cd753e6858b18cbb69ff7f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Fri, 9 Aug 2013 11:40:25 +0100
+Subject: [PATCH] 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)
+---
+ editeng/source/misc/svxacorr.cxx | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
+index e7a3d31..7be7da1 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);
+-- 
+1.8.3.1
+

libreoffice.spec

@@ -43,7 +43,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.4
-Release:        5%{?libo_prerelease}%{?dist}
+Release:        6%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/default/
@@ -262,6 +262,7 @@ Patch24: 0001-sanitize-system-clucene-includes.patch
 Patch25: 0001-Resolves-rhbz-989686-Fix-crash-with-ooo120774-1.doc.patch
 Patch26: 0001-rhbz-989246-Honor-user-s-JavaDriverClass-override-in.patch
 Patch27: 0001-fdo-67045-fix-several-nasty-screen-selection-issues-.patch
+Patch28: 0001-Resolves-fdo-67743-user-autocorr-file-not-written.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1021,6 +1022,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch25 -p1 -b .rhbz-989686-Fix-crash-with-ooo120774-1.doc.patch
 %patch26 -p1 -b .rhbz-989246-Honor-user-s-JavaDriverClass-override-in.patch
 %patch27 -p1 -b .fdo-67045-fix-several-nasty-screen-selection-issues-.patch
+%patch28 -p1 -b .fdo-67743-user-autocorr-file-not-written.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2107,6 +2109,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri Aug 09 2013 Caolán McNamara <caolanm@redhat.com> - 1:4.1.0.4-6
+- Resolves: fdo#67743 user autocorr file not written
+
 * Tue Jul 30 2013 Stephan Bergmann <sbergman@redhat.com> - 1:4.1.0.4-5
 - Resolves: rhbz#989246 Honor user's JavaDriverClass override in mysql driver
 - Resolves: fdo#67045 fix several nasty screen selection issues