summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2010-10-28 12:15:46 +0200
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2010-10-28 12:16:37 +0200
commit28785dce3c055589e560f8a0a128ced44827df99 (patch)
treefebb4655a0507d97f82dbff703396ec067a966ff
parentb9d1610aa212c4283a8af73c6050a0e60993c484 (diff)
Fixed a condition: the filter needs to be checked for NULL in every case
-rw-r--r--sc/source/ui/unoobj/scdetect.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 5b9dcc5d6180..d16edbbd9ea0 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -424,8 +424,8 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
bool bIsXLS = false;
SvStream* pStream = aMedium.GetInStream();
const SfxFilter* pPreselectedFilter = pFilter;
- if ( ( pPreselectedFilter && pPreselectedFilter->GetName().SearchAscii("Excel") != STRING_NOTFOUND ) ||
- ( !aPreselectedFilterName.Len() && pPreselectedFilter->GetFilterName().EqualsAscii( pFilterAscii ) ) )
+ if ( pPreselectedFilter && ( ( pPreselectedFilter->GetName().SearchAscii("Excel") != STRING_NOTFOUND ) ||
+ ( !aPreselectedFilterName.Len() && pPreselectedFilter->GetFilterName().EqualsAscii( pFilterAscii ) ) ) )
bIsXLS = true;
pFilter = 0;
if ( pStream )