diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-03-26 07:56:19 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-03-26 07:56:19 +0000 |
| commit | 05d8a675805cc0e356a493b3f422c99d74e124cd (patch) | |
| tree | 64e1a796478861455d70c8ff8da24a08639d9300 /starmath | |
| parent | 2b3cf6bf1361573658d02cb2c90c756086d4acb3 (diff) | |
INTEGRATION: CWS tl51_DEV300 (1.84.60); FILE MERGED
2008/01/08 14:11:12 tl 1.84.60.1: #i78549# fix crash when reading file written with KOffice
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/mathml.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/starmath/source/mathml.cxx b/starmath/source/mathml.cxx index 10d2a323111d..fba3b1bbddc1 100644 --- a/starmath/source/mathml.cxx +++ b/starmath/source/mathml.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mathml.cxx,v $ * - * $Revision: 1.85 $ + * $Revision: 1.86 $ * - * last change: $Author: obo $ $Date: 2008-02-26 14:44:25 $ + * last change: $Author: obo $ $Date: 2008-03-26 08:56:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3143,12 +3143,12 @@ void SmXMLMultiScriptsContext_Impl::MiddleElement() SmNode *pScriptNode = aReverseStack.Pop(); - if ((pScriptNode->GetToken().eType != TIDENT) || - (pScriptNode->GetToken().aText.Len())) + if (pScriptNode && ((pScriptNode->GetToken().eType != TIDENT) || + (pScriptNode->GetToken().aText.Len()))) aSubNodes.Put(RSUB+1,pScriptNode); pScriptNode = aReverseStack.Pop(); - if ((pScriptNode->GetToken().eType != TIDENT) || - (pScriptNode->GetToken().aText.Len())) + if (pScriptNode && ((pScriptNode->GetToken().eType != TIDENT) || + (pScriptNode->GetToken().aText.Len()))) aSubNodes.Put(RSUP+1,pScriptNode); pNode->SetSubNodes(aSubNodes); |