sw/source/core/unocore/unostyle.cxx | 6 ------ 1 file changed, 6 deletions(-)
New commits: commit fe70f736de7e5e92fcedc4b123e419ec805fdece Author: Caolán McNamara <[email protected]> AuthorDate: Sun May 3 20:13:21 2020 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon May 4 17:47:13 2020 +0200 no need to save and restore the SaveMask if we don't change it Change-Id: I4cc4c68fee1e38fd5fc7b20685e722d51fc791a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93356 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 2c3c2a60d3cb..90a0f5a97d40 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -2074,10 +2074,7 @@ void SwXStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rPropertyNa SwStyleBase_Impl aBaseImpl(*m_pDoc, m_sStyleName, &GetDoc()->GetDfltTextFormatColl()->GetAttrSet()); // add pDfltTextFormatColl as parent if(m_pBasePool) { - const SfxStyleSearchBits nSaveMask = m_pBasePool->GetSearchMask(); - m_pBasePool->SetSearchMask(m_rEntry.m_eFamily); SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName, m_rEntry.m_eFamily); - m_pBasePool->SetSearchMask(m_rEntry.m_eFamily, nSaveMask); SAL_WARN_IF(!pBase, "sw.uno", "where is the style?"); if(!pBase) throw uno::RuntimeException(); @@ -2127,10 +2124,7 @@ SfxStyleSheetBase* SwXStyle::GetStyleSheetBase() { if(!m_pBasePool) return nullptr; - const SfxStyleSearchBits nSaveMask = m_pBasePool->GetSearchMask(); - m_pBasePool->SetSearchMask(m_rEntry.m_eFamily); SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName, m_rEntry.m_eFamily); - m_pBasePool->SetSearchMask(m_rEntry.m_eFamily, nSaveMask ); return pBase; } void SwXStyle::PrepareStyleBase(SwStyleBase_Impl& rBase) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
