[Libreoffice-commits] core.git: sc/inc sc/source

[Caolán McNamara (via logerrit)]

 sc/inc/stlpool.hxx               |    2 +-
 sc/source/core/data/stlpool.cxx  |    4 ++--
 sc/source/ui/docshell/docsh.cxx  |    2 +-
 sc/source/ui/docshell/docsh2.cxx |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

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

    ScOrcusStyles::commit_cell_style creates SfxStyleFamily::Para styles
    
    and setAllStandard is only called on the results of that
    
    so rename it to setAllParaStandard and we can safely assume that
    the mask should be ::All
    
    Change-Id: I087b40ed919c1b8724d5d36bae2f94180148cec2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93470
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx
index 0f1a873603c1..012d4b714658 100644
--- a/sc/inc/stlpool.hxx
+++ b/sc/inc/stlpool.hxx
@@ -56,7 +56,7 @@ public:
     virtual SfxStyleSheetBase& Make( const OUString&, SfxStyleFamily eFam,
                                      SfxStyleSearchBits nMask = SfxStyleSearchBits::All) override;
 
-    void setAllStandard();
+    void setAllParaStandard();
 
 private:
     virtual             ~ScStyleSheetPool() override;
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 8f38c8846da2..9dc911258d68 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -420,9 +420,9 @@ ScStyleSheet* ScStyleSheetPool::FindCaseIns( const OUString& rName, SfxStyleFami
     return nullptr;
 }
 
-void ScStyleSheetPool::setAllStandard()
+void ScStyleSheetPool::setAllParaStandard()
 {
-    SfxStyleSheetBase* pSheet = First(GetSearchFamily(), GetSearchMask());
+    SfxStyleSheetBase* pSheet = First(SfxStyleFamily::Para);
     while (pSheet)
     {
         pSheet->SetMask(SfxStyleSearchBits::ScStandard);
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index b2f7aba2e6b2..96b3d6623364 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -621,7 +621,7 @@ bool ScDocShell::Load( SfxMedium& rMedium )
                 if (pOrcus)
                 {
                     pOrcus->importODS_Styles(m_aDocument, aPath);
-                    m_aDocument.GetStyleSheetPool()->setAllStandard();
+                    m_aDocument.GetStyleSheetPool()->setAllParaStandard();
                 }
             }
 
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 3749d4eff038..ef5b61f03e53 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -72,7 +72,7 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
         if (pOrcus)
         {
             pOrcus->importODS_Styles(m_aDocument, aPath);
-            m_aDocument.GetStyleSheetPool()->setAllStandard();
+            m_aDocument.GetStyleSheetPool()->setAllParaStandard();
         }
     }