diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2020-08-12 09:06:14 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-08-14 15:47:35 +0200 |
commit | 9902f6f7e567e6a1585833c751f5c19bf559705c (patch) | |
tree | 6683b7a2574996e156d7d14d4f463506fa21da31 /icon-themes/sifr_dark_svg | |
parent | d5a8056981562bfd5d191a7ceb0131cb52d06749 (diff) |
tdf#135144 xmloff textbox: fix export style name to be consitent with import
Regression from commit 28d67b792724a23015dec32fb0278b729f676736
(tdf#107776 sw ODF shape import: make is-textbox check more strict,
2019-08-26), the problem was that in case the import side in
SdXMLCustomShapeContext expects a fixed "Frame" parent style name, then
the export side should go with that name as well.
Fix the problem by simplifying XMLShapeExport::collectShapeAutoStyles(),
which initially assumed that the string may be localized, so try to look
it up: instead just use the fixed string that the import side will look
for.
This solves all problem which may stem from a parent style name which is
non-empty, but other than Frame.
(cherry picked from commit 347d05edd8910907ae185c61c1e56eee139b3c09)
Change-Id: I8146440c591d3dd5a904d243d85741d704711e9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100595
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'icon-themes/sifr_dark_svg')
0 files changed, 0 insertions, 0 deletions