[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source

[Eike Rathke]

 sc/source/ui/view/tabvwsh.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 84c6afa54def64d1ab548378caccde93b563d0f2
Author: Eike Rathke <erack at redhat.com>
Date:   Wed May 4 13:41:59 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 480dd22..e902de6 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;
 }