summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinfried Donkers <winfrieddonkers@libreoffice.org>2015-01-15 10:35:32 +0100
committerEike Rathke <erack@redhat.com>2015-02-12 19:08:15 +0000
commit8d210d109667cdf38bc5d35a596e06dc1f888104 (patch)
treeb369cfa5eadd3abcd81d44be2fce939e80e0b387
parentdf38063461947c87419b10942909f72785f8895c (diff)
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@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 944886f6d96843ca4f5833ecca48a693c81abc3b) Reviewed-on: https://gerrit.libreoffice.org/14448
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 6c4f61765114..5b2e8ea35e26 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1715,6 +1715,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;