diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-08-22 11:21:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-22 11:47:34 +0000 |
| commit | b8a3e787e9c48d8e7af80800456919726ed8dd4b (patch) | |
| tree | 06eda4317a70ee76eea75e7522e14f0607f44515 /writerfilter | |
| parent | 5e06eb4c32c84079b6817e6d1da71bb84c5c367b (diff) | |
fdo#68076 RTF import: default font had priority over the specified one
Regression from 60c17b2873506ed8b068b34840aecda0c1d9bd65.
(cherry picked from commit f1e5e271f9aadc2c5e5af3ffae410b6c598e5398)
Change-Id: Ie16d611622e6a814d5cbea00c3f992cd9ecba027
Reviewed-on: https://gerrit.libreoffice.org/5579
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
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 e0a4c2043a30..8ca130b98ae5 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -381,9 +381,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; } |