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
commit1e5f0d00b30f5fd85fd224fc73cc26d5ecbc2099 (patch)
tree76b3ad91ab8367f5c008c907fd6441b1aff72666
parent30447aa878487763f426eaf1c5f135139a95d3ea (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 7e3770c57..21b3e2030 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 )