summaryrefslogtreecommitdiff
path: root/editeng/source/items
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-13 20:41:52 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-14 09:13:07 +0100
commit403a75a275d9be8b3cc192b0653b4af3533f1ecc (patch)
tree4cc65298963618b33ccc0e8fdd105462c8bd7d91 /editeng/source/items
parent8ae46066e6b03e70901bbacf972e6965a43f3c53 (diff)
XubString->OUString
Change-Id: I178f9eb702afb6143c583d5fd54003a427d895fa
Diffstat (limited to 'editeng/source/items')
-rw-r--r--editeng/source/items/textitem.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 2918b22d426c..dc9332075d3b 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -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 :