summaryrefslogtreecommitdiff
path: root/svl/inc/svl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-09-12 23:24:07 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-09-17 10:46:27 +0100
commitc20ba023c738c0c76a07c94cb43c0a6d06f12374 (patch)
treee35855ce7fd3c777a4b12fe6356dc9c46ec99ddb /svl/inc/svl
parent44aa7df623e7cc113fd81f84e4a0d3de786f311f (diff)
XubString->OUString
Change-Id: Ic8b191dfb0d14e129dc804aeb4ac14c732e72e6b
Diffstat (limited to 'svl/inc/svl')
-rw-r--r--svl/inc/svl/zforlist.hxx14
-rw-r--r--svl/inc/svl/zformat.hxx4
2 files changed, 9 insertions, 9 deletions
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 5b7ab3861182..0d82c0f1c41c 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -242,9 +242,9 @@ class SVL_DLLPUBLIC NfCurrencyEntry
private:
// nDecimalFormat := 0, 1, 2
- // #,##0 or #,##0.00 or #,##0.-- are assigned
- SVL_DLLPRIVATE void Impl_BuildFormatStringNumChars( String&,
- const LocaleDataWrapper&, sal_uInt16 nDecimalFormat ) const;
+ // #,##0 or #,##0.00 or #,##0.-- is returned
+ SVL_DLLPRIVATE OUString Impl_BuildFormatStringNumChars(
+ const LocaleDataWrapper&, sal_uInt16 nDecimalFormat) const;
public:
@@ -268,10 +268,10 @@ public:
sal_Unicode GetZeroChar() const { return cZeroChar; }
/** [$DM-407] (bBank==false) or [$DEM] (bBank==true)
- is assigned to rStr, if bBank==false and
+ is returned. If bBank==false and
bWithoutExtension==true only [$DM] */
- void BuildSymbolString( String& rStr, bool bBank,
- bool bWithoutExtension = false ) const;
+ OUString BuildSymbolString(bool bBank,
+ bool bWithoutExtension = false) const;
/** #,##0.00 [$DM-407] is assigned to rStr, separators
from rLoc, incl. minus sign but without [RED] */
@@ -870,7 +870,7 @@ private:
// Test whether format code already exists, then return index key,
// otherwise NUMBERFORMAT_ENTRY_NOT_FOUND
- SVL_DLLPRIVATE sal_uInt32 ImpIsEntry( const String& rString,
+ SVL_DLLPRIVATE sal_uInt32 ImpIsEntry( const OUString& rString,
sal_uInt32 CLOffset,
LanguageType eLnge );
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 05a30e2d640c..f94e62d25dd7 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -221,7 +221,7 @@ public:
LanguageType GetLanguage() const { return maLocale.meLanguage;}
- const String& GetFormatstring() const { return sFormatstring; }
+ const OUString& GetFormatstring() const { return sFormatstring; }
// Build a format string of application defined keywords
String GetMappedFormatstring( const NfKeywordTable& rKeywords,
@@ -458,7 +458,7 @@ public:
private:
ImpSvNumFor NumFor[4]; // Array for the 4 subformats
- String sFormatstring; // The format code string
+ OUString sFormatstring; // The format code string
String sComment; // Comment, since number formatter version 6
double fLimit1; // Value for first condition
double fLimit2; // Value for second condition