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

[Mark Hung]

 writerfilter/source/dmapper/DomainMapper.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6e855d89e9d7807c16569ec7e335ea2dbafba47d
Author: Mark Hung <marklh9 at gmail.com>
Date:   Sun Jun 11 08:47:41 2017 +0800

    tdf#85161 fix the case for ooxml fields without any seperator.
    
    Field commands were closed when a seperator appeared. Those
    fields that only had begin and end fldChar just disapeared.
    
    Change-Id: I77928393826a3ffd4a35fb8fe9adeb1892f99683
    Reviewed-on: https://gerrit.libreoffice.org/38653
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mark Hung <marklh9 at gmail.com>

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 4ef535bc20e1..7161b1fe6ace 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3143,6 +3143,9 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
                     m_pImpl->CloseFieldCommand();
                     return;
                 case cFieldEnd:
+                    // In case there isn't any field seperator.
+                    if ( m_pImpl->IsOpenFieldCommand() )
+                        m_pImpl->CloseFieldCommand();
                     m_pImpl->PopFieldContext();
                     return;
                 default: