diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-31 17:53:00 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-31 18:02:07 +0100 |
| commit | c14355592ccc249500ca58b3607888db195b06c0 (patch) | |
| tree | 6d3d3399cc2528aba0b2bfbcf0a8a01e5d2d8716 | |
| parent | 37bd8347e48d573fafc2c7a8220bd72708d1c673 (diff) | |
Related: fdo#66440 RTF export: handle NULL component in FlyFrameOLEMath()
No testcase, for some reason the bugdoc doesn't crash in
CppunitTest_sw_filters_test, but it does using './soffice --headless
--convert-to'. But anyway, it's just a NULL pointer check.
Change-Id: I21325a4df45b3b9bcd43d0a8eb57d45b3ab7397c
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index ef8c12ca046b..ed093348b1e8 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -3558,6 +3558,8 @@ bool RtfAttributeOutput::FlyFrameOLEMath(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENod m_aRunText->append("{" LO_STRING_SVTOOLS_RTF_MMATH " "); uno::Reference<util::XCloseable> xClosable(xObj->getComponent(), uno::UNO_QUERY); + if (!xClosable.is()) + return false; // gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast directly to the target class, // so help it with an intermediate cast. I'm not sure what exactly the problem is, seems to be unrelated // to RTLD_GLOBAL, so most probably a gcc bug. |