summaryrefslogtreecommitdiff
path: root/editeng/source/rtf
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-10 11:37:13 +0200
committerNoel Grandin <noel@peralex.com>2013-09-11 09:45:39 +0200
commitbe5b8202f80046546d855852e9e10cfd8f6fee85 (patch)
treee207c89fd3f75f0a4cbc0e4279c4f10219057073 /editeng/source/rtf
parentd169dd267998ec503a855f7f5232a725596b7d30 (diff)
convert various bits in editeng from String to OUString
Change-Id: If8b0da1e6b6e3f1f0a0f4946c7741fd5aec66aa6
Diffstat (limited to 'editeng/source/rtf')
-rw-r--r--editeng/source/rtf/svxrtf.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 893c2d10ae7e..1f6f744e21b4 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -460,7 +460,7 @@ void SvxRTFParser::ReadFontTable()
int _nOpenBrakets = 1; // the first was already detected earlier!!
Font* pFont = new Font();
short nFontNo(0), nInsFontNo (0);
- String sAltNm, sFntNm;
+ OUString sAltNm, sFntNm;
sal_Bool bIsAltFntNm = sal_False, bCheckNewFont;
CharSet nSystemChar = lcl_GetDefaultTextEncodingForRTF();
@@ -567,18 +567,18 @@ void SvxRTFParser::ReadFontTable()
break;
}
- if( bCheckNewFont && 1 >= _nOpenBrakets && sFntNm.Len() ) // one font is ready
+ if( bCheckNewFont && 1 >= _nOpenBrakets && !sFntNm.isEmpty() ) // one font is ready
{
// All data from the font is available, so off to the table
- if (sAltNm.Len())
- (sFntNm += ';' ) += sAltNm;
+ if (!sAltNm.isEmpty())
+ sFntNm = sFntNm + ";" + sAltNm;
pFont->SetName( sFntNm );
aFontTbl.insert( nInsFontNo, pFont );
pFont = new Font();
pFont->SetCharSet( nSystemChar );
- sAltNm.Erase();
- sFntNm.Erase();
+ sAltNm = "";
+ sFntNm = "";
}
}
// the last one we have to delete manually