diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-17 18:41:03 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-17 21:10:39 +0000 |
| commit | 8aee44c1814ae7c1af14e942cf0513e1612a82d9 (patch) | |
| tree | ae9cfa6bc005c875176691c8c216f7421800847b /editeng | |
| parent | 04314cc1244a5c681c2a0ea743e3675665ed7b7c (diff) | |
String to OUString
Change-Id: I41b73e0af6841247a0403974b1c66e5a66123420
Reviewed-on: https://gerrit.libreoffice.org/5483
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/numitem.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 9698c9084c7e..1a9e800c7d26 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -97,18 +97,17 @@ SvxNumberType::~SvxNumberType() xFormatter = 0; } -String SvxNumberType::GetNumStr( sal_uLong nNo ) const +OUString SvxNumberType::GetNumStr( sal_uLong nNo ) const { const LanguageTag& rLang = Application::GetSettings().GetLanguageTag(); return GetNumStr( nNo, rLang.getLocale() ); } -String SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const +OUString SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const { lcl_getFormatter(xFormatter); - String aTmpStr; if(!xFormatter.is()) - return aTmpStr; + return OUString(); if(bShowSymbol) { @@ -121,7 +120,7 @@ String SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const { // '0' allowed for ARABIC numberings if(NumberingType::ARABIC == nNumType && 0 == nNo ) - aTmpStr = '0'; + return OUString('0'); else { Sequence< PropertyValue > aProperties(2); @@ -133,7 +132,7 @@ String SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const try { - aTmpStr = xFormatter->makeNumberingString( aProperties, rLocale ); + return xFormatter->makeNumberingString( aProperties, rLocale ); } catch(const Exception&) { @@ -142,7 +141,7 @@ String SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const } } } - return aTmpStr; + return OUString(); } SvxNumberFormat::SvxNumberFormat( sal_Int16 eType, |