diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-26 15:20:14 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-29 09:05:27 +0200 |
| commit | 64ac796d5f5999541eedcf418ae146fdfb0a0284 (patch) | |
| tree | 8a5b0f1b31b7e3a70a88c67470e507a758f997a7 /sw | |
| parent | 9b524402be24c7ac24f044181c4dcd7123b083df (diff) | |
fix crash on exporting kde140265-1.doc to ODT
properties.pSGlobalShell can be legitimately 0 here.
No testcase, for some reason the export does not crash if it's done by
CppunitTest_sw_filters_test or CppunitTest_sw_odfexport; but it does
crash with '--headless --convert-to odt kde140265-1.doc'.
Change-Id: I50936f9e5236763cc987aba14d8fc897c4b789bf
(cherry picked from commit 4cd3f9a7749b8ef285012a59d031dc9f2e4b5e43)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index bcec037999c8..23b19336cb85 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -1509,7 +1509,7 @@ static void lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, } } - ::SwAlignRect( rRect, properties.pSGlobalShell, properties.pSGlobalShell->GetOut() ); + ::SwAlignRect( rRect, properties.pSGlobalShell, properties.pSGlobalShell ? properties.pSGlobalShell->GetOut() : 0 ); } /** |