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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit f22044a49a56e585e2e9f419a1b77aba263b2afe
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Dec 19 19:01:11 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Dec 19 19:08:28 2019 +0100

    Fix mid-air collision
    
    Change-Id: Iedfd0df670e4aa81fc2acbee5c3bda50c53b9fc7
    Reviewed-on: https://gerrit.libreoffice.org/85538
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 17eb147c6c21..d63e60714fa5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -5405,7 +5405,7 @@ void DomainMapper_Impl::CloseFieldCommand()
                     // the ODF_UNHANDLED string!
                     assert(!m_bForceGenericFields || aCode.isEmpty());
                     xNameCont->insertByName(ODF_CODE_PARAM, uno::makeAny(aCode));
-                    if (std::get<0>(field) == "CONTROL")
+                    if (sType == "CONTROL")
                     { // tdf#129247 HACK probably this should be imported as something else, like in ww8?
                         xNameCont->insertByName(ODF_ID_PARAM, uno::makeAny(OUString::number(87))); // ww8::eCONTROL
                     }