[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - formula/source

[Winfried Donkers]

 formula/source/core/api/FormulaCompiler.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8e89b2673af9e135b74ad93b08737962d6fee3d8
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Thu Jan 15 10:35:32 2015 +0100

    fdo#87534 fix HYPERLINK behaviour when used in names
    
    When using HYPERLINK() in names, the hyperlink was set to disabled
    on copying token. After fix, behaviour is consistent.
    
    Note: reducing the fix to 1 line does not work, a set hyperlink
    is only to be copied when applicable.
    
    Change-Id: I27ad24ed8912afa548f08d249ad51d18a792c275
    Reviewed-on: https://gerrit.libreoffice.org/13920
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 944886f6d96843ca4f5833ecca48a693c81abc3b)
    Reviewed-on: https://gerrit.libreoffice.org/14449

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 2e066af..d41de27 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1714,6 +1714,8 @@ void FormulaCompiler::PopTokenArray()
         else if ( !pArr->IsRecalcModeNormal() && p->pArr->IsRecalcModeNormal() )
             p->pArr->SetMaskedRecalcMode( pArr->GetRecalcMode() );
         p->pArr->SetCombinedBitsRecalcMode( pArr->GetRecalcMode() );
+        if ( pArr->IsHyperLink() )  // fdo 87534
+            p->pArr->SetHyperLink( true );
         if( p->bTemp )
             delete pArr;
         pArr = p->pArr;