sc/source/filter/excel/xeextlst.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit bf1527f84cf914c7150f49c752ec6c4590859ac5 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Tue May 5 09:03:36 2020 +0100 Commit: Aron Budea <aron.bu...@collabora.com> CommitDate: Mon Jan 4 14:38:11 2021 +0100 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 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93453 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> (cherry picked from commit 8e53551db00d325dd638d45e50b32984dc778f17) Change-Id: Ic26b450068bd1e13a3c82b1c1466630402498787 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108662 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Aron Budea <aron.bu...@collabora.com> diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx index a3c25320ff72..f6dca0bb8cfd 100644 --- a/sc/source/filter/excel/xeextlst.cxx +++ b/sc/source/filter/excel/xeextlst.cxx @@ -152,7 +152,7 @@ XclExpExtCF::XclExpExtCF( const XclExpRoot& rRoot, const ScCondFormatEntry& rFor void XclExpExtCF::SaveXml( XclExpXmlStream& rStrm ) { OUString aStyleName = mrFormat.GetStyle(); - SfxStyleSheetBase* pStyle = GetDoc().GetStyleSheetPool()->Find(aStyleName); + SfxStyleSheetBase* pStyle = GetDoc().GetStyleSheetPool()->Find(aStyleName, SfxStyleFamily::Para); SfxItemSet& rSet = pStyle->GetItemSet(); std::unique_ptr<ScTokenArray> pTokenArray(mrFormat.CreateFlatCopiedTokenArray(0)); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits