diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-27 22:58:50 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-27 23:00:06 -0600 |
| commit | c617be8307033394bde4255c05b72dbd01ae0056 (patch) | |
| tree | bda35b72f8b61d71f22517a197517ec3bbffa0b0 /sfx2/source/bastyp | |
| parent | ae0fa7cc62e1f57d22e68b2ef45086aeb1dfe41c (diff) | |
remove legacy String svl's Put*Entry family of function and convert users
Change-Id: Iebf4017ce4c2c48389716eac1bbf7f386ac7a296
Diffstat (limited to 'sfx2/source/bastyp')
| -rw-r--r-- | sfx2/source/bastyp/sfxhtml.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 8bc4946ca118..66be8a6cf101 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -335,8 +335,7 @@ double SfxHTMLParser::GetTableDataOptionsValNum( sal_uInt32& nNumForm, SvNumberFormatter& rFormatter ) { LanguageType eParseLang = (LanguageType )aNumStr.ToInt32(); - sal_uInt32 nParseForm = - rFormatter.GetFormatForLanguageIfBuiltIn( 0, eParseLang ); + sal_uInt32 nParseForm = rFormatter.GetFormatForLanguageIfBuiltIn( 0, eParseLang ); double fVal; rFormatter.IsNumberFormat( aValStr, nParseForm, fVal ); if ( comphelper::string::getTokenCount(aNumStr, ';') > 2 ) @@ -344,14 +343,14 @@ double SfxHTMLParser::GetTableDataOptionsValNum( sal_uInt32& nNumForm, eNumLang = (LanguageType)aNumStr.GetToken( 1, ';' ).ToInt32(); xub_StrLen nPos = aNumStr.Search( ';' ); nPos = aNumStr.Search( ';', nPos + 1 ); - String aFormat( aNumStr.Copy( nPos + 1 ) ); - xub_StrLen nCheckPos; + OUString aFormat( aNumStr.Copy( nPos + 1 ) ); + sal_Int32 nCheckPos; short nType; if ( eNumLang != LANGUAGE_SYSTEM ) rFormatter.PutEntry( aFormat, nCheckPos, nType, nNumForm, eNumLang ); else rFormatter.PutandConvertEntry( aFormat, nCheckPos, nType, nNumForm, - eParseLang, eNumLang ); + eParseLang, eNumLang ); } else { |