summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-05-05 15:02:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-05-05 20:12:12 +0200
commita53d8a01da71a1a278ee159e901a4303a9fe0883 (patch)
treefb7881bbb3ac7b09e281d50a008a6fb127f99eeb /sfx2
parent37ee5d363890065ecc881e93ea540cfdebf76dfe (diff)
help states that SfxNewStyleDlg lists SfxStyleSearchBits::UserDefined styles
Change-Id: Ibf89d0ff1154b943a5650ac6cd6aa64a084c15cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93491 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/newstyle.cxx4
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 288fc39c1244..fcb2e9aac9a0 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -60,7 +60,7 @@ IMPL_LINK(SfxNewStyleDlg, ModifyHdl, weld::ComboBox&, rBox, void)
m_xOKBtn->set_sensitive(!rBox.get_active_text().replaceAll(" ", "").isEmpty());
}
-SfxNewStyleDlg::SfxNewStyleDlg(weld::Window* pParent, SfxStyleSheetBasePool& rInPool, SfxStyleFamily eFam, SfxStyleSearchBits nMask)
+SfxNewStyleDlg::SfxNewStyleDlg(weld::Window* pParent, SfxStyleSheetBasePool& rInPool, SfxStyleFamily eFam)
: GenericDialogController(pParent, "sfx/ui/newstyle.ui", "CreateStyleDialog")
, m_rPool(rInPool)
, m_eSearchFamily(eFam)
@@ -76,7 +76,7 @@ SfxNewStyleDlg::SfxNewStyleDlg(weld::Window* pParent, SfxStyleSheetBasePool& rIn
m_xColBox->connect_changed(LINK(this, SfxNewStyleDlg, ModifyHdl));
m_xColBox->connect_row_activated(LINK(this, SfxNewStyleDlg, OKHdl));
- auto xIter = m_rPool.CreateIterator(eFam, nMask);
+ auto xIter = m_rPool.CreateIterator(eFam, SfxStyleSearchBits::UserDefined);
SfxStyleSheetBase *pStyle = xIter->First();
while (pStyle)
{
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 2cfabba06da1..aab406227ef4 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1618,7 +1618,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(const OString& rEntry)
nFilter=pStyleSheetPool->GetSearchMask();
// why? : FloatingWindow must not be parent of a modal dialog
- SfxNewStyleDlg aDlg(pWindow ? pWindow->GetFrameWeld() : nullptr, *pStyleSheetPool, eFam, SfxStyleSearchBits::UserDefined);
+ SfxNewStyleDlg aDlg(pWindow ? pWindow->GetFrameWeld() : nullptr, *pStyleSheetPool, eFam);
auto nResult = aDlg.run();
pStyleSheetPool->SetSearchMask(eFam, nFilter);
if (nResult == RET_OK)