diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-03 11:01:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:26 +0200 |
| commit | f6ada649d67b8b3fcf31e6588e56c3cd7d5c1fe0 (patch) | |
| tree | 2175417566d15e22811b026c5a78fb494b4b525c | |
| parent | 1c8c9647c6daaa420d3812b923bfd1a32103200a (diff) | |
convert include/svx/numinf.hxx from String to OUString
Change-Id: Ic80e48ae920bf52c069cf6058743452585e36f2a
| -rw-r--r-- | include/svx/numinf.hxx | 8 | ||||
| -rw-r--r-- | svx/source/items/numinf.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index f6cd721e8cd9..7439ef14640c 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -39,13 +39,13 @@ public: SvxNumberInfoItem( const sal_uInt16 nId ); SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const sal_uInt16 nId ); - SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const String& rVal, + SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const OUString& rVal, const sal_uInt16 nId ); SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const sal_uInt16 nId ); // if both double and String are supplied, String is used for text formats SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, - const String& rValueStr, const sal_uInt16 nId ); + const OUString& rValueStr, const sal_uInt16 nId ); SvxNumberInfoItem( const SvxNumberInfoItem& ); ~SvxNumberInfoItem(); @@ -60,7 +60,7 @@ public: OUString &rText, const IntlWrapper * = 0 ) const; SvNumberFormatter* GetNumberFormatter() const { return pFormatter; } - const String& GetValueString() const { return aStringVal; } + const OUString& GetValueString() const { return aStringVal; } double GetValueDouble() const { return nDoubleVal; } const sal_uInt32* GetDelArray() const { return pDelFormatArr; } @@ -73,7 +73,7 @@ public: private: SvNumberFormatter* pFormatter; SvxNumberValueType eValueType; - String aStringVal; + OUString aStringVal; double nDoubleVal; sal_uInt32* pDelFormatArr; diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 34ab3ea9b249..9ceef227acc6 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -55,7 +55,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, // ----------------------------------------------------------------------- SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, - const String& rVal, const sal_uInt16 nId ) : + const OUString& rVal, const sal_uInt16 nId ) : INIT( pNumFormatter, SVX_VALUE_TYPE_STRING, 0, rVal ) @@ -75,7 +75,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, // ----------------------------------------------------------------------- SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, - const double& rVal, const String& rValueStr, + const double& rVal, const OUString& rValueStr, const sal_uInt16 nId ) : INIT( pNumFormatter, SVX_VALUE_TYPE_NUMBER, rVal, rValueStr ) |