diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2011-08-01 19:55:42 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2011-08-02 23:33:58 +0200 |
| commit | aba21efaac19452e281e3d151e8f433c680c736e (patch) | |
| tree | 211d1e96fa8fb555c2678a60aa56b8bb529663cb /sw | |
| parent | 4670f1940b2051621ae1fa51f766f6001dd531e3 (diff) | |
MSWordExportBase::ExportDocument: check if we have a DocShell
This fixes a crash during RTF export invoked by copy&paste, as the
called constructor would unconditionally dereference the DocShell's
pointer since commit 183c9723dce0296baa0a38220199a1aa0e9f52ca.
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 35c02f38bc3b..0bcfe144bdf7 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2925,7 +2925,7 @@ void MSWordExportBase::ExportDocument( bool bWriteAll ) if ( !pOleMap) pOleMap = new WW8OleMaps; - if ( !pOCXExp ) + if ( !pOCXExp && pDoc->GetDocShell() ) pOCXExp = new SwMSConvertControls( pDoc->GetDocShell(), pCurPam ); // #i81405# - Collect anchored objects before changing the redline mode. |