diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-10 01:52:32 +0100 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-01-13 11:21:25 +0400 |
| commit | 6f3c367f9c2bff7520f2a55f1795fd718abea938 (patch) | |
| tree | b2bdabda32fef36b02c4972966490d6bbaa69f40 /svl | |
| parent | d28ccfbcdd459d21f8791cd7a61a52a12d3adbbc (diff) | |
fdo#38838 Some removal/replacement of the String/UniString with OUString
Change-Id: Ibce0f8542aa398147d74f7acf53b2898dc3e4eff
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/custritm.cxx | 6 | ||||
| -rw-r--r-- | svl/source/items/stritem.cxx | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index f8c4f89f5316..b179643774d2 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -99,7 +99,7 @@ CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit, bool CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const { - rVal <<= rtl::OUString(m_aValue); + rVal <<= OUString(m_aValue); return true; } @@ -108,10 +108,10 @@ bool CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt bool CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) { - rtl::OUString aTheValue; + OUString aTheValue; if (rVal >>= aTheValue) { - m_aValue = UniString(aTheValue); + m_aValue = aTheValue; return true; } OSL_FAIL("CntUnencodedStringItem::PutValue(): Wrong type"); diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx index 30074d8b86d1..0cf799470636 100644 --- a/svl/source/items/stritem.cxx +++ b/svl/source/items/stritem.cxx @@ -32,8 +32,7 @@ TYPEINIT1_AUTOFACTORY(SfxStringItem, CntUnencodedStringItem) SfxStringItem::SfxStringItem(sal_uInt16 which, SvStream & rStream): CntUnencodedStringItem(which) { - UniString aValue = readByteString(rStream); - SetValue(aValue); + SetValue(readByteString(rStream)); } |