[Libreoffice-commits] .: sc/source

[Cédric Bosdonnat]

 sc/source/ui/unoobj/scdetect.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1e5f0d00b30f5fd85fd224fc73cc26d5ecbc2099
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Thu Oct 28 12:15:46 2010 +0200

    Fixed a condition: the filter needs to be checked for NULL in every case

diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 7e3770c..21b3e20 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 )