Kaydet (Commit) 6322b703 authored tarafından Noel Grandin's avatar Noel Grandin

convert editeng/source/items/*.cxx from String to OUString

Change-Id: I981311701ce6f7f4571c098c9f48e51288a1608a
üst eaef6193
...@@ -636,16 +636,13 @@ OUString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit, ...@@ -636,16 +636,13 @@ OUString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
RID_INSET RID_INSET
}; };
sal_uInt16 nResId = aStyleIds[m_nStyle]; sal_uInt16 nResId = aStyleIds[m_nStyle];
String aStr; OUString aStr = "(" + ::GetColorString( aColor ) + OUString(cpDelim);
aStr += sal_Unicode('(');
aStr += ::GetColorString( aColor );
aStr += cpDelim;
if ( nResId ) if ( nResId )
aStr += EE_RESSTR(nResId); aStr += EE_RESSTR(nResId);
else else
{ {
String sMetric = EE_RESSTR(GetMetricId( eDestUnit )); OUString sMetric = EE_RESSTR(GetMetricId( eDestUnit ));
aStr += GetMetricText( (long)GetInWidth(), eSrcUnit, eDestUnit, pIntl ); aStr += GetMetricText( (long)GetInWidth(), eSrcUnit, eDestUnit, pIntl );
if ( bMetricStr ) if ( bMetricStr )
aStr += sMetric; aStr += sMetric;
...@@ -658,7 +655,7 @@ OUString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit, ...@@ -658,7 +655,7 @@ OUString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
if ( bMetricStr ) if ( bMetricStr )
aStr += sMetric; aStr += sMetric;
} }
aStr += sal_Unicode(')'); aStr += ")";
return aStr; return aStr;
} }
......
...@@ -81,7 +81,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) ...@@ -81,7 +81,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
rStream >> nTemp; aFont.SetItalic((FontItalic)nTemp); rStream >> nTemp; aFont.SetItalic((FontItalic)nTemp);
// UNICODE: rStream >> aName; aFont.SetName( aName ); // UNICODE: rStream >> aName; aFont.SetName( aName );
String aName = rStream.ReadUniOrByteString(rStream.GetStreamCharSet()); OUString aName = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
aFont.SetName( aName ); aFont.SetName( aName );
if( nVer == 1 ) if( nVer == 1 )
......
...@@ -3519,12 +3519,12 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, ...@@ -3519,12 +3519,12 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
if ( nDoLoad & LOAD_LINK ) if ( nDoLoad & LOAD_LINK )
{ {
// UNICODE: rStream >> aRel; // UNICODE: rStream >> aRel;
String aRel = rStream.ReadUniOrByteString(rStream.GetStreamCharSet()); OUString aRel = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
// TODO/MBA: how can we get a BaseURL here?! // TODO/MBA: how can we get a BaseURL here?!
OSL_FAIL("No BaseURL!"); OSL_FAIL("No BaseURL!");
String aAbs = INetURLObject::GetAbsURL( String(), aRel ); OUString aAbs = INetURLObject::GetAbsURL( "", aRel );
DBG_ASSERT( aAbs.Len(), "Invalid URL!" ); DBG_ASSERT( aAbs.getLength(), "Invalid URL!" );
maStrLink = aAbs; maStrLink = aAbs;
} }
...@@ -3711,10 +3711,8 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) ...@@ -3711,10 +3711,8 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
else if( sLink.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) else if( sLink.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) )
{ {
maStrLink = ""; maStrLink = "";
String sTmp( sLink ); OString sId(OUStringToOString(sLink.copy( sizeof(UNO_NAME_GRAPHOBJ_URLPREFIX)-1 ),
OString sId(OUStringToOString(sTmp.Copy( RTL_TEXTENCODING_ASCII_US));
sizeof(UNO_NAME_GRAPHOBJ_URLPREFIX)-1),
RTL_TEXTENCODING_ASCII_US));
GraphicObject *pOldGrfObj = pImpl->pGraphicObject; GraphicObject *pOldGrfObj = pImpl->pGraphicObject;
pImpl->pGraphicObject = new GraphicObject( sId ); pImpl->pGraphicObject = new GraphicObject( sId );
ApplyGraphicTransparency_Impl(); ApplyGraphicTransparency_Impl();
...@@ -3916,7 +3914,7 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) ...@@ -3916,7 +3914,7 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
{ {
OSL_FAIL("No BaseURL!"); OSL_FAIL("No BaseURL!");
// TODO/MBA: how to get a BaseURL?! // TODO/MBA: how to get a BaseURL?!
String aRel = INetURLObject::GetRelURL( String(), maStrLink ); OUString aRel = INetURLObject::GetRelURL( "", maStrLink );
// UNICODE: rStream << aRel; // UNICODE: rStream << aRel;
rStream.WriteUniOrByteString(aRel, rStream.GetStreamCharSet()); rStream.WriteUniOrByteString(aRel, rStream.GetStreamCharSet());
} }
......
...@@ -241,7 +241,7 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC ...@@ -241,7 +241,7 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
if(pConverter && pBulletFont) if(pConverter && pBulletFont)
{ {
cBullet = ConvertFontToSubsFontChar(pConverter, cBullet); cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);
String sFontName = GetFontToSubsFontName(pConverter); OUString sFontName = GetFontToSubsFontName(pConverter);
pBulletFont->SetName(sFontName); pBulletFont->SetName(sFontName);
} }
...@@ -271,8 +271,7 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC ...@@ -271,8 +271,7 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
// are present, so Brush save is forced // are present, so Brush save is forced
if(!pGraphicBrush->GetGraphicLink().isEmpty() && pGraphicBrush->GetGraphic()) if(!pGraphicBrush->GetGraphicLink().isEmpty() && pGraphicBrush->GetGraphic())
{ {
String aEmpty; pGraphicBrush->SetGraphicLink("");
pGraphicBrush->SetGraphicLink(aEmpty);
} }
pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION); pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);
...@@ -425,8 +424,7 @@ void SvxNumberFormat::SetGraphic( const OUString& rName ) ...@@ -425,8 +424,7 @@ void SvxNumberFormat::SetGraphic( const OUString& rName )
return ; return ;
delete pGraphicBrush; delete pGraphicBrush;
String sTmp; pGraphicBrush = new SvxBrushItem( rName, "", GPOS_AREA, 0 );
pGraphicBrush = new SvxBrushItem( rName, sTmp, GPOS_AREA, 0 );
pGraphicBrush->SetDoneLink( STATIC_LINK( this, SvxNumberFormat, GraphicArrived) ); pGraphicBrush->SetDoneLink( STATIC_LINK( this, SvxNumberFormat, GraphicArrived) );
if( eVertOrient == text::VertOrientation::NONE ) if( eVertOrient == text::VertOrientation::NONE )
eVertOrient = text::VertOrientation::TOP; eVertOrient = text::VertOrientation::TOP;
......
...@@ -203,25 +203,25 @@ void SvxDoCapitals::SetSpace() { } ...@@ -203,25 +203,25 @@ void SvxDoCapitals::SetSpace() { }
void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
{ {
const XubString &rTxt = rDo.GetTxt(); const OUString &rTxt = rDo.GetTxt();
const xub_StrLen nIdx = rDo.GetIdx(); const xub_StrLen nIdx = rDo.GetIdx();
const xub_StrLen nLen = STRING_LEN == nPartLen ? rDo.GetLen() : nPartLen; const sal_Int32 nLen = STRING_LEN == nPartLen ? rDo.GetLen() : nPartLen;
const XubString aTxt( CalcCaseMap( rTxt ) ); const OUString aTxt( CalcCaseMap( rTxt ) );
const sal_uInt16 nTxtLen = std::min( rTxt.Len(), nLen ); const sal_uInt16 nTxtLen = std::min( rTxt.getLength(), nLen );
sal_uInt16 nPos = 0; sal_uInt16 nPos = 0;
sal_uInt16 nOldPos = nPos; sal_uInt16 nOldPos = nPos;
// #108210# // #108210#
// Test if string length differ between original and CaseMapped // Test if string length differ between original and CaseMapped
sal_Bool bCaseMapLengthDiffers(aTxt.Len() != rTxt.Len()); sal_Bool bCaseMapLengthDiffers(aTxt.getLength() != rTxt.getLength());
const LanguageType eLang = LANGUAGE_DONTKNOW == GetLanguage() const LanguageType eLang = LANGUAGE_DONTKNOW == GetLanguage()
? LANGUAGE_SYSTEM : GetLanguage(); ? LANGUAGE_SYSTEM : GetLanguage();
LanguageTag aLanguageTag(eLang); LanguageTag aLanguageTag(eLang);
CharClass aCharClass( aLanguageTag ); CharClass aCharClass( aLanguageTag );
String aCharString; OUString aCharString;
while( nPos < nTxtLen ) while( nPos < nTxtLen )
{ {
...@@ -233,7 +233,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const ...@@ -233,7 +233,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
while( nPos < nTxtLen ) while( nPos < nTxtLen )
{ {
aCharString = rTxt.GetChar( nPos + nIdx ); aCharString = rTxt.copy( nPos + nIdx, 1 );
sal_Int32 nCharacterType = aCharClass.getCharacterType( aCharString, 0 ); sal_Int32 nCharacterType = aCharClass.getCharacterType( aCharString, 0 );
if ( nCharacterType & ::com::sun::star::i18n::KCharacterType::LOWER ) if ( nCharacterType & ::com::sun::star::i18n::KCharacterType::LOWER )
break; break;
...@@ -269,7 +269,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const ...@@ -269,7 +269,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
if ( comphelper::string::equals(aCharString, CH_BLANK) ) if ( comphelper::string::equals(aCharString, CH_BLANK) )
break; break;
if( ++nPos < nTxtLen ) if( ++nPos < nTxtLen )
aCharString = rTxt.GetChar( nPos + nIdx ); aCharString = rTxt.copy( nPos + nIdx, 1 );
} }
if( nOldPos != nPos ) if( nOldPos != nPos )
{ {
...@@ -292,7 +292,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const ...@@ -292,7 +292,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
} }
// Now the blanks are<processed // Now the blanks are<processed
while( nPos < nTxtLen && comphelper::string::equals(aCharString, CH_BLANK) && ++nPos < nTxtLen ) while( nPos < nTxtLen && comphelper::string::equals(aCharString, CH_BLANK) && ++nPos < nTxtLen )
aCharString = rTxt.GetChar( nPos + nIdx ); aCharString = rTxt.copy( nPos + nIdx, 1 );
if( nOldPos != nPos ) if( nOldPos != nPos )
{ {
......
...@@ -378,9 +378,9 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co ...@@ -378,9 +378,9 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
rStrm << (sal_uInt8) GetFamily() << (sal_uInt8) GetPitch() rStrm << (sal_uInt8) GetFamily() << (sal_uInt8) GetPitch()
<< (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet())); << (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet()));
String aStoreFamilyName( GetFamilyName() ); OUString aStoreFamilyName( GetFamilyName() );
if( bToBats ) if( bToBats )
aStoreFamilyName = String( "StarBats", sizeof("StarBats")-1, RTL_TEXTENCODING_ASCII_US ); aStoreFamilyName = "StarBats";
rStrm.WriteUniOrByteString(aStoreFamilyName, rStrm.GetStreamCharSet()); rStrm.WriteUniOrByteString(aStoreFamilyName, rStrm.GetStreamCharSet());
rStrm.WriteUniOrByteString(GetStyleName(), rStrm.GetStreamCharSet()); rStrm.WriteUniOrByteString(GetStyleName(), rStrm.GetStreamCharSet());
...@@ -401,7 +401,7 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co ...@@ -401,7 +401,7 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const
{ {
sal_uInt8 _eFamily, eFontPitch, eFontTextEncoding; sal_uInt8 _eFamily, eFontPitch, eFontTextEncoding;
String aName, aStyle; OUString aName, aStyle;
rStrm >> _eFamily; rStrm >> _eFamily;
rStrm >> eFontPitch; rStrm >> eFontPitch;
rStrm >> eFontTextEncoding; rStrm >> eFontTextEncoding;
...@@ -416,7 +416,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const ...@@ -416,7 +416,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const
eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding ); eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding );
// at some point, the StarBats changes from ANSI font to SYMBOL font // at some point, the StarBats changes from ANSI font to SYMBOL font
if ( RTL_TEXTENCODING_SYMBOL != eFontTextEncoding && aName.EqualsAscii("StarBats") ) if ( RTL_TEXTENCODING_SYMBOL != eFontTextEncoding && aName == "StarBats" )
eFontTextEncoding = RTL_TEXTENCODING_SYMBOL; eFontTextEncoding = RTL_TEXTENCODING_SYMBOL;
// Check if we have stored unicode // Check if we have stored unicode
...@@ -3686,7 +3686,7 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo ...@@ -3686,7 +3686,7 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo
SvxFontItem* pItem = aItemArr[ n ]; SvxFontItem* pItem = aItemArr[ n ];
pItem->SetFamily( aFont.GetFamily() ); pItem->SetFamily( aFont.GetFamily() );
pItem->SetFamilyName( aFont.GetName() ); pItem->SetFamilyName( aFont.GetName() );
pItem->SetStyleName( String() ); pItem->SetStyleName( OUString() );
pItem->SetPitch( aFont.GetPitch()); pItem->SetPitch( aFont.GetPitch());
pItem->SetCharSet(aFont.GetCharSet()); pItem->SetCharSet(aFont.GetCharSet());
} }
......
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