diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-18 13:45:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-19 10:14:22 +0200 |
| commit | ab0806e183fcdc8b2e4eca2d29b877a41f3ded8b (patch) | |
| tree | 94baa798fcb7882431eacb3df6e631b67b2f6e75 /sd | |
| parent | 4bbbbee8ba2395bb09fc83cbf4598085c3ef0d5f (diff) | |
convert sd/.../fuinsfil.hxx from String to OUString
Change-Id: I8d2847ba00730be8c2fd7814ee41021119e25cfa
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuinsfil.cxx | 20 | ||||
| -rw-r--r-- | sd/source/ui/inc/fuinsfil.hxx | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index d6d663147844..d789de78a3c1 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -282,10 +282,10 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) { sal_Bool bFound = ( ::std::find( aFilterVector.begin(), aFilterVector.end(), pFilter->GetMimeType() ) != aFilterVector.end() ); if( !bFound && - ( aFilterName.SearchAscii( "Text" ) != STRING_NOTFOUND || - aFilterName.SearchAscii( "Rich" ) != STRING_NOTFOUND || - aFilterName.SearchAscii( "RTF" ) != STRING_NOTFOUND || - aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND ) ) + ( aFilterName.indexOf( "Text" ) != -1 || + aFilterName.indexOf( "Rich" ) != -1 || + aFilterName.indexOf( "RTF" ) != -1 || + aFilterName.indexOf( "HTML" ) != -1 ) ) { bFound = sal_True; } @@ -428,9 +428,9 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) // selected file format: text, RTF or HTML (default is text) sal_uInt16 nFormat = EE_FORMAT_TEXT; - if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND ) + if( aFilterName.indexOf( "Rich") != -1 ) nFormat = EE_FORMAT_RTF; - else if( aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND ) + else if( aFilterName.indexOf( "HTML" ) != -1 ) nFormat = EE_FORMAT_HTML; /* create our own outline since: @@ -446,7 +446,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); aLayoutName = pPage->GetLayoutName(); - aLayoutName.Erase(aLayoutName.SearchAscii(SD_LT_SEPARATOR)); + aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)); pOutliner->SetPaperSize(pPage->GetSize()); @@ -553,9 +553,9 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) // selected file format: text, RTF or HTML (default is text) sal_uInt16 nFormat = EE_FORMAT_TEXT; - if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND ) + if( aFilterName.indexOf( "Rich") != -1 ) nFormat = EE_FORMAT_RTF; - else if( aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND ) + else if( aFilterName.indexOf( "HTML" ) != -1 ) nFormat = EE_FORMAT_HTML; ::Outliner* pDocliner = static_cast<OutlineView*>(mpView)->GetOutliner(); @@ -583,7 +583,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) } SdPage* pPage = mpDoc->GetSdPage(nPage, PK_STANDARD); aLayoutName = pPage->GetLayoutName(); - aLayoutName.Erase(aLayoutName.SearchAscii(SD_LT_SEPARATOR)); + aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)); /* create our own outline since: - it is possible that the document outliner is actually used in the diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index 0fe091aab63c..e9d689926571 100644 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -47,9 +47,9 @@ private: SdDrawDocument* pDoc, SfxRequest& rReq); - String aLayoutName; ///< layout name of the currently inserted page - String aFilterName; ///< chosen file filter - String aFile; ///< chosen file name + OUString aLayoutName; ///< layout name of the currently inserted page + OUString aFilterName; ///< chosen file filter + OUString aFile; ///< chosen file name void InsTextOrRTFinOlMode(SfxMedium* pMedium); sal_Bool InsSDDinOlMode(SfxMedium* pMedium); |