diff options
Diffstat (limited to 'sc/source/filter')
| -rw-r--r-- | sc/source/filter/excel/xestyle.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/excel/xistyle.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/lotus/tool.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 655594ca8cfc..5b3354aeb307 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -1340,10 +1340,10 @@ String GetNumberFormatCode(XclRoot& rRoot, const sal_uInt16 nScNumFmt, SvNumberF LanguageType eLang = pEntry->GetLanguage(); if( eLang != LANGUAGE_ENGLISH_US ) { - xub_StrLen nCheckPos; + sal_Int32 nCheckPos; short nType = NUMBERFORMAT_DEFINED; sal_uInt32 nKey; - String aTemp( pEntry->GetFormatstring() ); + OUString aTemp( pEntry->GetFormatstring() ); xFormatter->PutandConvertEntry( aTemp, nCheckPos, nType, nKey, eLang, LANGUAGE_ENGLISH_US ); OSL_ENSURE( nCheckPos == 0, "XclExpNumFmtBuffer::WriteFormatRecord - format code not convertible" ); pEntry = xFormatter->GetEntry( nKey ); diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 760cf4ad878b..dd24da424aee 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -659,14 +659,14 @@ void XclImpNumFmtBuffer::CreateScFormats() const XclNumFmt& rNumFmt = aIt->second; // insert/convert the Excel number format - xub_StrLen nCheckPos; + sal_Int32 nCheckPos; short nType = NUMBERFORMAT_DEFINED; sal_uInt32 nKey; if( rNumFmt.maFormat.Len() ) { - String aFormat( rNumFmt.maFormat ); + OUString aFormat( rNumFmt.maFormat ); rFormatter.PutandConvertEntry( aFormat, nCheckPos, - nType, nKey, LANGUAGE_ENGLISH_US, rNumFmt.meLanguage ); + nType, nKey, LANGUAGE_ENGLISH_US, rNumFmt.meLanguage ); } else nKey = rFormatter.GetFormatIndex( rNumFmt.meOffset, rNumFmt.meLanguage ); diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index b1b3b2da5b89..96f4e605e4a9 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -203,7 +203,7 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ) // neues Format erzeugen sal_uInt8 nL, nH; // Low-/High-Nibble sal_uInt8 nForm = nFormat; - String aFormString; + OUString aFormString; sal_Int16 eType = NUMBERFORMAT_ALL; sal_uInt32 nIndex1; sal_uInt32 nHandle; @@ -373,7 +373,7 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ) nHandle = pFormTable->GetFormatIndex( eIndexTableOffset, eLanguage); else { - xub_StrLen nDummy; + sal_Int32 nDummy; pFormTable->PutEntry( aFormString, nDummy, eType, nHandle, eLanguage ); } |