summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2024-12-07 12:12:29 +0000
committerCaolán McNamara <caolan.mcnamara@collabora.com>2024-12-07 15:20:25 +0100
commite92db94e19c869050140fc1df64c09b59e97cd67 (patch)
tree5802a94c03e42c2a64ff8faa86ca80c41b207f8e
parentc97decfe2e4544f76a2b6f5704928cad0e30b56e (diff)
cid#1636579 Dereference after null check
and cid#1636580 Dereference after null check cid#1636581 Dereference after null check Change-Id: I856876a99a0bbccf27055d2db0dd24f7f040d3af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178036 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
-rw-r--r--sw/source/core/unocore/unostyle.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 67facb9fcf58..44b710f6d8fc 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -958,7 +958,7 @@ rtl::Reference<SwXBaseStyle> SwXStyleFamily::getStyleByName(const OUString& rNam
SolarMutexGuard aGuard;
OUString sStyleName;
SwStyleNameMapper::FillUIName(rName, sStyleName, m_rEntry.poolId(),
- m_pDocShell && !m_pDocShell->GetDoc()->IsInWriterfilterImport());
+ !m_pDocShell->GetDoc()->IsInWriterfilterImport());
if(!m_pBasePool)
throw uno::RuntimeException();
SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName, m_rEntry.family());
@@ -1026,7 +1026,7 @@ void SwXStyleFamily::insertStyleByName(const OUString& rName, const rtl::Referen
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());
if (pBase)
throw container::ElementExistException();
@@ -1040,7 +1040,7 @@ void SwXStyleFamily::insertByName(const OUString& rName, const uno::Any& rElemen
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());
if (pBase)
throw container::ElementExistException();