diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2015-01-15 10:35:32 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-02-23 10:34:10 +0100 |
| commit | d110b7e8de1d811fe5b34c41c94a65d4f2de0fba (patch) | |
| tree | 533bc0788dd446cc901b54b3fda00370ed507b03 | |
| parent | 6687c994b5d5b70f500712bf7df1dc7e41e14876 (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/14449
(cherry picked from commit 8e89b2673af9e135b74ad93b08737962d6fee3d8)
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 2e066af8d01d..d41de272f6f5 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; |