diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-04 16:14:14 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-08 10:03:09 +0200 |
commit | e12ae54991b70027bbff21bb948c4923898d32eb (patch) | |
tree | acf87f03f7fb89872a86abde2e623d92fd844cb5 /sc/source/ui/view/viewfun4.cxx | |
parent | convert sc/inc/address.hxx from String to OUString (diff) | |
download | core-e12ae54991b70027bbff21bb948c4923898d32eb.tar.gz core-e12ae54991b70027bbff21bb948c4923898d32eb.zip |
convert sc/source/ui/view/*.cxx from String to OUString
Change-Id: I906217b453d3a0ec2ec8deaa5dce739f0cacfd01
Diffstat (limited to 'sc/source/ui/view/viewfun4.cxx')
-rw-r--r-- | sc/source/ui/view/viewfun4.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 008e1643fd03..8d31df689958 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -166,7 +166,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, SotStorageStreamRef xStream; if ( aDataHelper.GetSotStorageStream( SOT_FORMAT_RTF, xStream ) && xStream.Is() ) // mba: clipboard always must contain absolute URLs (could be from alien source) - aImpEx.ImportStream( *xStream, String(), SOT_FORMAT_RTF ); + aImpEx.ImportStream( *xStream, OUString(), SOT_FORMAT_RTF ); else if ( aDataHelper.GetString( SOT_FORMAT_RTF, aStr ) ) aImpEx.ImportString( aStr, SOT_FORMAT_RTF ); @@ -254,7 +254,7 @@ void ScViewFunc::DoRefConversion( sal_Bool bRecord ) if (aFinder.GetFound()) { ScAddress aPos = pCell->aPos; - String aNew = aFinder.GetText(); + OUString aNew = aFinder.GetText(); ScCompiler aComp( pDoc, aPos); aComp.SetGrammar(pDoc->GetGrammar()); ScTokenArray* pArr = aComp.CompileString( aNew ); @@ -308,7 +308,7 @@ void ScViewFunc::DoThesaurus( sal_Bool bRecord ) ScMarkData& rMark = GetViewData()->GetMarkData(); ScSplitPos eWhich = GetViewData()->GetActivePart(); EESpellState eState; - String sOldText, sNewString; + OUString sOldText, sNewString; EditTextObject* pOldTObj = NULL; const EditTextObject* pTObject = NULL; EditView* pEditView = NULL; @@ -397,7 +397,7 @@ void ScViewFunc::DoThesaurus( sal_Bool bRecord ) { LanguageType eLnge = ScViewUtil::GetEffLanguage( pDoc, ScAddress( nCol, nRow, nTab ) ); SvtLanguageTable aLangTab; - String aErr = aLangTab.GetString(eLnge); + OUString aErr = aLangTab.GetString(eLnge); aErr += ScGlobal::GetRscString( STR_SPELLING_NO_LANG ); InfoBox aBox( GetViewData()->GetDialogParent(), aErr ); aBox.Execute(); @@ -582,7 +582,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, sal_Bo { INetURLObject aURL; aURL.SetSmartURL( rFile ); - String aStrURL = aURL.GetMainURL( INetURLObject::NO_DECODE ); + OUString aStrURL = aURL.GetMainURL( INetURLObject::NO_DECODE ); // is it a media URL? if( ::avmedia::MediaWindow::isMediaURL( aStrURL ) ) @@ -635,7 +635,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, sal_Bo { if ( bLink ) { - String aFltName = rGraphicFilter.GetImportFormatName(nFilterFormat); + OUString aFltName = rGraphicFilter.GetImportFormatName(nFilterFormat); return PasteGraphic( rPos, aGraphic, aStrURL, aFltName ); } else @@ -706,7 +706,7 @@ void ScViewFunc::InsertBookmark( const OUString& rDescription, const OUString& r { // in die gerade editierte Zelle einfuegen - String aTargetFrame; + OUString aTargetFrame; if (pTarget) aTargetFrame = *pTarget; pViewData->GetViewShell()->InsertURLField( rDescription, rURL, aTargetFrame ); |