summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-11-27 14:33:44 +0100
committerEike Rathke <erack@redhat.com>2015-11-28 00:29:40 +0100
commit9b59abdb03f1da1d4cb3b4efb217c1077625efe7 (patch)
treea6edec67486fe93875205998ea4269cdc6f9dad8
parent8cd082adec3860ed0bf91218db8781308fadd75c (diff)
use SvNumberFormatter::FillKeywordTableForExcel()
Change-Id: I83b0cd033ba46dabdde92ed2812398518d1895bf (cherry picked from commit 2246f478e2505388ab253d08a1d86b897251223b)
-rw-r--r--sc/source/filter/excel/xestyle.cxx18
1 files changed, 2 insertions, 16 deletions
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index cd9f8e16e559..be7a00501552 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1366,14 +1366,7 @@ XclExpNumFmtBuffer::XclExpNumFmtBuffer( const XclExpRoot& rRoot ) :
default: mnXclOffset = 0; DBG_ERROR_BIFF();
}
- mxFormatter->FillKeywordTable( *mpKeywordTable, LANGUAGE_ENGLISH_US );
- // remap codes unknown to Excel
- (*mpKeywordTable)[ NF_KEY_NN ] = "DDD";
- (*mpKeywordTable)[ NF_KEY_NNN ] = "DDDD";
- // NNNN gets a separator appended in SvNumberformat::GetMappedFormatString()
- (*mpKeywordTable)[ NF_KEY_NNNN ] = "DDDD";
- // Export the Thai T NatNum modifier.
- (*mpKeywordTable)[ NF_KEY_THAI_T ] = "T";
+ mxFormatter->FillKeywordTableForExcel( *mpKeywordTable );
}
XclExpNumFmtBuffer::~XclExpNumFmtBuffer()
@@ -2997,14 +2990,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
mxFormatter( new SvNumberFormatter( comphelper::getProcessComponentContext(), LANGUAGE_ENGLISH_US ) ),
mpKeywordTable( new NfKeywordTable )
{
- mxFormatter->FillKeywordTable( *mpKeywordTable, LANGUAGE_ENGLISH_US );
- // remap codes unknown to Excel
- (*mpKeywordTable)[ NF_KEY_NN ] = "DDD";
- (*mpKeywordTable)[ NF_KEY_NNN ] = "DDDD";
- // NNNN gets a separator appended in SvNumberformat::GetMappedFormatString()
- (*mpKeywordTable)[ NF_KEY_NNNN ] = "DDDD";
- // Export the Thai T NatNum modifier.
- (*mpKeywordTable)[ NF_KEY_THAI_T ] = "T";
+ mxFormatter->FillKeywordTableForExcel( *mpKeywordTable );
SCTAB nTables = rRoot.GetDoc().GetTableCount();
for(SCTAB nTab = 0; nTab < nTables; ++nTab)