summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2013-06-13 22:07:41 +0200
committerNoel Power <noel.power@suse.com>2013-06-18 08:11:58 +0000
commit8956854d8e7294b41e65d5aacbc43e11d1795711 (patch)
treed9d87ffd48d048ddc46fbb34181c3c2c50243981 /editeng
parent66a0713dc9c676182fcd7aa1e21f8dc25c05be5e (diff)
String to OUString (SfxStringItem and related)
Change-Id: I390413e9ff3efee720a6423fb8695b4c655d7efa Reviewed-on: https://gerrit.libreoffice.org/4280 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/items/justifyitem.cxx6
-rw-r--r--editeng/source/items/paraitem.cxx34
2 files changed, 16 insertions, 24 deletions
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index e938426dbcde..038beffea56a 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -168,7 +168,7 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
-XubString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) const
+OUString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) const
{
DBG_ASSERT( nVal <= SVX_HOR_JUSTIFY_REPEAT, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_HORJUST_STANDARD + nVal);
@@ -314,7 +314,7 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
-XubString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal ) const
+OUString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal ) const
{
DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_VERJUST_STANDARD + nVal);
@@ -406,7 +406,7 @@ bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId
}
-XubString SvxJustifyMethodItem::GetValueText( sal_uInt16 nVal ) const
+OUString SvxJustifyMethodItem::GetValueText( sal_uInt16 nVal ) const
{
DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_JUSTMETHOD_AUTO + nVal);
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 8210fbbe72b5..a78912b579c4 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -859,27 +859,19 @@ void SvxTabStop::fillDecimal() const
}
// -----------------------------------------------------------------------
-XubString SvxTabStop::GetValueString() const
-{
- XubString aStr;
-
- aStr += sal_Unicode( '(' );
- aStr += OUString::number(nTabPos);
- aStr += cpDelim;
- aStr += EE_RESSTR(RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment);
-
- aStr += cpDelim;
- aStr += sal_Unicode('[');
- aStr += EE_RESSTR(RID_SVXITEMS_TAB_DECIMAL_CHAR);
- aStr += GetDecimal();
- aStr += sal_Unicode(']');
- aStr += cpDelim;
- aStr += cpDelim;
- aStr += sal_Unicode('[');
- aStr += EE_RESSTR(RID_SVXITEMS_TAB_FILL_CHAR);
- aStr += cFill;
- aStr += sal_Unicode(']');
- aStr += sal_Unicode(')');
+OUString SvxTabStop::GetValueString() const
+{
+ OUString aStr = "("
+ + OUString::number(nTabPos)
+ + ", "
+ + EE_RESSTR(RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment)
+ + ", ["
+ + EE_RESSTR(RID_SVXITEMS_TAB_DECIMAL_CHAR)
+ + OUString(GetDecimal())
+ + "], , ["
+ + EE_RESSTR(RID_SVXITEMS_TAB_FILL_CHAR)
+ + OUString(cFill)
+ + "])";
return aStr;
}