[Libreoffice-commits] core.git: sc/source

Tor Lillqvist tml at collabora.com
Tue Sep 5 08:21:31 UTC 2017


 sc/source/core/data/formulacell.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 688b30f33510a7b8c5989daa86cba9252031142c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 5 11:20:22 2017 +0300

    Revert "Make two slightly mysterious static local variables thread_local"
    
    Temporarily revert until somebody can figure out what to do with the
    obsolete Mac toolchain on some tinderbox.
    
    This reverts commit 5f847b3d197a96e5c2bab3d9129d3dd9d5b75873.

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 22ef81ca2495..82c5f970e911 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2658,8 +2658,8 @@ sc::MatrixEdge ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) const
         case ScMatrixMode::Formula :
         case ScMatrixMode::Reference :
         {
-            static thread_local SCCOL nC;
-            static thread_local SCROW nR;
+            static SCCOL nC;
+            static SCROW nR;
             ScAddress aOrg;
             if ( !GetMatrixOrigin( aOrg ) )
                 return sc::MatrixEdge::Nothing;


More information about the Libreoffice-commits mailing list