sc/source/filter/excel/xestyle.cxx | 2 +- sc/source/filter/excel/xlstyle.cxx | 2 +- sc/source/filter/oox/numberformatsbuffer.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 0c551c86f701c1f1865760e122d901c933b8fbe5 Author: Jochen Nitschke <[email protected]> Date: Tue Apr 4 14:47:34 2017 +0000 sc: fix type mismatch ScGlobal::eLnge is of type LanguageType aka unsigned short GetStandardFormat(LanguageType) called SvNumberFormatter::GetStandardFormat(short eType, LanguageType eLnge = LANGUAGE_DONTKNOW) There is no GetStandardFormat with LanguageType as first parameter. But there is SvNumberFormatter::GetStandardIndex(LanguageType eLnge = LANGUAGE_DONTKNOW) let's call this. Change-Id: I0e89d748291e7827cd488a1c61052da6be216d56 Reviewed-on: https://gerrit.libreoffice.org/36088 Tested-by: Jenkins <[email protected]> Reviewed-by: Kohei Yoshida <[email protected]> diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index e0407cee0da7..49566fcb1aa5 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -1354,7 +1354,7 @@ XclExpNumFmtBuffer::XclExpNumFmtBuffer( const XclExpRoot& rRoot ) : The effective result here is class String (*)[54*1] */ mxFormatter( new SvNumberFormatter( comphelper::getProcessComponentContext(), LANGUAGE_ENGLISH_US ) ), mpKeywordTable( new NfKeywordTable ), - mnStdFmt( GetFormatter().GetStandardFormat( ScGlobal::eLnge ) ) + mnStdFmt( GetFormatter().GetStandardIndex( ScGlobal::eLnge ) ) { switch( GetBiff() ) { diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 3b034963e895..75ebe2d6dad2 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -1449,7 +1449,7 @@ static const XclBuiltInFormatTable spBuiltInFormatTables[] = XclNumFmtBuffer::XclNumFmtBuffer( const XclRoot& rRoot ) : meSysLang( rRoot.GetSysLanguage() ), - mnStdScNumFmt( rRoot.GetFormatter().GetStandardFormat( ScGlobal::eLnge ) ) + mnStdScNumFmt( rRoot.GetFormatter().GetStandardIndex( ScGlobal::eLnge ) ) { // *** insert default formats (BIFF5+ only)*** diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 2f4987890388..b977f70a8990 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -1953,7 +1953,7 @@ void NumberFormat::finalizeImport( const Reference< XNumberFormats >& rxNumFmts, sal_uLong NumberFormat::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) const { const ScDocument& rDoc = getScDocument(); - static sal_uLong nDflt = rDoc.GetFormatTable()->GetStandardFormat( ScGlobal::eLnge ); + static sal_uLong nDflt = rDoc.GetFormatTable()->GetStandardIndex( ScGlobal::eLnge ); sal_uLong nScNumFmt = nDflt; if ( maApiData.mnIndex ) nScNumFmt = maApiData.mnIndex; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
