summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-05-04 13:41:59 +0200
committerCaolán McNamara <caolanm@redhat.com>2016-05-05 14:36:11 +0000
commit84c6afa54def64d1ab548378caccde93b563d0f2 (patch)
treeee7260a13f040c41be8a78c212ecf1e10c4d0569
parent9197d8219e4b3ba4612c777710d65d325170de82 (diff)
Resolves: tdf#94146 a11y crash, obtain formula using the correct pointer
Fallout from IAccessible2 integration. Of the union, wrong string pointer instead of formula cell pointer was used. Change-Id: I1afaf0ffff14a770ab52e8cbf880708bd66b3ef2 (cherry picked from commit 3a767d91bfa70af4303b905cefa038181d56cc9a) Reviewed-on: https://gerrit.libreoffice.org/24652 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/ui/view/tabvwsh.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 480dd2262a2c..e902de6d6576 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -39,6 +39,7 @@
#include "dwfunctr.hxx"
#include "sc.hrc"
#include "spelldialog.hxx"
+#include "formulacell.hxx"
#include <searchresults.hxx>
#include <sfx2/request.hxx>
@@ -115,7 +116,7 @@ OUString ScTabViewShell::GetFormula(ScAddress& rAddress)
ScRefCellValue aCell(*pDoc, rAddress);
if (!aCell.isEmpty() && aCell.meType == CELLTYPE_FORMULA)
{
- sFormula = aCell.mpString->getString();
+ aCell.mpFormula->GetFormula( sFormula);
}
return sFormula;
}