mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XubString->OUString

Browse Source 
Change-Id: I178f9eb702afb6143c583d5fd54003a427d895fa
This commit is contained in:
Caolán McNamara
2013-08-13 20:41:52 +01:00
parent 8ae46066e6
commit 403a75a275
13 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editeng/source/editeng/eehtml.cxx
View File

@@ -654,13 +654,13 @@ void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel )
if ( nHLevel == STYLE_PRE )
{
Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 );
SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
aItems.Put( aFontItem );
SvxFontItem aFontItemCJK( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
SvxFontItem aFontItemCJK( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
aItems.Put( aFontItemCJK );
SvxFontItem aFontItemCTL( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
SvxFontItem aFontItemCTL( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
aItems.Put( aFontItemCTL );
}

18
editeng/source/items/textitem.cxx
View File

@@ -222,8 +222,8 @@ SvxFontItem::SvxFontItem( const sal_uInt16 nId ) :
// -----------------------------------------------------------------------
SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
const XubString& aStName, const FontPitch eFontPitch,
SvxFontItem::SvxFontItem( const FontFamily eFam, const OUString& aName,
const OUString& aStName, const FontPitch eFontPitch,
const rtl_TextEncoding eFontTextEncoding, const sal_uInt16 nId ) :
SfxPoolItem( nId ),
@@ -256,19 +256,19 @@ bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
case 0:
{
com::sun::star::awt::FontDescriptor aFontDescriptor;
aFontDescriptor.Name = aFamilyName.GetBuffer();
aFontDescriptor.StyleName = aStyleName.GetBuffer();
aFontDescriptor.Name = aFamilyName;
aFontDescriptor.StyleName = aStyleName;
aFontDescriptor.Family = (sal_Int16)(eFamily);
aFontDescriptor.CharSet = (sal_Int16)(eTextEncoding);
aFontDescriptor.Pitch = (sal_Int16)(ePitch);
rVal <<= aFontDescriptor;
}
break;
case MID_FONT_FAMILY_NAME :
rVal <<= OUString(aFamilyName.GetBuffer());
case MID_FONT_FAMILY_NAME:
rVal <<= aFamilyName;
break;
case MID_FONT_STYLE_NAME:
rVal <<= OUString(aStyleName.GetBuffer());
rVal <<= aStyleName;
break;
case MID_FONT_FAMILY : rVal <<= (sal_Int16)(eFamily); break;
case MID_FONT_CHAR_SET : rVal <<= (sal_Int16)(eTextEncoding); break;
@@ -300,7 +300,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
OUString aStr;
if(!(rVal >>= aStr))
return sal_False;
aFamilyName = aStr.getStr();
aFamilyName = aStr;
}
break;
case MID_FONT_STYLE_NAME:
@@ -308,7 +308,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
OUString aStr;
if(!(rVal >>= aStr))
return sal_False;
aStyleName = aStr.getStr();
aStyleName = aStr;
}
break;
case MID_FONT_FAMILY :

6
editeng/source/outliner/outlvw.cxx
View File

@@ -1248,11 +1248,11 @@ void OutlinerView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich
// ======================================================================
void OutlinerView::InsertText( const XubString& rNew, sal_Bool bSelect )
void OutlinerView::InsertText( const OUString& rNew, sal_Bool bSelect )
{
DBG_CHKTHIS(OutlinerView,0);
if( pOwner->bFirstParaIsEmpty )
pOwner->Insert( String() );
pOwner->Insert( OUString() );
pEditView->InsertText( rNew, bSelect );
}
@@ -1330,7 +1330,7 @@ Rectangle OutlinerView::GetOutputArea() const
}
XubString OutlinerView::GetSelected() const
OUString OutlinerView::GetSelected() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetSelected();