diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-03-02 16:52:31 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-03-02 17:58:40 +0100 |
| commit | 63518686d37821f7c09443fabed472cf6332094c (patch) | |
| tree | d2bdbcdcc9026d0d7609284ae6587a7e6ba330d8 /writerfilter | |
| parent | c5620cafc3f944cfbf9205376da61dcd393b2557 (diff) | |
read w:charset , not used later though it seems (part of fdo#34814)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/FontTable.cxx | 11 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/FontTable.hxx | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index c8f89a17720a..5557bb869078 100644 --- a/writerfilter/source/dmapper/FontTable.cxx +++ b/writerfilter/source/dmapper/FontTable.cxx @@ -33,6 +33,7 @@ #endif #include <vector> #include <stdio.h> +#include <rtl/tencinfo.h> namespace writerfilter { namespace dmapper @@ -116,12 +117,20 @@ void FontTable::sprm(Sprm& rSprm) if(!m_pImpl->pCurrentEntry) return ; sal_uInt32 nSprmId = rSprm.getId(); - (void)nSprmId; Value::Pointer_t pValue = rSprm.getValue(); sal_Int32 nIntValue = pValue->getInt(); (void)nIntValue; rtl::OUString sStringValue = pValue->getString(); + switch(nSprmId) + { + case NS_ooxml::LN_CT_Font_charset: + m_pImpl->pCurrentEntry->nTextEncoding = rtl_getTextEncodingFromWindowsCharset( nIntValue ); + break; + default: + break; + } + } void FontTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref) diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx index e3070ec1991c..c08a80c92aa8 100644 --- a/writerfilter/source/dmapper/FontTable.hxx +++ b/writerfilter/source/dmapper/FontTable.hxx @@ -57,7 +57,7 @@ struct FontEntry FontEntry() : bTrueType(false), nPitchRequest( 0 ), - nTextEncoding( 0 ), + nTextEncoding( RTL_TEXTENCODING_DONTKNOW ), nFontFamilyId( 0 ), nBaseWeight( 0 ), nAltFontIndex( 0 ) |