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 /basic | |
parent | 82a134c1569e9ca10dd096e866afd1b42454a8d2 (diff) |
PutEntry familly of functions use consistent pairing OUString/sal_Int32
Change-Id: I23ae9d3e8bf71ef9ece75ea013d18c36ab2e69d4
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/runtime/runtime.cxx | 4 | ||||
-rw-r--r-- | basic/source/sbx/sbxdate.cxx | 4 | ||||
-rw-r--r-- | basic/source/sbx/sbxscan.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 3c2c661cc9fc..482526382a50 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -373,7 +373,7 @@ void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter, rpNumberFormatter = new SvNumberFormatter( xFactory, eLangType ); - sal_uInt16 nCheckPos = 0; short nType; + sal_Int32 nCheckPos = 0; short nType; rnStdTimeIdx = rpNumberFormatter->GetStandardFormat( NUMBERFORMAT_TIME, eLangType ); // the formatter's standard templates have only got a two-digit date @@ -393,7 +393,7 @@ void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter, default: aDateStr = "MM.TT.JJJJ"; break; } rpNumberFormatter->PutandConvertEntry( aDateStr, nCheckPos, nType, - rnStdDateIdx, LANGUAGE_GERMAN, eLangType ); + rnStdDateIdx, LANGUAGE_GERMAN, eLangType ); nCheckPos = 0; OUString aStrHHMMSS(" HH:MM:SS"); aDateStr += aStrHHMMSS; diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index cc6aedc5cb04..7c0182791a84 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -104,7 +104,7 @@ double ImpGetDate( const SbxValues* p ) pFormatter = new SvNumberFormatter( xFactory, eLangType ); sal_uInt32 nIndex; - sal_uInt16 nCheckPos = 0; + sal_Int32 nCheckPos = 0; short nType = 127; // Default templates of the formatter have only two-digit @@ -277,7 +277,7 @@ start: pFormatter = new SvNumberFormatter( xFactory, eLangType ); sal_uInt32 nIndex; - sal_uInt16 nCheckPos = 0; + sal_Int32 nCheckPos = 0; short nType; SvtSysLocale aSysLocale; diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index 3257354bfc74..111c8b3285b3 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -739,7 +739,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const // number format, use SvNumberFormatter to handle it. if( bSuccess ) { - sal_uInt16 nCheckPos = 0; + sal_Int32 nCheckPos = 0; short nType; OUString aFmtStr = *pFmt; VbaFormatInfo* pInfo = getFormatInfo( aFmtStr ); |