Kaydet (Commit) 062560f0 authored tarafından Noel Grandin's avatar Noel Grandin

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

Change-Id: I01e17e2f3d7486b60c85fa3c90e50e8804c07d92
üst bac9d53c
...@@ -224,16 +224,16 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc ...@@ -224,16 +224,16 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
// In fact we should create a common method if this would be // In fact we should create a common method if this would be
// needed just one more time.. // needed just one more time..
OSL_ASSERT(aOS.getLength() == 0); OSL_ASSERT(aOS.getLength() == 0);
String aTmpStr = aString; OUString aTmpStr = aString;
aOS.appendAscii(pStringData); aOS.appendAscii(pStringData);
rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear(), eCharSet); rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear(), eCharSet);
if ( eCharSet == RTL_TEXTENCODING_UNICODE ) if ( eCharSet == RTL_TEXTENCODING_UNICODE )
{ {
xub_StrLen nPos = aTmpStr.Search( cStrDelim ); sal_Int32 nPos = aTmpStr.indexOf( cStrDelim );
while ( nPos != STRING_NOTFOUND ) while ( nPos != -1 )
{ {
aTmpStr.Insert( cStrDelim, nPos ); aTmpStr = aTmpStr.replaceAt( nPos, 0, OUString(cStrDelim) );
nPos = aTmpStr.Search( cStrDelim, nPos+2 ); nPos = aTmpStr.indexOf( cStrDelim, nPos+2 );
} }
rOut.WriteUniOrByteChar( cStrDelim, eCharSet ); rOut.WriteUniOrByteChar( cStrDelim, eCharSet );
write_uInt16s_FromOUString(rOut, aTmpStr); write_uInt16s_FromOUString(rOut, aTmpStr);
......
...@@ -182,9 +182,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, ...@@ -182,9 +182,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
} }
else else
{ {
String aTmp( RTL_CONSTASCII_USTRINGPARAM( "#IND: " )); OUString aTmp = "#IND:" + aData + "?";
aTmp += aData;
aTmp += sal_Unicode('?');
pDoc->SetString(aPos, aTmp, &aStrParam); pDoc->SetString(aPos, aTmp, &aStrParam);
} }
} }
......
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