[Libreoffice-commits] core.git: svl/source

[Caolán McNamara (via logerrit)]

 svl/source/items/style.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 4a6175529c05b119471712889f5d50d7e8b5d91c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue May 5 11:30:50 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue May 5 14:17:06 2020 +0200

    don't need to save and restore the search mask if it doesn't get changed
    
    Change-Id: Ic7da569f9133d31783c238d7ca4a4cc1ae0244f8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93468
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index be80f702e06c..9650cead61eb 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -601,13 +601,11 @@ bool SfxStyleSheetBasePool::SetParent(SfxStyleFamily eFam, const OUString& rStyl
         return false;
 }
 
-
 void SfxStyleSheetBasePool::SetSearchMask(SfxStyleFamily eFam, SfxStyleSearchBits n)
 {
     nSearchFamily = eFam; nMask = n;
 }
 
-
 std::unique_ptr<SfxStyleSheetIterator> SfxStyleSheetBasePool::CreateIterator
 (
  SfxStyleFamily eFam,
@@ -805,8 +803,6 @@ void SfxStyleSheetBasePool::ChangeParent(const OUString& rOld,
                                          const OUString& rNew,
                                          bool bVirtual)
 {
-    const SfxStyleSearchBits nTmpMask = GetSearchMask();
-    SetSearchMask(GetSearchFamily());
     for( SfxStyleSheetBase* p = First(GetSearchFamily()); p; p = Next() )
     {
         if( p->GetParent() == rOld )
@@ -817,7 +813,6 @@ void SfxStyleSheetBasePool::ChangeParent(const OUString& rOld,
                 p->aParent = rNew;
         }
     }
-    SetSearchMask(GetSearchFamily(), nTmpMask);
 }
 
 SfxStyleSheet::SfxStyleSheet(const OUString &rName,