[Libreoffice-commits] core.git: writerfilter/source

[Julien Nabet (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02fe5ec54e339d4f8983a5bf131b9c2d5db9d771
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun May 17 17:53:41 2020 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon May 18 09:36:27 2020 +0200

    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 at numbertext.org>

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())