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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue May 5 09:58:01 UTC 2020


 sc/source/filter/excel/xeextlst.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e53551db00d325dd638d45e50b32984dc778f17
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue May 5 09:03:36 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue May 5 11:57:19 2020 +0200

    Related: tdf#130108 ensure we don't reuse the last SetSearchMask setting
    
    Conditional style formats can only be SfxStyleFamily::Para formats
    as far as I see, and presumably we don't want to reuse any previous
    SetSearchMask settings here in xml export, so this looks like a dup
    of the same problem of
    
    commit 454a3c945fdc02d706b0a5ad49ca13e0443fa8e5
    Date:   Sun May 3 16:43:06 2020 +0100
    
        Resolves: tdf#130108 ensure we don't reuse the last SetSearchMask setting
    
    Change-Id: Ic26b450068bd1e13a3c82b1c1466630402498787
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93453
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx
index 0b2efd97ef22..50ef71556a08 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -153,7 +153,7 @@ void XclExpExtCF::SaveXml( XclExpXmlStream& rStrm )
 {
     OUString aStyleName = mrFormat.GetStyle();
     SfxStyleSheetBasePool* pPool = GetDoc().GetStyleSheetPool();
-    SfxStyleSheetBase* pStyle = pPool->Find(aStyleName, pPool->GetSearchFamily(), pPool->GetSearchMask());
+    SfxStyleSheetBase* pStyle = pPool->Find(aStyleName, SfxStyleFamily::Para);
     SfxItemSet& rSet = pStyle->GetItemSet();
 
     std::unique_ptr<ScTokenArray> pTokenArray(mrFormat.CreateFlatCopiedTokenArray(0));


More information about the Libreoffice-commits mailing list