diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-12-08 11:42:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-12-08 16:55:53 +0100 |
| commit | 46cfd8d2a7a06fb5c04c027ce641a766af8a337a (patch) | |
| tree | 867e95bf14930c2c511db87704d2f25d440ccdbb /sw/source | |
| parent | 4a09777d8f043f79e4fdcb8d42ec60ea88ad14c0 (diff) | |
cid#1636664 Dereference after null check
Change-Id: I916212471a80417a582192920427999ee6a425d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178078
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 44b710f6d8fc..098750ab418d 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -956,11 +956,11 @@ rtl::Reference<SwXStyle> SwXStyleFamily::getParagraphStyleByName(const OUString& rtl::Reference<SwXBaseStyle> SwXStyleFamily::getStyleByName(const OUString& rName) { SolarMutexGuard aGuard; + if(!m_pBasePool) + throw uno::RuntimeException(); OUString sStyleName; SwStyleNameMapper::FillUIName(rName, sStyleName, m_rEntry.poolId(), !m_pDocShell->GetDoc()->IsInWriterfilterImport()); - if(!m_pBasePool) - throw uno::RuntimeException(); SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName, m_rEntry.family()); if(!pBase) throw container::NoSuchElementException(rName); @@ -1104,7 +1104,7 @@ void SwXStyleFamily::replaceByName(const OUString& rName, const uno::Any& rEleme throw uno::RuntimeException(); OUString sStyleName; SwStyleNameMapper::FillUIName(rName, sStyleName, m_rEntry.poolId(), - m_pDocShell && !m_pDocShell->GetDoc()->IsInWriterfilterImport()); + !m_pDocShell->GetDoc()->IsInWriterfilterImport()); SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName, m_rEntry.family()); // replacements only for userdefined styles if(!pBase) |