diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-18 14:01:16 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-18 19:57:23 -0600 |
| commit | cc63555fd02217e3b68caccfa5c8a0171aca149c (patch) | |
| tree | 07528737e1710bff4dd9f5e3c576d1fc96b99c13 /editeng | |
| parent | 82a134c1569e9ca10dd096e866afd1b42454a8d2 (diff) | |
PutEntry familly of functions use consistent pairing OUString/sal_Int32
Change-Id: I23ae9d3e8bf71ef9ece75ea013d18c36ab2e69d4
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/flditem.cxx | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index a26f53304cd1..c9eebe655f75 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -838,39 +838,42 @@ rtl::OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, { case SVXTIMEFORMAT_12_HM: nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HHMMAMPM, eLang ); - break; + break; case SVXTIMEFORMAT_12_HMSH: - { // no builtin format available, try to insert or reuse - rtl::OUString aFormatCode( RTL_CONSTASCII_USTRINGPARAM( "HH:MM:SS.00 AM/PM" ) ); - xub_StrLen nCheckPos; + { + // no builtin format available, try to insert or reuse + OUString aFormatCode( RTL_CONSTASCII_USTRINGPARAM( "HH:MM:SS.00 AM/PM" ) ); + sal_Int32 nCheckPos; short nType; - rFormatter.PutandConvertEntry( aFormatCode, - nCheckPos, nType, nFormatKey, LANGUAGE_ENGLISH_US, eLang ); + rFormatter.PutandConvertEntry( aFormatCode, nCheckPos, nType, + nFormatKey, LANGUAGE_ENGLISH_US, eLang ); DBG_ASSERT( nCheckPos == 0, "SVXTIMEFORMAT_12_HMSH: could not insert format code" ); if ( nCheckPos ) + { nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HH_MMSS00, eLang ); + } + break; } - break; case SVXTIMEFORMAT_24_HM: nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HHMM, eLang ); - break; + break; case SVXTIMEFORMAT_24_HMSH: nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HH_MMSS00, eLang ); - break; + break; case SVXTIMEFORMAT_12_HMS: nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HHMMSSAMPM, eLang ); - break; + break; case SVXTIMEFORMAT_24_HMS: nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HHMMSS, eLang ); - break; + break; case SVXTIMEFORMAT_STANDARD: default: nFormatKey = rFormatter.GetStandardFormat( NUMBERFORMAT_TIME, eLang ); } double fFracTime = aTime.GetTimeInDays(); - rtl::OUString aStr; - Color* pColor = NULL; + OUString aStr; + Color* pColor = NULL; rFormatter.GetOutputString( fFracTime, nFormatKey, aStr, &pColor ); return aStr; } |