|
 |
f325b2 |
From 7581b5de05259dfcf65fc0d3b6fa565f74acaf8a Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
Message-Id: <7581b5de05259dfcf65fc0d3b6fa565f74acaf8a.1462364344.git.erack@redhat.com>
|
|
|
f325b2 |
From: Eike Rathke <erack@redhat.com>
|
|
|
f325b2 |
Date: Wed, 4 May 2016 13:41:59 +0200
|
|
|
f325b2 |
Subject: [PATCH] Resolves: tdf#94146 a11y crash, obtain formula using the
|
|
|
f325b2 |
correct pointer
|
|
|
f325b2 |
MIME-Version: 1.0
|
|
|
f325b2 |
Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
|
|
|
f325b2 |
|
|
|
f325b2 |
This is a multi-part message in MIME format.
|
|
|
f325b2 |
--------------erAck-patch-parts
|
|
|
f325b2 |
Content-Type: text/plain; charset=UTF-8; format=fixed
|
|
|
f325b2 |
Content-Transfer-Encoding: 8bit
|
|
|
f325b2 |
|
|
|
f325b2 |
|
|
|
f325b2 |
Fallout from IAccessible2 integration. Of the union, wrong string
|
|
|
f325b2 |
pointer instead of formula cell pointer was used.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I1afaf0ffff14a770ab52e8cbf880708bd66b3ef2
|
|
|
f325b2 |
(cherry picked from commit 3a767d91bfa70af4303b905cefa038181d56cc9a)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sc/source/ui/view/tabvwsh.cxx | 3 ++-
|
|
|
f325b2 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
|
|
|
f325b2 |
--------------erAck-patch-parts
|
|
|
f325b2 |
Content-Type: text/x-patch; name="0001-Resolves-tdf-94146-a11y-crash-obtain-formula-using-t.patch"
|
|
|
f325b2 |
Content-Transfer-Encoding: 8bit
|
|
|
f325b2 |
Content-Disposition: attachment; filename="0001-Resolves-tdf-94146-a11y-crash-obtain-formula-using-t.patch"
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
|
|
|
f325b2 |
index 632757d..0675e69 100644
|
|
|
f325b2 |
--- a/sc/source/ui/view/tabvwsh.cxx
|
|
|
f325b2 |
+++ b/sc/source/ui/view/tabvwsh.cxx
|
|
|
f325b2 |
@@ -39,6 +39,7 @@
|
|
|
f325b2 |
#include "dwfunctr.hxx"
|
|
|
f325b2 |
#include "sc.hrc"
|
|
|
f325b2 |
#include "spelldialog.hxx"
|
|
|
f325b2 |
+#include "formulacell.hxx"
|
|
|
f325b2 |
#include <searchresults.hxx>
|
|
|
f325b2 |
|
|
|
f325b2 |
#include <sfx2/request.hxx>
|
|
|
f325b2 |
@@ -116,7 +117,7 @@ OUString ScTabViewShell::GetFormula(ScAddress& rAddress)
|
|
|
f325b2 |
aCell.assign(*pDoc, rAddress);
|
|
|
f325b2 |
if (!aCell.isEmpty() && aCell.meType == CELLTYPE_FORMULA)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- sFormula = aCell.mpString->getString();
|
|
|
f325b2 |
+ aCell.mpFormula->GetFormula( sFormula);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
return sFormula;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
--------------erAck-patch-parts--
|
|
|
f325b2 |
|
|
|
f325b2 |
|