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 /sc | |
| parent | 82a134c1569e9ca10dd096e866afd1b42454a8d2 (diff) | |
PutEntry familly of functions use consistent pairing OUString/sal_Int32
Change-Id: I23ae9d3e8bf71ef9ece75ea013d18c36ab2e69d4
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/html/htmlpars.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index d5ad5e7f3326..a60fa55de60b 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -2251,7 +2251,7 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo ) nNumberFormat = GetFormatTable()->GetEntryKey(aNumFmt); if (nNumberFormat == NUMBERFORMAT_ENTRY_NOT_FOUND) { - xub_StrLen nErrPos = 0; + sal_Int32 nErrPos = 0; short nDummy; bool bValidFmt = GetFormatTable()->PutEntry(aNumFmt, nErrPos, nDummy, nNumberFormat); if (!bValidFmt) diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 6e65a15c0cbf..3d1d3919390b 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1898,12 +1898,11 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) aCode = aCode.replaceAll(";;", ";"); // get rid of Xcl escape characters aCode = aCode.replaceAll(rtl::OUString(static_cast<sal_Unicode>(0x1b)), rtl::OUString()); - xub_StrLen nCheckPos; + sal_Int32 nCheckPos; short nType; sal_uInt32 nKey; - pDoc->GetFormatTable()->PutandConvertEntry( - aCode, nCheckPos, nType, nKey, LANGUAGE_ENGLISH_US, - ScGlobal::eLnge ); + pDoc->GetFormatTable()->PutandConvertEntry( aCode, nCheckPos, nType, nKey, + LANGUAGE_ENGLISH_US, ScGlobal::eLnge ); if ( nCheckPos ) nKey = 0; aFormats.push_back( nKey ); |