summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore/unostyle.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-05-03 20:13:21 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-05-04 17:47:13 +0200
commitfe70f736de7e5e92fcedc4b123e419ec805fdece (patch)
treea8d91dd220a66449b921032bbf4f6cf10378ce43 /sw/source/core/unocore/unostyle.cxx
parent322d8e516b81671c097717f406e821f8edf7f39b (diff)
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 <caolanm@redhat.com>
Diffstat (limited to 'sw/source/core/unocore/unostyle.cxx')
-rw-r--r--sw/source/core/unocore/unostyle.cxx6
1 files changed, 0 insertions, 6 deletions
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)