summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-05-05 15:18:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-05-05 20:15:02 +0200
commitebcd29ab3b16ab93a523122a672c5f08fcbce4a0 (patch)
tree61be5bcdb9de6f386d6ca0ada7d30ebabafa36dd /sw/source
parentf572f4f5e8ea3058b85c8aed7ee2647e4362de74 (diff)
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>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/doc/docdesc.cxx1
-rw-r--r--sw/source/core/unocore/unostyle.cxx17
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx1
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx2
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx1
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx2
-rw-r--r--sw/source/ui/misc/docfnote.cxx1
-rw-r--r--sw/source/uibase/sidebar/ThemePanel.cxx4
-rw-r--r--sw/source/uibase/utlui/tmplctrl.cxx1
-rw-r--r--sw/source/uibase/utlui/uitool.cxx1
10 files changed, 0 insertions, 31 deletions
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index a832eed9ef9e..036185e88d7d 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -602,7 +602,6 @@ void SwDoc::BroadcastStyleOperation(const OUString& rName, SfxStyleFamily eFamil
if (pPool)
{
- pPool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pPool->Find(rName, eFamily);
if (pBase != nullptr)
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index c38a70ec6234..f43ba36c59a7 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -890,7 +890,6 @@ uno::Any XStyleFamily::getByName(const OUString& rName)
SwStyleNameMapper::FillUIName(rName, sStyleName, m_rEntry.m_aPoolId);
if(!m_pBasePool)
throw uno::RuntimeException();
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName, m_rEntry.m_eFamily);
if(!pBase)
throw container::NoSuchElementException();
@@ -923,12 +922,10 @@ sal_Bool XStyleFamily::hasByName(const OUString& rName)
throw uno::RuntimeException();
OUString sStyleName;
SwStyleNameMapper::FillUIName(rName, sStyleName, m_rEntry.m_aPoolId);
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName, m_rEntry.m_eFamily);
return nullptr != pBase;
}
-
void XStyleFamily::insertByName(const OUString& rName, const uno::Any& rElement)
{
SolarMutexGuard aGuard;
@@ -936,7 +933,6 @@ void XStyleFamily::insertByName(const OUString& rName, const uno::Any& rElement)
throw uno::RuntimeException();
OUString sStyleName;
SwStyleNameMapper::FillUIName(rName, sStyleName, m_rEntry.m_aPoolId);
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName, m_rEntry.m_eFamily);
SfxStyleSheetBase* pUINameBase = m_pBasePool->Find(sStyleName, m_rEntry.m_eFamily);
if(pBase || pUINameBase)
@@ -989,7 +985,6 @@ void XStyleFamily::insertByName(const OUString& rName, const uno::Any& rElement)
const OUString sParentStyleName(pNewStyle->GetParentStyleName());
if (!sParentStyleName.isEmpty())
{
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pParentBase = m_pBasePool->Find(sParentStyleName, m_rEntry.m_eFamily);
if(pParentBase && pParentBase->GetFamily() == m_rEntry.m_eFamily &&
pParentBase->GetPool() == m_pBasePool)
@@ -1007,7 +1002,6 @@ void XStyleFamily::replaceByName(const OUString& rName, const uno::Any& rElement
throw uno::RuntimeException();
OUString sStyleName;
SwStyleNameMapper::FillUIName(rName, sStyleName, m_rEntry.m_aPoolId);
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName, m_rEntry.m_eFamily);
// replacements only for userdefined styles
if(!pBase)
@@ -1067,7 +1061,6 @@ void XStyleFamily::removeByName(const OUString& rName)
SolarMutexGuard aGuard;
if(!m_pBasePool)
throw uno::RuntimeException();
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
OUString sName;
SwStyleNameMapper::FillUIName(rName, sName, m_rEntry.m_aPoolId);
SfxStyleSheetBase* pBase = m_pBasePool->Find(sName, m_rEntry.m_eFamily);
@@ -1305,7 +1298,6 @@ static bool lcl_InitConditional(SfxStyleSheetBasePool* pBasePool, const SfxStyle
{
if(!pBasePool || eFamily != SfxStyleFamily::Para)
return false;
- pBasePool->SetSearchMask(eFamily);
SfxStyleSheetBase* pBase = pBasePool->Find(rStyleName, eFamily);
SAL_WARN_IF(!pBase, "sw.uno", "where is the style?" );
if(!pBase)
@@ -1374,7 +1366,6 @@ OUString SwXStyle::getName()
SolarMutexGuard aGuard;
if(!m_pBasePool)
return m_sStyleName;
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName, m_rEntry.m_eFamily);
SAL_WARN_IF(!pBase, "sw.uno", "where is the style?");
if(!pBase)
@@ -1392,7 +1383,6 @@ void SwXStyle::setName(const OUString& rName)
m_sStyleName = rName;
return;
}
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName, m_rEntry.m_eFamily);
SAL_WARN_IF(!pBase, "sw.uno", "where is the style?");
if(!pBase || !pBase->IsUserDefined())
@@ -1408,7 +1398,6 @@ sal_Bool SwXStyle::isUserDefined()
SolarMutexGuard aGuard;
if(!m_pBasePool)
throw uno::RuntimeException();
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName, m_rEntry.m_eFamily);
//if it is not found it must be non user defined
return pBase && pBase->IsUserDefined();
@@ -1419,7 +1408,6 @@ sal_Bool SwXStyle::isInUse()
SolarMutexGuard aGuard;
if(!m_pBasePool)
throw uno::RuntimeException();
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily, SfxStyleSearchBits::Used);
SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName, m_rEntry.m_eFamily, SfxStyleSearchBits::Used);
return pBase && pBase->IsUsed();
}
@@ -1433,7 +1421,6 @@ OUString SwXStyle::getParentStyle()
throw uno::RuntimeException();
return m_sParentStyleName;
}
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName, m_rEntry.m_eFamily);
OUString aString;
if(pBase)
@@ -1461,7 +1448,6 @@ void SwXStyle::setParentStyle(const OUString& rParentStyle)
{ }
return;
}
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName, m_rEntry.m_eFamily);
if(!pBase)
throw uno::RuntimeException();
@@ -1897,7 +1883,6 @@ void SwXStyle::SetPropertyValue<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemPrope
const auto nIdx(GetCommandContextIndex(rNamedValue.Name));
if (nIdx == -1)
throw lang::IllegalArgumentException();
- m_pBasePool->SetSearchMask(SfxStyleFamily::Para);
bool bStyleFound = false;
for(auto pBase = m_pBasePool->First(SfxStyleFamily::Para); pBase; pBase = m_pBasePool->Next())
{
@@ -2514,7 +2499,6 @@ uno::Sequence<beans::PropertyState> SwXStyle::getPropertyStates(const uno::Seque
if(!m_pBasePool)
throw uno::RuntimeException();
- m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName, m_rEntry.m_eFamily);
SAL_WARN_IF(!pBase, "sw.uno", "where is the style?");
@@ -2812,7 +2796,6 @@ void SwXStyle::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
else if(rHint.GetId() == SfxHintId::StyleSheetChanged)
{
SfxStyleSheetBasePool& rBP = static_cast<SfxStyleSheetBasePool&>(rBC);
- rBP.SetSearchMask(m_rEntry.m_eFamily);
SfxStyleSheetBase* pOwnBase = rBP.Find(m_sStyleName, m_rEntry.m_eFamily);
if(!pOwnBase)
{
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 30360c3d88ea..e64932300c3b 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -208,7 +208,6 @@ void SwParaDlg::PageCreated(const OString& rId, SfxTabPage& rPage)
static_cast<SwParagraphNumTabPage&>(rPage).EnableNewStart();
weld::ComboBox& rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox();
SfxStyleSheetBasePool* pPool = rView.GetDocShell()->GetStyleSheetPool();
- pPool->SetSearchMask(SfxStyleFamily::Pseudo);
const SfxStyleSheetBase* pBase = pPool->First(SfxStyleFamily::Pseudo);
std::set<OUString> aNames;
while(pBase)
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 7fcd29541cee..b4b722f6374b 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -133,7 +133,6 @@ void SwCondCollPage::Reset(const SfxItemSet *)
m_xTbLinks->clear();
SfxStyleSheetBasePool* pPool = m_rSh.GetView().GetDocShell()->GetStyleSheetPool();
- pPool->SetSearchMask(SfxStyleFamily::Para);
m_xStyleLB->clear();
const SfxStyleSheetBase* pBase = pPool->First(SfxStyleFamily::Para);
while (pBase)
@@ -223,7 +222,6 @@ void SwCondCollPage::SelectHdl(const weld::Widget* pBox)
const sal_Int32 nSelPos = m_xFilterLB->get_active();
const SfxStyleSearchBits nSearchFlags = static_cast<SfxStyleSearchBits>(m_xFilterLB->get_id(nSelPos).toInt32());
SfxStyleSheetBasePool* pPool = m_rSh.GetView().GetDocShell()->GetStyleSheetPool();
- pPool->SetSearchMask(SfxStyleFamily::Para, nSearchFlags);
const SfxStyleSheetBase* pBase = pPool->First(SfxStyleFamily::Para, nSearchFlags);
bool bEmpty = true;
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index f1cdecde7e1c..53bbc0b619e9 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -307,7 +307,6 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
// fill paragraph templates-ListBox
{
SfxStyleSheetBasePool* pPool = pView->GetDocShell()->GetStyleSheetPool();
- pPool->SetSearchMask( SfxStyleFamily::Para );
m_xLbDbParaColl->append_text( sNoTmpl );
const SfxStyleSheetBase* pBase = pPool->First(SfxStyleFamily::Para);
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index a522a2612237..b9914d319ac4 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -337,7 +337,6 @@ void SwTemplateDlgController::PageCreated(const OString& rId, SfxTabPage &rPage
{
SfxStyleSheetBasePool* pStyleSheetPool = pWrtShell->
GetView().GetDocShell()->GetStyleSheetPool();
- pStyleSheetPool->SetSearchMask(SfxStyleFamily::Para);
SfxStyleSheetBase *pFirstStyle = pStyleSheetPool->First(SfxStyleFamily::Para);
while(pFirstStyle)
{
@@ -440,7 +439,6 @@ void SwTemplateDlgController::PageCreated(const OString& rId, SfxTabPage &rPage
}//<-end
weld::ComboBox& rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox();
SfxStyleSheetBasePool* pPool = pWrtShell->GetView().GetDocShell()->GetStyleSheetPool();
- pPool->SetSearchMask(SfxStyleFamily::Pseudo);
const SfxStyleSheetBase* pBase = pPool->First(SfxStyleFamily::Pseudo);
std::set<OUString> aNames;
while(pBase)
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 6762c04b7d28..1455565d687f 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -164,7 +164,6 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
// styles special regions
// paragraph
SfxStyleSheetBasePool* pStyleSheetPool = pSh->GetView().GetDocShell()->GetStyleSheetPool();
- pStyleSheetPool->SetSearchMask(SfxStyleFamily::Para, SfxStyleSearchBits::SwExtra);
SfxStyleSheetBase *pStyle = pStyleSheetPool->First(SfxStyleFamily::Para, SfxStyleSearchBits::SwExtra);
while(pStyle)
{
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index 7e24d4be5f92..18abd157b71a 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -335,9 +335,7 @@ void applyTheme(SfxStyleSheetBasePool* pPool, const OUString& sFontSetName, cons
svx::ColorSet aColorSet = rColorSets.getColorSet(sColorSetName);
- pPool->SetSearchMask(SfxStyleFamily::Para);
pStyle = static_cast<SwDocStyleSheet*>(pPool->First(SfxStyleFamily::Para));
-
while (pStyle)
{
SwTextFormatColl* pCollection = pStyle->GetCollection();
@@ -354,9 +352,7 @@ void applyTheme(SfxStyleSheetBasePool* pPool, const OUString& sFontSetName, cons
pStyle = static_cast<SwDocStyleSheet*>(pPool->Next());
}
- pPool->SetSearchMask(SfxStyleFamily::Char);
pStyle = static_cast<SwDocStyleSheet*>(pPool->First(SfxStyleFamily::Char));
-
while (pStyle)
{
SwCharFormat* pCharFormat = pStyle->GetCharFormat();
diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx
index eb3fb95c989b..2220c776e2b6 100644
--- a/sw/source/uibase/utlui/tmplctrl.cxx
+++ b/sw/source/uibase/utlui/tmplctrl.cxx
@@ -110,7 +110,6 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt )
{
SfxStyleSheetBasePool* pPool = pView->GetDocShell()->
GetStyleSheetPool();
- pPool->SetSearchMask(SfxStyleFamily::Page);
auto xIter = pPool->CreateIterator(SfxStyleFamily::Page);
if (xIter->Count() > 1)
{
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 711763c4c236..fb41aaa6f66f 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -714,7 +714,6 @@ void FillCharStyleListBox(weld::ComboBox& rToFill, SwDocShell* pDocSh, bool bSor
const int nOffset = rToFill.get_count() > 0 ? 1 : 0;
rToFill.freeze();
SfxStyleSheetBasePool* pPool = pDocSh->GetStyleSheetPool();
- pPool->SetSearchMask(SfxStyleFamily::Char);
SwDoc* pDoc = pDocSh->GetDoc();
const SfxStyleSheetBase* pBase = pPool->First(SfxStyleFamily::Char);
const OUString sStandard(SwResId(STR_POOLCHR_STANDARD));