Skip to content

C
core
Kaydet (Commit) dcb22610 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert sc/source/filter/rtf/*.cxx from String to OUString 

Change-Id: I79ba4ccba049fe4c573e04e931220ad16bab85b9
üst 77d8f734
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sc/source/filter/rtf/eeimpars.cxx
Dosyayı görüntüle @ dcb22610
...@@ -264,7 +264,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu ...@@ -264,7 +264,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu
rSet.Put(*pNumFmt); rSet.Put(*pNumFmt);
if ( pFont || pHeight || pWeight || pPosture ) if ( pFont || pHeight || pWeight || pPosture )
{ {
String aStr( mpEngine->GetText( pE->aSel ) ); OUString aStr( mpEngine->GetText( pE->aSel ) );
sal_uInt8 nScriptType = mpDoc->GetStringScriptType( aStr ); sal_uInt8 nScriptType = mpDoc->GetStringScriptType( aStr );
const sal_uInt8 nScripts[3] = { SCRIPTTYPE_LATIN, const sal_uInt8 nScripts[3] = { SCRIPTTYPE_LATIN,
SCRIPTTYPE_ASIAN, SCRIPTTYPE_COMPLEX }; SCRIPTTYPE_ASIAN, SCRIPTTYPE_COMPLEX };
...@@ -336,7 +336,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu ...@@ -336,7 +336,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu
} }
else else
{ {
String aStr; OUString aStr;
if( pE->bEntirePara ) if( pE->bEntirePara )
{ {
aStr = mpEngine->GetText( pE->aSel.nStartPara ); aStr = mpEngine->GetText( pE->aSel.nStartPara );
...@@ -383,8 +383,8 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu ...@@ -383,8 +383,8 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu
// #105460#, #i4180# String cells can't contain tabs or linebreaks // #105460#, #i4180# String cells can't contain tabs or linebreaks
// -> replace with spaces // -> replace with spaces
aStr.SearchAndReplaceAll( (sal_Unicode)'\t', (sal_Unicode)' ' ); aStr = aStr.replaceAll( "\t", " " );
aStr.SearchAndReplaceAll( (sal_Unicode)'\n', (sal_Unicode)' ' ); aStr = aStr.replaceAll( "\n", " " );
if (bTextFormat) if (bTextFormat)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment