[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - accessibility/source
Jürgen Schmidt
jsc at apache.org
Wed Jul 2 04:47:27 PDT 2014
accessibility/source/standard/vclxaccessiblebox.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 0390ebd3d3d45145d07c865a25064b320de44608
Author: Jürgen Schmidt <jsc at apache.org>
Date: Wed Jul 2 08:19:37 2014 +0000
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 at redhat.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index a1281db..2e49375 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:
More information about the Libreoffice-commits
mailing list