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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpframelayout.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d0bda255ad97d45f68a4d1fb3dcfcf0be4d4c4bc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 10 10:19:12 2015 +0000

    protect against missing Ruby Marker
    
    Change-Id: I04809443b5dc50904654936e608360b57c2e85c3
    (cherry picked from commit 215516a52fd01170bb4a79828b0f0948884b727a)
    (cherry picked from commit 6c296afad6b04328a596a92326aa50b1b480aba0)
    Reviewed-on: https://gerrit.libreoffice.org/20584
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index a3295c7..47a5614 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -1242,6 +1242,8 @@ void LwpRubyLayout::ConvertContentText()
 void LwpRubyLayout::RegisterStyle()
 {
     LwpRubyMarker* pMarker = GetMarker();
+    if (!pMarker)
+        throw std::runtime_error("missing Ruby Marker");
 
     XFRubyStyle* pRubyStyle = new XFRubyStyle;