diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-25 12:06:20 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-08-22 12:17:08 +0200 |
| commit | 25b1afa3d012910bf29ba043726f6fb53b630c83 (patch) | |
| tree | 5fdad6d0947b3e1a3011b467b548e2f5333182a5 | |
| parent | c7f2bb7b9de2c44021bc56ec6253f32cfbee1798 (diff) | |
Resolves: tdf#124142 don't deref nullptr
Change-Id: Ie14600e9f9a1e1c4e99c7a872f5d677453481888
Reviewed-on: https://gerrit.libreoffice.org/69666
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ac7ce7a64ef903bad1476f5635a7b2a1e951a7a3)
Reviewed-on: https://gerrit.libreoffice.org/69694
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit cdef6e5f4053adf5413781a9282285eab3923373)
| -rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index db6fc57152c3..4896abbaf98e 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -194,7 +194,8 @@ namespace sw , m_pBasePool(pDocShell->GetStyleSheetPool()) , m_pDocShell(pDocShell) { - StartListening(*m_pBasePool); + if (m_pBasePool) //tdf#124142 html docs can have no styles + StartListening(*m_pBasePool); } virtual ~XStyleFamily() override {}; |