[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-5.2' - 9 commits - dictionaries helpcontent2 translations vcl/osx

[Tor Lillqvist]

 dictionaries        |    2 +-
 helpcontent2        |    2 +-
 translations        |    2 +-
 vcl/osx/salinst.cxx |    3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 83adc9c35c74e0badc710d981405858b1179a327
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 24 00:13:45 2016 +0300

    tdf#102382: nextEventMatchingMask should only be called from the Main Thread
    
    So don't then unless we are on the main thread.
    
    Change-Id: I6ba52ed7db5d73a4c1c6acf10bdf254a6f959da8

diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 3bbff24..9bb6570 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -736,6 +736,9 @@ bool AquaSalInstance::AnyInput( VclInputFlags nType )
         }
     }
 
+    if (![NSThread isMainThread])
+        return false;
+
     unsigned/*NSUInteger*/ nEventMask = 0;
     if( nType & VclInputFlags::MOUSE)
         nEventMask |=
commit e4fc5f4084ec3c06054080c7d741293650e36fb3
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Oct 28 14:35:11 2016 +0200

    Updated core
    Project: translations  564e0552d0a99c02a1505509390a41edc9d0f510
    
    update translations for 5.2.3 rc3
    
    and force-fix errors using pocheck
    
    Change-Id: I2c2e3004679ce3758d87bf12726ecf9253c29258

diff --git a/translations b/translations
index ec1ca91..564e055 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit ec1ca914d62125ac93e888bbc77e56e6bf93c8a5
+Subproject commit 564e0552d0a99c02a1505509390a41edc9d0f510
commit d0da577b6f91521d0b64c192418ab49fb54f4730
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Oct 28 11:17:39 2016 +0200

    Updated core
    Project: translations  ec1ca914d62125ac93e888bbc77e56e6bf93c8a5
    
    revert accidental commit to Slovenain translation
    
    This (partially) reverts commit 3997f3b634be28bfe7ad52abd46067798a8f227a.
    
    Change-Id: I8b3d33346427f4dd06f870598c002389acd4d5cb

diff --git a/translations b/translations
index 8e8e7ce..ec1ca91 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 8e8e7cee18581cfe2923246eba9e0b7edff71326
+Subproject commit ec1ca914d62125ac93e888bbc77e56e6bf93c8a5
commit d1889ba98a1b1a66079b85bb8bc9f2dfe805280a
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Oct 11 21:38:52 2016 +0200

    Updated core
    Project: translations  8e8e7cee18581cfe2923246eba9e0b7edff71326
    
    update translations for 5.2.3 rc1
    
    and force-fix errors using pocheck
    
    Change-Id: I3c922e1b91581f1b5cd6a5b8d0662a3e7aba0fae
    (cherry picked from commit 4a45b12af9d0be41780e5a29b73e8e595f3f430f)

diff --git a/translations b/translations
index 3997f3b..8e8e7ce 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3997f3b634be28bfe7ad52abd46067798a8f227a
+Subproject commit 8e8e7cee18581cfe2923246eba9e0b7edff71326
commit a1dad857cea16f5925794cde0ed67c99ad8b74a1
Author: jan Iversen <jani at documentfoundation.org>
Date:   Sun Oct 9 12:08:51 2016 +0200

    Updated core
    Project: translations  3997f3b634be28bfe7ad52abd46067798a8f227a
    
    pootle update
    
    Change-Id: Idb289de371f61cb434835da13d9269cc3db23988

diff --git a/translations b/translations
index 1754718..3997f3b 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 1754718df8df5b391008ce7bed9cab978966e37a
+Subproject commit 3997f3b634be28bfe7ad52abd46067798a8f227a
commit 2dc8119286da394be04911696809ebc88872b067
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Oct 3 19:54:26 2016 +0200

    Updated core
    Project: dictionaries  a5ac3e1d730e3fb84b2cc9c4108effeee613c6d2
    
    Update pt_PT dictionary to version 16.10.1.2
    
    Change-Id: I0f66f15b594bebaefc2b8ffbc26bff5450ebf292
    Reviewed-on: https://gerrit.libreoffice.org/29510
    Reviewed-by: Tiago Santos <tiagofsantos81 at sapo.pt>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dictionaries b/dictionaries
index 6417dbd..a5ac3e1 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 6417dbd05e13c2e1165751feb2bc7866328dec2d
+Subproject commit a5ac3e1d730e3fb84b2cc9c4108effeee613c6d2
commit f53d0f0a2331e06841a7899dd7e8cc631bafb45e
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Sep 10 10:08:17 2016 +0200

    Updated core
    Project: help  a80d1d6a3082e17138945c2294d654d5e05de572
    
    replace "also :" by "also:"
    
    reported via pootle feedback
    
    Change-Id: I075ba046e72791ac44d37580972ee270134c4a35
    Reviewed-on: https://gerrit.libreoffice.org/28797
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    (cherry picked from commit 6c8c4a5e044c5c22ca3acc7d968b096340562627)
    Reviewed-on: https://gerrit.libreoffice.org/28798
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index 3f4fadf..a80d1d6 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3f4fadf4e649f0b196c131ecc51e09921e35da85
+Subproject commit a80d1d6a3082e17138945c2294d654d5e05de572
commit 950c5288a6ecef645b8cbe393fbb6e0655302c5a
Author: Jan Iversen <jani at documentfoundation.org>
Date:   Tue Sep 6 22:03:17 2016 +0000

    Updated core
    Project: translations  1754718df8df5b391008ce7bed9cab978966e37a
    
    Update translations for 5.2.2
    
    Prepare for branching.
    
    Change-Id: I75b9787cedad853f51c668b2e4c25d55f3033b38

diff --git a/translations b/translations
index 42510aa..1754718 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 42510aa08ecb272537241e7d4afaf6539c5c97b0
+Subproject commit 1754718df8df5b391008ce7bed9cab978966e37a
commit 6dcd137715011446d770ff08e8d299474838a784
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Aug 24 20:49:05 2016 +0200

    Updated core
    Project: translations  42510aa08ecb272537241e7d4afaf6539c5c97b0
    
    update translations for 5.2.1 rc2
    
    and force-fix errors using pocheck
    
    Change-Id: I596fa1e8acc5be5e9ef1867b378b291a6853d935
    (cherry picked from commit cc220e305045212ebb6311476ff3999d88fa6def)

diff --git a/translations b/translations
index c000385..42510aa 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit c00038573d277bc17dfb3515b13b307a126e470c
+Subproject commit 42510aa08ecb272537241e7d4afaf6539c5c97b0