summaryrefslogtreecommitdiff
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
parent0ce9083428d8181a30de1d11d511382ce101c543 (diff)
Get the whole thing to build after the SfxFilter interface change.
Change-Id: I62122e298f1434aa9e44c8f3fdfb7f710513617d
-rw-r--r--framework/source/loadenv/loadenv.cxx2
-rw-r--r--sc/source/ui/unoobj/scdetect.cxx8
-rw-r--r--starmath/source/document.cxx2
-rw-r--r--sw/source/core/doc/docglbl.cxx2
-rw-r--r--sw/source/ui/app/docsh.cxx2
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx2
6 files changed, 10 insertions, 8 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 33956f1e96a1..86646d58ec4e 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -744,6 +744,7 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescrip
rFilter = "gnumeric";
return true;
}
+#if 0
else if (aURL.endsWith(".xlsx"))
{
rType = "generic_Text";
@@ -756,6 +757,7 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescrip
rFilter = "ods";
return true;
}
+#endif
return false;
}
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;
}
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 37e0b4d448c7..0e2aa3eaadc6 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -970,7 +970,7 @@ sal_Bool SmDocShell::ConvertTo( SfxMedium &rMedium )
aEquation.SetFlat(sal_True);
bRet = aEquation.Export(rMedium);
}
- else if( pFlt->GetFilterName().EqualsAscii("MathType 3.x"))
+ else if (pFlt->GetFilterName().equalsAscii("MathType 3.x"))
bRet = WriteAsMathType3( rMedium );
}
return bRet;
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index ddac41e81653..5c0eb98509cc 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -214,7 +214,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c
GetIDocumentUndoRedo().DoUndo(false);
SetRedlineMode_intern( (RedlineMode_t)(GetRedlineMode() & ~nsRedlineMode_t::REDLINE_ON));
- String sExt( pFilter->GetSuffixes().GetToken(0, ',') );
+ String sExt = pFilter->GetSuffixes().getToken(0, ',');
if( !sExt.Len() )
sExt.AssignAscii( "sxw" );
if( '.' != sExt.GetChar( 0 ) )
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index e961da17cb99..3a3194ab64f9 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -193,7 +193,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False);
nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE;
- if( pFlt->GetDefaultTemplate().Len() )
+ if (!pFlt->GetDefaultTemplate().isEmpty())
pRead->SetTemplateName( pFlt->GetDefaultTemplate() );
if( pRead == ReadAscii && 0 != rMedium.GetInStream() &&
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index c7ce0395d406..51db9f330ce6 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1140,7 +1140,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
//convert fields to text if we are exporting to PDF
//this prevents a second merge while updating the fields in SwXTextDocument::getRendererCount()
- if( pStoreToFilter && pStoreToFilter->GetFilterName().EqualsAscii("writer_pdf_Export"))
+ if( pStoreToFilter && pStoreToFilter->GetFilterName().equalsAscii("writer_pdf_Export"))
rWorkShell.ConvertFieldsToText();
xWorkDocSh->DoSaveAs(*pDstMed);
xWorkDocSh->DoSaveCompleted(pDstMed);