diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-06-07 09:44:02 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-06-14 18:45:56 +0200 |
| commit | 8383bdc2aed96fc7905c20cc5de4ff64641e7949 (patch) | |
| tree | 734677bee7bc707ce824f66c0554f49be52d1270 /solenv/clang-format | |
| parent | 4b1490406d5ff419f632b581bed9744291600dc0 (diff) | |
Replace SVGFilter using SVGIO
Next step is to put more logic into the decision
if Draw or Impress should be loaded - if we have a
self-exported Impress, import as Impress, else
(including all not-self-created SVG Graphics) import
to Draw.
To do this it is necessary to be able to import to
different document formats at all. To do this, add
an internal filter type to the filter mechanism
(types/registration/...) and decide in the SVG
XExtendedFilterDetection::detect from SVGFilter
which one to use.
Added tooling for SVG detection and more, see
SVGFileInfo. This allows to detect for SVG, but
also if the creator was LO and if it was Draw or
Impress. The document format/filter is choosen
accordingly.
Corrected the error with <g visibility="hidden">
Slides inisde <g class="SlideGroup"> for import
of self-exported Impress documents. No idea why
this was written that way, but needs to be fixed
to get a visible content at all.
Also adapted the final mapping from pt to 100thmm
in SvgSvgNode::decomposeSvgNode. Unfortunately
(and also for unknown reasons) the self-exported
Impress does not write svg:width/height values,
thus the adaption from assumed svg-units (px) to
100thmm has to be skipped.
Have identified the place in svgio where I can
embed Pages/Slides to a helper-Primitive to later
be able to 'break' such GraphicObjects to multiple
Pages/Slides. I have added a Primitive called
PageHierarchyPrimitive2D for this purpose.
Change-Id: I38bfef6e7b16479a025fc754e38b4e21a006ad38
Reviewed-on: https://gerrit.libreoffice.org/55434
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
(cherry picked from commit 3087011e2eb810866276e270a6fc61a7e0998fec)
Reviewed-on: https://gerrit.libreoffice.org/55786
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'solenv/clang-format')
| -rw-r--r-- | solenv/clang-format/blacklist | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 7dcd63136243..3c7af57a2af8 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -3941,6 +3941,7 @@ drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx drawinglayer/source/primitive2d/texteffectprimitive2d.cxx drawinglayer/source/primitive2d/textenumsprimitive2d.cxx drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx +drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx drawinglayer/source/primitive2d/textlayoutdevice.cxx drawinglayer/source/primitive2d/textlineprimitive2d.cxx drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -6281,6 +6282,7 @@ include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx include/drawinglayer/primitive2d/texteffectprimitive2d.hxx include/drawinglayer/primitive2d/textenumsprimitive2d.hxx include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx include/drawinglayer/primitive2d/textlayoutdevice.hxx include/drawinglayer/primitive2d/textlineprimitive2d.hxx include/drawinglayer/primitive2d/textprimitive2d.hxx |