[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - editeng/source vcl/aqua

[Caolán McNamara]

 editeng/source/misc/svxacorr.cxx              |   13 ++++++++-----
 vcl/aqua/source/a11y/aqua11yfocuslistener.cxx |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 447c22283f7e7d592a5653925f9c1bbc7fa3766a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 9 11:40:25 2013 +0100

    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 at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

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);
commit 7828ef17579ca132735e9b37462e6c7c591b3e3c
Author: Boris Dušek <me at dusek.me>
Date:   Fri Aug 2 00:36:54 2013 +0200

    Revert "fdo#54320: VoiceOver does not follow keyboard focus"
    
    The code was correct (and docs confusing). The code did not work because
    67410 was not fixed at that moment. With 67410 fixed, the code works
    as it was originally.
    
    Also in the meantime I discovered a comment in the NSAccessibility.h header
    telling that NSAccessibilityPostNotification should be passed the newly focused
    element and that the function itself will make sure to post the notification
    on the NSApp element instead.
    
    This reverts commit e9257fa0e642de2f1c79f2c80387334010812dab.
    
    Change-Id: I7f76ebde963cf57879273d9848ff195877759524
    Reviewed-on: https://gerrit.libreoffice.org/5278
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index ace2616..5a0c339 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
@@ -83,7 +83,7 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAcc
             if( xContext.is() )
             {
                 m_focusedObject = [ AquaA11yFactory wrapperForAccessibleContext: xContext ];
-                NSAccessibilityPostNotification(NSApp, NSAccessibilityFocusedUIElementChangedNotification);
+                NSAccessibilityPostNotification(m_focusedObject, NSAccessibilityFocusedUIElementChangedNotification);
             }
         }
     } catch(const RuntimeException &) {