diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2014-07-02 08:19:37 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-02 11:47:01 +0000 |
| commit | 0390ebd3d3d45145d07c865a25064b320de44608 (patch) | |
| tree | e5689886dcd77dbbfdbf75765478b0fdf2d7b701 /accessibility | |
| parent | c482a2f87ef2a38d249c276924e071bbc714a07f (diff) | |
Related: #i124856# guard against crash
Patch By: hanya
Review By: jsc
(cherry picked from commit efe87c0d84e5f76034378d48d0d1fc2025a37645)
Conflicts:
accessibility/source/standard/vclxaccessiblebox.cxx
(cherry picked from commit 192e087f97166d2b3ff6151de04d16abbe45a1d4)
Conflicts:
accessibility/source/standard/vclxaccessiblebox.cxx
Change-Id: I24fd4278406dacea33230cc1bf1528e3c5aaedf2
Reviewed-on: https://gerrit.libreoffice.org/10029
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/source/standard/vclxaccessiblebox.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index a1281db2489c..2e49375a2c43 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -175,11 +175,11 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven } case VCLEVENT_COMBOBOX_SELECT: { - VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get()); - if (pList != NULL) - { - Reference<XAccessibleText> xText (m_xText->getAccessibleContext(), UNO_QUERY); - if ( xText.is() ) + VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get()); + if (pList != NULL && m_xText.is()) + { + Reference<XAccessibleText> xText (m_xText->getAccessibleContext(), UNO_QUERY); + if ( xText.is() ) { ::rtl::OUString sText = xText->getSelectedText(); if ( sText.isEmpty() ) @@ -195,7 +195,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue); } - } + } break; } //case VCLEVENT_DROPDOWN_OPEN: |