diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2021-05-12 14:59:43 +0200 |
---|---|---|
committer | Aron Budea <aron.budea@collabora.com> | 2021-10-23 18:30:15 +0200 |
commit | 65155800efce845b0c30f3c0de77337eed1b34f7 (patch) | |
tree | 5b7304cd38e376bc77250a8c8fd007ececccea66 /xmlsecurity/source/helper/xsecsign.cxx | |
parent | 94f9c42a39d511504ddc65839eb5442e19706ed0 (diff) |
tdf#137810 sw: fix SwXNumberingRules setting CharStyleName
During ODF import, due to removal of the pDocShell parameter, this hits
else
rCharStyleName = sCharFormatName;
while setting the "CharStyleName" property and later
GetNumberingRuleByIndex() prefers m_sNewCharStyleNames over the
format set in the SwCharFormat??
Also, "BulletFontName" has a similar problem; otoh "HeadingStyleName"
only makes sense on chapter numbering.
The m_pDoc and m_pDocShell members are such a WTF.
(regression from ae0e4a6ba9be2fa99ac2be8e20157806e36209b2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115495
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit c5e5467f6a13aba68b4706a4d7feb130e824bcc6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115291
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 2a71eac9027b3838f675ad20c91320abca8bb884)
Change-Id: I9d4d4cd7aeb7e6e29221d53facaff213fd4e35a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124088
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Diffstat (limited to 'xmlsecurity/source/helper/xsecsign.cxx')
0 files changed, 0 insertions, 0 deletions