diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-08-22 11:21:25 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-08-22 11:39:31 +0200 |
| commit | f1e5e271f9aadc2c5e5af3ffae410b6c598e5398 (patch) | |
| tree | b5b38da1ed51709a431d4bd1ef1e749ee2e52821 /writerfilter | |
| parent | 1984e24f0aa200b130f46b94be4b8b7c0f3675c0 (diff) | |
fdo#68076 RTF import: default font had priority over the specified one
Regression from 60c17b2873506ed8b068b34840aecda0c1d9bd65.
Change-Id: Ie16d611622e6a814d5cbea00c3f992cd9ecba027
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index f4afe8a98c91..b0835e1b0573 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -382,9 +382,10 @@ void RTFDocumentImpl::checkFirstRun() Mapper().startSectionGroup(); Mapper().startParagraphGroup(); - // set the requested default font + // set the requested default font, if there are none RTFValue::Pointer_t pFont = m_aDefaultState.aCharacterSprms.find(NS_sprm::LN_CRgFtc0); - if (pFont.get()) + RTFValue::Pointer_t pCurrentFont = m_aStates.top().aCharacterSprms.find(NS_sprm::LN_CRgFtc0); + if (pFont && !pCurrentFont) dispatchValue(RTF_F, pFont->getInt()); m_bFirstRun = false; } |