diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-05 09:08:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-09 21:25:10 +0000 |
| commit | 68abd6d9258975e9ef1155f726fe4c12bb0918e2 (patch) | |
| tree | 4cf8bfaf391a8e1b32e021a7ad8a80d6f6c95d9a /svl/inc | |
| parent | c90e0064357f78ffc9ee8261c6c100c15d904beb (diff) | |
String->OUString in SVL::SvNumberFormat calendar methods
Change-Id: I6fe904d25a0675d881ee7c1d761e9af87e23a69d
Reviewed-on: https://gerrit.libreoffice.org/772
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svl/inc')
| -rw-r--r-- | svl/inc/svl/zformat.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index 1dbb9731552c..015cf9711c8f 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -421,13 +421,13 @@ public: /** Switches to the first non-"gregorian" calendar, but only if the current calendar is "gregorian"; original calendar name and date/time returned, but only if calendar switched and rOrgCalendar was empty. */ - void SwitchToOtherCalendar( String& rOrgCalendar, double& fOrgDateTime ) const; + void SwitchToOtherCalendar( OUString& rOrgCalendar, double& fOrgDateTime ) const; /** Switches to the "gregorian" calendar, but only if the current calendar is non-"gregorian" and rOrgCalendar is not empty. Thus a preceding ImpSwitchToOtherCalendar() call should have been placed prior to calling this method. */ - void SwitchToGregorianCalendar( const String& rOrgCalendar, double fOrgDateTime ) const; + void SwitchToGregorianCalendar( const OUString& rOrgCalendar, double fOrgDateTime ) const; #ifdef THE_FUTURE /** Switches to the first specified calendar, if any, in subformat nNumFor @@ -438,7 +438,7 @@ public: <TRUE/> if a calendar was specified and switched to, <FALSE/> else. */ - bool SwitchToSpecifiedCalendar( String& rOrgCalendar, double& fOrgDateTime, + bool SwitchToSpecifiedCalendar( OUString& rOrgCalendar, double& fOrgDateTime, sal_uInt16 nNumFor ) const { if ( nNumFor < 4 ) @@ -620,7 +620,7 @@ private: // know a "before" era (like zh_TW ROC or ja_JP Gengou). If switched and // rOrgCalendar was "gregorian" the string is emptied. If rOrgCalendar was // empty the previous calendar name and date/time are returned. - SVL_DLLPRIVATE bool ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime ); + SVL_DLLPRIVATE bool ImpFallBackToGregorianCalendar( OUString& rOrgCalendar, double& fOrgDateTime ); // Append a "G" short era string of the given calendar. In the case of a // Gengou calendar this is a one character abbreviation, for other |