summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-07 11:29:59 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-07 12:19:24 +0000
commitf02cda1680da4816cae46805a1f0dd86c32ddbb8 (patch)
tree8fba4ff02a289dc872214d310dd774b241090a12 /sfx2
parentc3c9a1c38d45fa12db6298a441c09f3e7dfe57c7 (diff)
coverity#735847 Dereference after null check
Change-Id: I564d00d279d0b1cfee4eead4b9bc9b6e98a3b0f2
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/thumbnailviewacc.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index dfc274ba8a25..93e31bcb1ff6 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -217,13 +217,14 @@ OUString SAL_CALL ThumbnailViewAcc::getAccessibleName()
OUString aRet;
if ( mpParent )
- aRet = mpParent->GetAccessibleName();
-
- if ( aRet.isEmpty() )
{
- Window* pLabel = mpParent->GetAccessibleRelationLabeledBy();
- if ( pLabel && pLabel != mpParent )
- aRet = OutputDevice::GetNonMnemonicString( pLabel->GetText() );
+ aRet = mpParent->GetAccessibleName();
+ if (aRet.isEmpty())
+ {
+ Window* pLabel = mpParent->GetAccessibleRelationLabeledBy();
+ if (pLabel && pLabel != mpParent)
+ aRet = OutputDevice::GetNonMnemonicString( pLabel->GetText() );
+ }
}
return aRet;