summaryrefslogtreecommitdiff
path: root/sc/source/ui/unoobj/scdetect.cxx
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-04-09 13:00:25 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-04-09 13:01:27 -0400
commit91ecff9e0c430424022e2b1197890bedcd359172 (patch)
tree7a8e6bf6fecd4e84417c776a2fe4360b953d4756 /sc/source/ui/unoobj/scdetect.cxx
parent0ce9083428d8181a30de1d11d511382ce101c543 (diff)
Get the whole thing to build after the SfxFilter interface change.
Change-Id: I62122e298f1434aa9e44c8f3fdfb7f710513617d
Diffstat (limited to 'sc/source/ui/unoobj/scdetect.cxx')
-rw-r--r--sc/source/ui/unoobj/scdetect.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index e40be82dda5e..6d8a7dc7ad22 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -432,9 +432,9 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
SvStream* pStream = aMedium.GetInStream();
const SfxFilter* pPreselectedFilter = pFilter;
bool bCsvSelected = (pPreselectedFilter &&
- pPreselectedFilter->GetFilterName().EqualsAscii( pFilterAscii ));
+ pPreselectedFilter->GetFilterName().equalsAscii(pFilterAscii));
bool bExcelSelected = (pPreselectedFilter &&
- (pPreselectedFilter->GetName().SearchAscii("Excel") != STRING_NOTFOUND));
+ (pPreselectedFilter->GetName().indexOf("Excel") >= 0));
bool bIsXLS = (bExcelSelected || (bCsvSelected && !aPreselectedFilterName.Len()));
pFilter = 0;
if ( pStream )
@@ -671,7 +671,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
pFilter = aMatcher.GetFilter4FilterName( OUString(pFilterAscii) );
bFakeXLS = true;
}
- else if ( pPreselectedFilter->GetName().EqualsAscii(pFilterDBase) && lcl_MayBeDBase( rStr ) )
+ else if ( pPreselectedFilter->GetName().equalsAscii(pFilterDBase) && lcl_MayBeDBase( rStr ) )
pFilter = pPreselectedFilter;
else if ( bCsvSelected && bMaybeText )
pFilter = pPreselectedFilter;
@@ -686,7 +686,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
// "foo <br> bar" with a preselected CSV
// filter. So keep this detection to the end.
- if ( pPreselectedFilter->GetName().EqualsAscii(pFilterHtml) )
+ if (pPreselectedFilter->GetName().equalsAscii(pFilterHtml))
{
pFilter = pPreselectedFilter;
}