summaryrefslogtreecommitdiff
path: root/oox/source/drawingml
AgeCommit message (Collapse)Author
2017-09-18tdf#112088 gradient stop map -> multimapSzymon Kłos
When two gradientstops were set to position 50% only one was stored and the exported file was detected as broken by MSO. Change-Id: I5fd1acde6051f734a5f3e4cff9bde01b675e1984 Reviewed-on: https://gerrit.libreoffice.org/42210 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-09-16tdf#100065 PPTX Fix import of custom shapes in groupsPaul Trojahn
A negative scale of the parent matrix indicates that the shape needs to be flipped. This commit fixes text rotation as well, so d742c0019435d0bc90c9342492583636099a057f is no longer needed. Change-Id: I67bba34519b3af9215fe64a71f5137aa510edf7a Reviewed-on: https://gerrit.libreoffice.org/42250 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-09-12clang-tidy modernize-use-emplace in ooxNoel Grandin
Change-Id: I9ea063b7f6c63ae1ad039859efeebb292d44c6e2 Reviewed-on: https://gerrit.libreoffice.org/42172 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-09-07Replace macro with lambdaStephan Bergmann
Change-Id: I47810e067d9dab0e40b5b1583193c01ad8c91759
2017-09-06loplugin:unnecessaryparen include case statementsNoel Grandin
Change-Id: I79fb3eec0d5d466e33b2e18621a7169695edf82f Reviewed-on: https://gerrit.libreoffice.org/41920 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-08-30SmartArt: grDir snake algorithm parameterGrzegorz Araminowicz
Change-Id: I643ed981cc9d02e5118f09a3c04abcea2fc5ecd7 Reviewed-on: https://gerrit.libreoffice.org/41516 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-08-30tdf#43157 Clean up OSL_ENSURE in oox/drawingml/diagramGrzegorz Araminowicz
Change-Id: I9e3b80c365d6f43cd6f6f42ccdd0a8920f4ace14 Reviewed-on: https://gerrit.libreoffice.org/41513 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-08-24SmartArt: implement dir and maxDepth if node functionsGrzegorz Araminowicz
Change-Id: I4ef05b5bab1188cf349d1c7f5bbc9022bc79b21c Reviewed-on: https://gerrit.libreoffice.org/41452 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-08-24SmartArt: get rid of tagToVarIdx() and change VarMap to std::mapGrzegorz Araminowicz
it was unnecessarily complicated Change-Id: I5ad4b4a6a401ffe6a67a471fa355ade9c1514ef1 Reviewed-on: https://gerrit.libreoffice.org/41458 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-08-23SmartArt: shape rotation supportGrzegorz Araminowicz
Change-Id: I13bfbd3fafff5335ce8bc23b2579182aa5a94a80 Reviewed-on: https://gerrit.libreoffice.org/41393 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-08-23SmartArt: basic support for layout constraintsGrzegorz Araminowicz
Change-Id: Ie234bfd9760cdacb6a25c04d73a260e7e59ef7d6 Reviewed-on: https://gerrit.libreoffice.org/41273 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-08-17SmartArt: simplify conditions, miscellaneous changesGrzegorz Araminowicz
Change-Id: I70cc3548a68367b0a5f4cc5f55e55dc2db1e8b27 Reviewed-on: https://gerrit.libreoffice.org/41239 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-08-17SmartArt: support cnt functionGrzegorz Araminowicz
it was necessary to introduce in LayoutAtoms reference to containing LayoutNode passed by constructors, so that ConditionAtom can access LayoutNode's name and diagram data Change-Id: I35c9cb9061f23eb15e7a9372476530e2ead5d0dc Reviewed-on: https://gerrit.libreoffice.org/41108 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-08-11SmartArt: fix duplicated textGrzegorz Araminowicz
in some diagrams there are two shapes for the same node - tx and sp sp should be just space, so remove text from it Change-Id: I832651918294bd458148a23d6cc1e59c545adc13 Reviewed-on: https://gerrit.libreoffice.org/40913 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-08-10tdf#109187 Fix OOXML import of flipped shapes with gradientsPaul Trojahn
The rotation of the gradient instead of the shape needs to be flipped because OOXML flips shapes before rotating them. Change-Id: I332412078ae0f8d555bd462964c7b20037147e02 Reviewed-on: https://gerrit.libreoffice.org/40136 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-08-10tdf#109317 Fix incorrect rotation of flipped custom OOXML shapesPaul Trojahn
The shape wasn't imported correctly because IsPostRotateAngle wasn't set. As a result the shape was flipped after it was rotated instead of before. This commit removes 1c44b263 and converts the rotation to the internal format instead. This also fixes that ooxml preset shapes can't be exported to odf correctly and that ooxml preset shapes rotate in the wrong direction when rotated in LO. Change-Id: I9691902fdfb2cfecc8fe50d6eb66ac3880ddd4e8 Reviewed-on: https://gerrit.libreoffice.org/40789 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-08-10SmartArt: add nested shapes only if they are node's childrenGrzegorz Araminowicz
Change-Id: I6527fc4166001ffc1e1e170b179cd4eadf55305c Reviewed-on: https://gerrit.libreoffice.org/40870 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-08-08tdf#110440 drawingML import: fix handling of group shape propertiesMiklos Vajna
The handler for nvGrpSpPr is "this class", not "no class". Change-Id: I7fc40681d77f94b7473d2f677d813d2ae246f6ac Reviewed-on: https://gerrit.libreoffice.org/40854 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-08-08tdf#109858: Override default point label placement setting...Dennis Francis
with series label placement setting if available while importing xlsx chart. Adds unit test in chart2import.cxx that asserts one of the point label setting in the bugzilla xlsx document. Change-Id: I8bc04fd569f94a19633666ffdc51b61ac719e8a9 Reviewed-on: https://gerrit.libreoffice.org/40860 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk>
2017-08-05Fix typosAndrea Gelmini
Change-Id: Ib7f43bf17ab8b9fb9d961a908d7620b50826a975 Reviewed-on: https://gerrit.libreoffice.org/40688 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-08-02remove unnecessary use of 'this->'Noel Grandin
Change-Id: I5c115389af7d24c18ddaf5fbec8c00f35017a5b4 Reviewed-on: https://gerrit.libreoffice.org/40671 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-31loplugin:constparams in ooxNoel Grandin
Change-Id: I43984b4ece82da39ca61a91fa14e4660298509dd Reviewed-on: https://gerrit.libreoffice.org/40581 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-31loplugin:oncevarNoel Grandin
extend oncevar to any POD type Change-Id: Ia98ee0a67f183e40fb0c38477760124b2c411dc0 Reviewed-on: https://gerrit.libreoffice.org/40564 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-29tdf#109223: PPTX: Vertical flip of child shape is not imported correctlyTamás Zolnai
Group shape level vertical flip is not handled well. Recent handling of group shape's transformation makes it hard to import this attribute, but we can import the right text direction at least. Change-Id: Ib9e39e3dcb28a95fabc61c13152a3f7296fbd4c3 Reviewed-on: https://gerrit.libreoffice.org/40554 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-07-26tdf#100491 fix DOCX import shape line with arrow markerVasily Melenchuk
Line shape with arrow end markers was rendering rather thick arrow, not connected to main line. Moreover, arrow width should depend on actual line width. Change-Id: I8d9a6e7f5d89a1645dcc5939ecc592e86e6fe34f Reviewed-on: https://gerrit.libreoffice.org/40286 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-07-24SmartArt: text alignmentGrzegorz Araminowicz
Change-Id: I0be75971af8bc2906c9054848d4429d544b94f0c Reviewed-on: https://gerrit.libreoffice.org/40317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-07-24SmartArt: cycle layout algorithmGrzegorz Araminowicz
Change-Id: Ia6863ed6ee8f8bc3240f0ab16a58e59141b2a2d1 Reviewed-on: https://gerrit.libreoffice.org/40314 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-07-23coverity#1415611 Result is not floating-pointCaolán McNamara
Change-Id: Icaeeb835e9a3c8ab6917fe15297ad884db792299
2017-07-21Fix typosAndrea Gelmini
Change-Id: I43f38b4dda6b1999d84d9f9760d0fae4c0358394 Reviewed-on: https://gerrit.libreoffice.org/40277 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-07-20SmartArt: support hideGeom shape attrbuteGrzegorz Araminowicz
Change-Id: I970024ec2b28fd6f004acdc67acbc39067b5efe2 Reviewed-on: https://gerrit.libreoffice.org/40224 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-07-20SmartArt: shape stylingGrzegorz Araminowicz
Change-Id: I7e9ab4c2286fd803cd518dd01ab8ebd5ac2d8428
2017-07-20SmartArt: more layout workGrzegorz Araminowicz
* basic layout algorithms implementation * change layouting order to "from top" Change-Id: I8ef397fa0e39bb6d8cda2d1387b663980f134a59
2017-07-20SmartArt: add ShapeAtom to store shape template instead of LayoutNodeGrzegorz Araminowicz
it allows to load shapes inside choose/if Change-Id: I8040967d1f769796f6ad6b2d0c7b5ce698f89ee3
2017-07-17tdf#109067 Fix default value of rotWithShapePaul Trojahn
According to the OOXML standard the default value is true, so for the export of gradients and blips it has to be set explicitly to false. Change-Id: I06f6f2a00fca88ec79e2eb956c3c780f037a9d1e Reviewed-on: https://gerrit.libreoffice.org/39973 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-07-17tdf#89926 Fix OOXML gradient angle importPaul Trojahn
The rotation of the shape needs to be added to get the correct angle. Due to this nDmlAngle can be twice as big. The conversion to LO angles needs to be updated to prevent negative results. Change-Id: I3a13cb268af41a55cd8b9df3084d028008aed4f2 Reviewed-on: https://gerrit.libreoffice.org/39648 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-15emfplus: completed isolation/migration of Emf/WmfArmin Le Grand
Decided to keep the migrated/isolated Emf/Wmf reader which are now hidden behind a Uno Api. Had to re-implement WMF_EXTERNALHEADER (now WmfExternal, own file/header) to not break anything. It *seems* to just scale something and could be done after import, but I could not be sure. Also needed a callback hook to allow getting the Metafile out of a MetafilePrimitive in a lower module (vcl relative to drawinglayer) which is needed as long as primitives are not completely on Uno Api. Deleted all Emf/Wmf reader stuff from vcl. Change-Id: Ic5540defa8ec770728280df4df3f12e1f48cfc3a
2017-07-14Revert "tdf#109067 Fix default value of rotWithShape"Miklos Vajna
This reverts commit 1b08f129677c1109aae1fadc72ae68ebb7df7cb0. The change was Jenkins-verified, but just rebasing it on top of latest master (without getting conflicts) broke the test added in the commit. So let's revert it for now to have time to find out why does the test fail on top of latest master. Change-Id: I3bce24e54fb07df2dd460fb0f01d44516b3fcd0d
2017-07-14tdf#109067 Fix default value of rotWithShapePaul Trojahn
According to the OOXML standard the default value is true, so for the export of gradients and blips it has to be set explicitly to false. Change-Id: I3c9f67787cb11d6d9b58f07377b03167df669ed8 Reviewed-on: https://gerrit.libreoffice.org/39725 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-13use more OUString::operator== in forms..salNoel Grandin
Change-Id: I70d7e50f8c1e019524ccad915f0cca912c5035dc Reviewed-on: https://gerrit.libreoffice.org/39899 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-11replace 'resize(size+1)' with emplace_backNoel Grandin
which is considerably faster if we're dealing with a std::list, and just easier on the eyes if we're dealing with a std::vector Change-Id: I373689205ebc048689f29ab80a7ee8551b20cc96 Reviewed-on: https://gerrit.libreoffice.org/39816 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-11simplify some OUString::concat usageNoel Grandin
Change-Id: Ifa150dc9d694981ffe03c254ea8c3fd820c99795 Reviewed-on: https://gerrit.libreoffice.org/39812 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-11simplify calls OUString::copy in foo.copy(x, foo.getLength() - x)Noel Grandin
Change-Id: I20318c77dcc3bc2a64336541ef5a3f412bfd9483 Reviewed-on: https://gerrit.libreoffice.org/39803 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-11SmartArt: reuse existing diagram shape for root shapeGrzegorz Araminowicz
it prevents creating unnecessary expanded shape hierarchy and allows layout algorithm to know parent's size Change-Id: Ieb991a74bd662e359f5cf479a7480893e0b13d45 Reviewed-on: https://gerrit.libreoffice.org/39410 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-07-02loplugin:casttovoid: ooxStephan Bergmann
Change-Id: If0d0e801beae55c0cee1e6b5d18a494066090800
2017-06-29SmartArt: undo diagram elements' size changeGrzegorz Araminowicz
it should fix integer overflow in fdo79822.docx until we have proper layout algorithm implemented Change-Id: I7645ff0844ac47a004a309d1a9d3b19eeb3708dc Reviewed-on: https://gerrit.libreoffice.org/39371 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-06-27SmartArt: std::for_each -> range-based for loop.Jan Holesovsky
Change-Id: Ie2b36175a52c897bcf39da0ac2daa35979aac923 Reviewed-on: https://gerrit.libreoffice.org/39285 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-06-26SmartArt: separate LayoutAtomVisitors from LayoutAtomsGrzegorz Araminowicz
Change-Id: Ifbed15c881e4c0b987cd2fdbb903709a0b8b0e36 Reviewed-on: https://gerrit.libreoffice.org/39269 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-06-26SmartArt: layout diagramGrzegorz Araminowicz
Change-Id: I854703ea3cb09ace2d0b01a47d9f07bb7a98b70e Reviewed-on: https://gerrit.libreoffice.org/39172 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-06-26loplugin:oncevar in oox..saxNoel Grandin
Change-Id: I0fee8bcddaeea48335e3be05761d2ad2c45020e2 Reviewed-on: https://gerrit.libreoffice.org/39238 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-14use more SAL_N_ELEMENTS part 2Noel Grandin
Change-Id: If00e371c3cd3ae616309a172c875faed016e391b Reviewed-on: https://gerrit.libreoffice.org/38773 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
generated by cgit (git 2.34.1) at 2025-04-27 23:33:11 +0000