summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
authorJürgen Schmidt <jsc@apache.org>2014-07-02 08:19:37 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-07-02 12:14:24 +0100
commit192e087f97166d2b3ff6151de04d16abbe45a1d4 (patch)
tree4fb0946904a07ccb60e753b2ffb3764770871478 /accessibility
parent0f1d72510a81094c245bfdb70f18ec15a7b557ce (diff)
Related: #i124856# guard against crash
Patch By: hanya Review By: jsc (cherry picked from commit efe87c0d84e5f76034378d48d0d1fc2025a37645) Conflicts: accessibility/source/standard/vclxaccessiblebox.cxx Change-Id: I24fd4278406dacea33230cc1bf1528e3c5aaedf2
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/source/standard/vclxaccessiblebox.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index f9a63d69952c..20aa8f3b6a7e 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -176,7 +176,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
case VCLEVENT_COMBOBOX_SELECT:
{
VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
- if (pList != NULL)
+ if (pList != NULL && m_xText.is())
{
Reference<XAccessibleText> xText (m_xText->getAccessibleContext(), UNO_QUERY);
if ( xText.is() )