diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-08-14 12:33:52 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-08-14 13:41:12 +0300 |
| commit | aa4b8a8164f01a120ba9bfb2e86b1ed33cc1d69c (patch) | |
| tree | 46e8b98a0af315d2f4cc9d1dfb9eeb63c526ff7c /starmath | |
| parent | 318590b2900ff01ac36bb0bab84ddb69ffa0f9c9 (diff) | |
Be more careful in recognizing MathML (bnc#774921)
Change-Id: I82c36a3ff49f74dc674df46dcf35f8c1a991c9e2
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/smdetect.cxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index 5a363757c86f..da11ce6ebcd6 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -312,10 +312,20 @@ SmFilterDetect::~SmFilterDetect() { if (0 == strncmp( "<?xml",aBuffer,nSize)) { - static const sal_Char sFltrNm_2[] = MATHML_XML; - static const sal_Char sTypeNm_2[] = "math_MathML_XML_Math"; - aFilterName.AssignAscii( sFltrNm_2 ); - aTypeName.AssignAscii( sTypeNm_2 ); + // 200 should be enough for the XML + // version, encoding and !DOCTYPE + // stuff I hope? + sal_Char aBuffer2[200]; + nBytesRead = pStrm->Read( aBuffer2, sizeof(aBuffer2) - 1); + aBuffer2[nBytesRead] = 0; + if (strstr( aBuffer2, "<math>" ) != NULL || + strstr( aBuffer2, "<math " ) != NULL) + { + static const sal_Char sFltrNm_2[] = MATHML_XML; + static const sal_Char sTypeNm_2[] = "math_MathML_XML_Math"; + aFilterName.AssignAscii( sFltrNm_2 ); + aTypeName.AssignAscii( sTypeNm_2 ); + } } } } |