diff options
| author | Regina Henschel <rb.henschel@t-online.de> | 2022-10-20 14:28:07 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-10-24 15:09:37 +0200 |
| commit | 9ad7df41572d67687221cb43d53cde27a45fff0f (patch) | |
| tree | b2c81fe59972afd4c478abe36161c8875939cad4 /solenv | |
| parent | dba424efc15aa2915c38721c27edf0cc1d716bd1 (diff) | |
tdf#83671 make SmartArt visible in import of xlsx
Problem is, that Excel writes a zero size in xdr:xfrm for the SmartArt.
With that the import generates a background size with zero width and
height and no shapes at all in the SmartArt group. The diagram DOM is
imported correctly. The actual size is not known until the row and column
values of the anchor are evaluated.
The idea of this patch is to correct the background size directly and to
repeat the import of drawing.xml when the actual size is known.
I noticed that in import of SmartArt in docx there is a similar problem
that the SmartArt shapes are missing at some point, as can be seen in
ShapeContextHandler::getShape(), about line 428. It uses
ShapeDrawingFragmentHandler to import the shapes. To be able to use that
handler too, I have moved its header file to include.
The solution for docx uses a loop over the vector getExtDrawings(). But I
have not seen a SmartArt case, where more then one element exists in it.
Whether the shape is a diagram, is indirectly tested currently. The
shape has yet no direct method for it.
Change-Id: I9d705ed5bfb2894e9ce740ebf8589e06b4870bed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141571
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/clang-format/excludelist | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index ece753ea6256..7812b0c0f277 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -5456,6 +5456,7 @@ include/oox/ppt/soundactioncontext.hxx include/oox/ppt/timenode.hxx include/oox/ppt/timenodelistcontext.hxx include/oox/shape/ShapeContextHandler.hxx +include/oox/shape/ShapeDrawingFragmentHandler.hxx include/oox/shape/ShapeFilterBase.hxx include/oox/token/tokenmap.hxx include/oox/vml/vmldrawing.hxx @@ -7276,7 +7277,6 @@ oox/source/ppt/timetargetelementcontext.cxx oox/source/ppt/timetargetelementcontext.hxx oox/source/shape/ShapeContextHandler.cxx oox/source/shape/ShapeDrawingFragmentHandler.cxx -oox/source/shape/ShapeDrawingFragmentHandler.hxx oox/source/shape/ShapeFilterBase.cxx oox/source/token/relationship.cxx oox/source/token/tokenmap.cxx |