diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-24 16:23:03 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-27 22:59:28 -0600 |
| commit | a8fe23a16082deb749b0ad8bfef93ef90ef9ce07 (patch) | |
| tree | edba056b16553e2c0a6377988842cb14044bdf41 /svl/inc | |
| parent | 389713cfaaa7b7f9736414abf2f184997b9bcf2b (diff) | |
clean-up few more String out of zformat internals
Change-Id: I83f7794a3cc413c7720ad605a22c00efe966e1a5
Diffstat (limited to 'svl/inc')
| -rw-r--r-- | svl/inc/svl/zformat.hxx | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index eb6c2b83b0c7..8e9dd9523190 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -347,7 +347,7 @@ public: // of [$xxx-nnn] are returned bool GetNewCurrencySymbol( OUString& rSymbol, OUString& rExtension ) const; - static bool HasStringNegativeSign( const String& rStr ); + static bool HasStringNegativeSign( const OUString& rStr ); /** Whether a character at position nPos is somewhere between two matching @@ -359,9 +359,9 @@ public: The default '\0' results in no escapement possible. Defaults are set right according to the "unlogic" of the Numberformatter */ - static bool IsInQuote( const String& rString, xub_StrLen nPos, - sal_Unicode cQuote = '"', - sal_Unicode cEscIn = '\0', sal_Unicode cEscOut = '\\' ); + static bool IsInQuote( const OUString& rString, sal_Int32 nPos, + sal_Unicode cQuote = '"', + sal_Unicode cEscIn = '\0', sal_Unicode cEscOut = '\\' ); /** Return the position of a matching closing cQuote if the character at @@ -483,8 +483,9 @@ private: SVL_DLLPRIVATE bool ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const; #ifdef THE_FUTURE - SVL_DLLPRIVATE bool ImpSwitchToSpecifiedCalendar( String& rOrgCalendar, - double& fOrgDateTime, const ImpSvNumFor& rNumFor ) const; + SVL_DLLPRIVATE bool ImpSwitchToSpecifiedCalendar( OUString& rOrgCalendar, + double& fOrgDateTime, + const ImpSvNumFor& rNumFor ) const; #endif /** Whether to use possessive genitive case month name, or partitive case @@ -652,14 +653,16 @@ private: // normal digits or other digits, depending on ImpSvNumFor.aNatNum, // [NatNum1], [NatNum2], ... - SVL_DLLPRIVATE String ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int32 nVal, - sal_uInt16 nMinDigits = 0 ) const; + SVL_DLLPRIVATE OUString ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int32 nVal, + sal_uInt16 nMinDigits = 0 ) const; - String ImpIntToString( sal_uInt16 nIx, sal_Int32 nVal, sal_uInt16 nMinDigits = 0 ) const + OUString ImpIntToString( sal_uInt16 nIx, sal_Int32 nVal, sal_uInt16 nMinDigits = 0 ) const { const SvNumberNatNum& rNum = NumFor[nIx].GetNatNum(); if ( nMinDigits || rNum.IsComplete() ) + { return ImpGetNatNumString( rNum, nVal, nMinDigits ); + } return rtl::OUString::valueOf(nVal); } |