diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-05-17 17:53:41 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2020-05-18 09:36:27 +0200 |
| commit | 02fe5ec54e339d4f8983a5bf131b9c2d5db9d771 (patch) | |
| tree | b80ab3205ac0ec4bbec77561ddad188636a17101 | |
| parent | 34b3d1342579791d960d8bc77aa937ead49bd791 (diff) | |
tdf#131963: regression from fix for tdf#92472
tdf#92472 DOCX import: fix checkbox size set by direct formatting
at beginning of paragraphs.
Follow-up of the commit 22ad4d69d771708f28a2d9e137cfd43ac846cf3a
(tdf#121045 DOCX import: fix checkbox size in table).
See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=160936
Change-Id: I9868679a46de54519250ab6f9d501a04a414b88e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94385
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 2cb148920e68..c570562d5e12 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4834,7 +4834,7 @@ void DomainMapper_Impl::CloseFieldCommand() OUString const sFirstParam(vArguments.empty() ? OUString() : vArguments.front()); // apply font size to the form control - if ( m_pLastCharacterContext && m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) ) + if (!m_aTextAppendStack.empty() && m_pLastCharacterContext && m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) ) { uno::Reference< text::XTextAppend > xTextAppend = m_aTextAppendStack.top().xTextAppend; if (xTextAppend.is()) |