remove unused nSearchFamily and nMask members

and so SetSearchMask which doesn't have any effect anymore

Change-Id: I0b7f402ce0317971d5196fc448fe2945a6a292f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93393
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 2 insertions, 12 deletions

diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 5598880e2189..46536f3f4d8c 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -103,7 +103,6 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(weld::Container* pPage, weld::D
 
     if ( pPool )
     {
-        pPool->SetSearchMask( pStyle->GetFamily() );
         pPool->First(pStyle->GetFamily()); // for SW - update internal list
     }
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 8d52f5ae8ad5..4ed0673dbe5e 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -961,7 +961,6 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
     if (!pItem)
         return;
     const SfxStyleFamily eFam = pItem->GetFamily();
-    pStyleSheetPool->SetSearchMask(eFam, SfxStyleSearchBits::AllVisible);
     StyleTreeArr_Impl aArr;
     SfxStyleSheetBase* pStyle = pStyleSheetPool->First(eFam, SfxStyleSearchBits::AllVisible);
 
@@ -1049,7 +1048,6 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags)
     if(!pStyleSheetPool)
         return;
 
-    pStyleSheetPool->SetSearchMask(eFam, nFilter);
     pItem = GetFamilyItem_Impl();
     if(nFlags & StyleFlags::UpdateFamily)   // Update view type list (Hierarchical, All, etc.
     {
@@ -1072,7 +1070,6 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags)
             nActFilter = 0;
             mxFilterLb->set_active(1);
             nFilter = (nActFilter < rFilter.size()) ? rFilter[nActFilter].nFlags : SfxStyleSearchBits::Auto;
-            pStyleSheetPool->SetSearchMask(eFam, nFilter);
         }
 
         // if the tree view again, select family hierarchy
@@ -1616,7 +1613,6 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(const OString& rEntry)
             // why? : FloatingWindow must not be parent of a modal dialog
             SfxNewStyleDlg aDlg(pWindow ? pWindow->GetFrameWeld() : nullptr, *pStyleSheetPool, eFam);
             auto nResult = aDlg.run();
-            pStyleSheetPool->SetSearchMask(eFam, nFilter);
             if (nResult ==  RET_OK)
             {
                 const OUString aTemplName(aDlg.GetName());
@@ -1714,18 +1710,16 @@ void SfxCommonTemplateDialog_Impl::NewHdl()
         return;
 
     const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
-    const SfxStyleFamily eFam=pItem->GetFamily();
+    const SfxStyleFamily eFam = pItem->GetFamily();
     SfxStyleSearchBits nMask(SfxStyleSearchBits::Auto);
     if (nActFilter != 0xffff)
         nMask = pItem->GetFilterList()[nActFilter].nFlags;
     if (nMask == SfxStyleSearchBits::Auto)    // automatic
         nMask = nAppFilter;
 
-    pStyleSheetPool->SetSearchMask(eFam,nMask);
-
     Execute_Impl(SID_STYLE_NEW,
                  "", GetSelectedEntry(),
-                 static_cast<sal_uInt16>(GetFamilyItem_Impl()->GetFamily()),
+                 static_cast<sal_uInt16>(eFam),
                  nMask);
 }
 
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index b1ee8eca0bf7..3055a52cc3d0 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -313,7 +313,6 @@ void SfxObjectShell::LoadStyles
     DBG_ASSERT(pSourcePool, "Source-DocumentShell without StyleSheetPool");
     SfxStyleSheetBasePool *pMyPool = GetStyleSheetPool();
     DBG_ASSERT(pMyPool, "Dest-DocumentShell without StyleSheetPool");
-    pSourcePool->SetSearchMask(SfxStyleFamily::All);
     auto xIter = pSourcePool->CreateIterator(SfxStyleFamily::All);
     std::unique_ptr<Styles_Impl[]> pFound(new Styles_Impl[xIter->Count()]);
     sal_uInt16 nFound = 0;
diff --git a/sfx2/source/styles/StyleManager.cxx b/sfx2/source/styles/StyleManager.cxx
index 83fc314d8407..95bdeac80122 100644
--- a/sfx2/source/styles/StyleManager.cxx
+++ b/sfx2/source/styles/StyleManager.cxx
@@ -18,8 +18,6 @@ SfxStyleSheetBase* StyleManager::Search(const OUString& rStyleName, SfxStyleFami
     if (!pPool)
         return nullptr;
 
-    pPool->SetSearchMask(eFamily);
-
     SfxStyleSheetBase* pStyle = pPool->First(eFamily);
     while (pStyle)
     {