[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Sep 1 17:52:00 UTC 2020


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

New commits:
commit b728086a822d52fc5f2efbc855ae632e4147fb69
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun May 3 16:43:06 2020 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Tue Sep 1 19:51:27 2020 +0200

    Resolves: tdf#130108 ensure we don't reuse the last SetSearchMask setting
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93366
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit c8a4fa577e5daec6520a810b4df753a67d9dd5a8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93372
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 636e1dff386d130e46ab39417d0d447241f33dde)
    
    Change-Id: Iddc4438b8bd30576be4531d47b6be0ac70847a9c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101884
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index a9f31e0ac953..c3be0d7830cc 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3035,7 +3035,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
                     {
                         maStyleNameToDxfId.insert(std::pair<OUString, sal_Int32>(aStyleName, nIndex));
 
-                        SfxStyleSheetBase* pStyle = rRoot.GetDoc().GetStyleSheetPool()->Find(aStyleName);
+                        SfxStyleSheetBase* pStyle = rRoot.GetDoc().GetStyleSheetPool()->Find(aStyleName, SfxStyleFamily::Para);
                         if(!pStyle)
                             continue;
 


More information about the Libreoffice-commits mailing list