[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - lotuswordpro/qa lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/qa/cppunit/data/fail/registered-1.lwp |binary
 lotuswordpro/source/filter/lwpfrib.cxx             |    2 ++
 2 files changed, 2 insertions(+)

New commits:
commit 20ca0794bbac17e47eda9379b15513c780453566
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 21 09:18:21 2018 +0000

    ofz#7043 already registered
    
    Change-Id: Ic94891c82944d04fe3391c0bd0731a6e3e4373e0
    Reviewed-on: https://gerrit.libreoffice.org/51693
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/lotuswordpro/qa/cppunit/data/fail/registered-1.lwp b/lotuswordpro/qa/cppunit/data/fail/registered-1.lwp
new file mode 100644
index 000000000000..f3419f45b369
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/registered-1.lwp differ
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index baebf753ed03..f97d9041f9c9 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -451,6 +451,8 @@ XFColor LwpFrib::GetHighlightColor()
 
 void LwpFrib::Register(std::map<LwpFrib*,OUString>* pFribMap)
 {
+    if (m_pFribMap)
+        throw std::runtime_error("registered already");
     m_pFribMap = pFribMap;
 }