[Libreoffice-commits] core.git: include/sfx2 sc/source sfx2/source sw/source

[Caolán McNamara (via logerrit)]

 include/sfx2/newstyle.hxx       |    2 +-
 sc/source/ui/view/formatsh.cxx  |    2 +-
 sfx2/source/dialog/newstyle.cxx |    4 ++--
 sfx2/source/dialog/templdlg.cxx |    2 +-
 sw/source/uibase/app/docst.cxx  |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a53d8a01da71a1a278ee159e901a4303a9fe0883
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue May 5 15:02:11 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue May 5 20:12:12 2020 +0200

    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 at redhat.com>

diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index c61685d87fae..ea20fc9fc625 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -41,7 +41,7 @@ private:
     DECL_DLLPRIVATE_LINK(ModifyHdl, weld::ComboBox&, void);
 
 public:
-    SfxNewStyleDlg(weld::Window* pParent, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam, SfxStyleSearchBits nMask);
+    SfxNewStyleDlg(weld::Window* pParent, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam);
     virtual ~SfxNewStyleDlg() override;
 
     OUString                GetName() const { return comphelper::string::stripStart(m_xColBox->get_active_text(), ' '); }
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 7b5ae956bb2b..3ee7479df5f3 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -433,7 +433,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                         weld::Window* pDialogParent = rReq.GetFrameWeld();
                         if (!pDialogParent)
                             pDialogParent = pTabViewShell->GetFrameWeld();
-                        SfxNewStyleDlg aDlg(pDialogParent, *pStylePool, eFamily, SfxStyleSearchBits::All);
+                        SfxNewStyleDlg aDlg(pDialogParent, *pStylePool, eFamily);
                         if (aDlg.run() != RET_OK)
                             return;
                         aStyleName = aDlg.GetName();
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)
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 8a3e93e3f82f..ff96deea5f73 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -371,7 +371,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
                     case SID_STYLE_NEW_BY_EXAMPLE:
                     {
                         SfxStyleSheetBasePool& rPool = *GetStyleSheetPool();
-                        SfxNewStyleDlg aDlg(GetView()->GetFrameWeld(), rPool, rPool.GetSearchFamily(), SfxStyleSearchBits::All);
+                        SfxNewStyleDlg aDlg(GetView()->GetFrameWeld(), rPool, rPool.GetSearchFamily());
                         if (aDlg.run() == RET_OK)
                         {
                             aParam = aDlg.GetName();