summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)Author
2017-10-23chmod 0755 -> 0644 for some source filesStephan Bergmann
Change-Id: Ibe5b5e03374419c2c23cd6559ab213d2dc2fcc66
2017-10-23tdf#113263 Revert "PPTX export: correct position for shape in group"Szymon Kłos
This reverts commit fd3383556881d6a9d73e1a3027c079cf9bfddecb. Change-Id: Ia9befead3b45975d91215cea584b32afadb5bd52 Reviewed-on: https://gerrit.libreoffice.org/43711 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-10-23overload std::hash for OUString and OStringNoel Grandin
no need to explicitly specify it anymore Change-Id: I6ad9259cce77201fdd75152533f5151aae83e9ec Reviewed-on: https://gerrit.libreoffice.org/43567 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-10-21loplugin:redundantcast handle dynamic_castNoel Grandin
Change-Id: I7855c76e820efce96778b1c19ec71dffcc4b4abb Reviewed-on: https://gerrit.libreoffice.org/43621 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-10-19PPTX export: remember color schemes in themeSzymon Kłos
Remember color scheme from loaded pptx file or use default values. Change-Id: Icb69c51603afc5f332c20c75e4ed5f659f4b5614 Reviewed-on: https://gerrit.libreoffice.org/43470 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-10-19Fix typosAndrea Gelmini
Change-Id: I101357736813bfd47fb15d347fd2c0a33133de56 Reviewed-on: https://gerrit.libreoffice.org/43506 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins <ci@libreoffice.org>
2017-10-18Replace lists by vectors in ooxJulien Nabet
Change-Id: I951466552fd1cdb3b8f1cbfc07e64f5e0424552e Reviewed-on: https://gerrit.libreoffice.org/43469 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-10-17PPTX export: correct position for shape in groupSzymon Kłos
Change-Id: I5c0c5d2c2b246337b78a2e1fbee97032701fb640 Reviewed-on: https://gerrit.libreoffice.org/43435 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-10-16tdf#112633 oox: Save backup images to proper path in documentJacobo Aragunde Pérez
Artistic effects on bitmap images in OOXML files create a backup file with the original image. These were not being saved into the proper path for PPTX files because the `/word` directory was hardcoded in the export code. The path saved to the relations file was incorrect too because it was not taking into account that the relations file is saved to a subdir in PPTX and XLSX documents. Finally, added a unit test. Change-Id: I3e880ce763dc10dbc86ccf0e00871be5d36f6d88 Reviewed-on: https://gerrit.libreoffice.org/43338 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-10-13SmartArt: export text rotation in the PPTXSzymon Kłos
Change-Id: I74bfc172fe7434d14de468ecfd3412636e53780c Reviewed-on: https://gerrit.libreoffice.org/43202 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-10-09oox, implement HAVE_FEATURE_AVMEDIAjan Iversen
iOS does not support avmedia, therefore HAVE_FEATURE_AVMEDIA is set, however not all sources test for it. Change-Id: Ia58fb8d7ab524b9763fd9fa3a7d3fa111cb85bb4
2017-10-09tdf#100491: Reduce DOCX shapes arrow line ending size multiplierVasily Melenchuk
Older arrow line endings are quite big comparing to other DOCX line ending and same arrows in MS Word. Change-Id: I9617aa283a7e3fcc8f413c999352d7e33f05c187 Reviewed-on: https://gerrit.libreoffice.org/43119 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-10-05tdf#100065 RefactoringPaul Trojahn
Change-Id: I842f90b655ccf195185bf8bae2d93b5b187954aa Reviewed-on: https://gerrit.libreoffice.org/43137 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-10-04add << operator for css::uno::ExceptionNoel Grandin
Change-Id: Ia23dafd07133779144965682df3b7125a3214235 Reviewed-on: https://gerrit.libreoffice.org/43046 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-09-28Blind fix for Clang 3.8 "must explicitly initialize the const member" errorStephan Bergmann
...as seen at <https://ci.libreoffice.org/job/lo_ubsan/681/console> Change-Id: I428b6e2fe55023fde5b77f7ff0bd1dba16bae2ed
2017-09-27SmartArt: correct behaviour of if/else nodesGrzegorz Araminowicz
else block is taken only if none of conditions in 'choose' was satisfied Change-Id: Ie668f15c665327098e8e63b2c92cd291711e4567 Reviewed-on: https://gerrit.libreoffice.org/41533 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-09-27readonly mnFadeColor in SlideTransitionNoel Grandin
since commit c714b43b0137ad253f51e1c65417c9874b8509e5 Date: Mon Jul 20 13:12:31 2015 +0200 loplugin:unusedmethods oox Change-Id: Ibece5543b2012bd5a18d82058faa8554ed155777 Reviewed-on: https://gerrit.libreoffice.org/42835 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-09-27loplugin:unusedmethodsNoel Grandin
Change-Id: I5d75baa2af046f377b49e967783fb06cd9e885ef Reviewed-on: https://gerrit.libreoffice.org/42841 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-09-27readonly maPublicId in RecordInputSourceNoel Grandin
since commit 3381981e76873304b171f7df900561dac681d2af Date: Thu Jan 17 07:06:10 2008 +0000 #i10000# Bring module to HEAD. Change-Id: I2ea7e1e3c284c03be369fc7cb29fa70b3d671009 Reviewed-on: https://gerrit.libreoffice.org/42834 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-09-26PPTX Fix export of rotated group shapesPaul Trojahn
The rotation is already applied to the child shapes and must not be added to the group. Change-Id: Ic564cbcf31a81a248878f0179fdd21144f076b61 Reviewed-on: https://gerrit.libreoffice.org/42765 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-09-26tdf#112647: Fixed line spacing is saved incorrectly to PPTXTamás Zolnai
The values were not converted to the right unit. Also the spcPts attribute means an exact value not a minimum one. Change-Id: Ia49683e66153611e96a830f821e3a2487adec505 Reviewed-on: https://gerrit.libreoffice.org/42763 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-09-26tdf#100065 Fix scale of transformationPaul Trojahn
The shape needs to be flipped to compensate the change of mbFlipH/mbFlipV. Change-Id: I7b680497fee6ae9ed7bbd6f4ed9089d1a25a1deb Reviewed-on: https://gerrit.libreoffice.org/42766 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-09-23tdf#112089 add charts to the ShapeMapSzymon Kłos
Charts weren't added to the collection what resulted in missing ids during export (target field). Change-Id: Ie96a4e33a52c5448342a3c3dcec0d8e8b244e270 Reviewed-on: https://gerrit.libreoffice.org/42552 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-09-22Fresh run of bin/update_pch.shMike Kaganski
Change-Id: I69d4157aaf6570cecd51ea59df20556914942e06 Reviewed-on: https://gerrit.libreoffice.org/42565 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-09-22loplugin:flatten in framework..packageNoel Grandin
Change-Id: Ide8a97eae6e2fdc7d2dcccba1480ac55a9b555bc Reviewed-on: https://gerrit.libreoffice.org/42593 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-09-22tdf#112552: Shape's gray background is lost after saving to PPTXTamás Zolnai
Change-Id: I30f371ad301eede82ddcece4d91ffcd32e164115 Reviewed-on: https://gerrit.libreoffice.org/42598 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-09-19tdf#112333 PPTX export fill.type & fill.onSzymon Kłos
Change-Id: I2407d0227e10204354ee69fd9a2af9ca93077221 Reviewed-on: https://gerrit.libreoffice.org/42432 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-09-19fix SequenceOutputStream constnessNoel Grandin
Change-Id: I6e1039c077602b2cb42702cb4131f9503ef533c2
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-18convert SvxDateFormat to scoped enumNoel Grandin
And simplify the code in sd/headerfooterdlg, no need for the complex encoding of date and time when we can just index into a static array. Change-Id: I677400bf1f956c81eba665b71dbda9183b63f55c Reviewed-on: https://gerrit.libreoffice.org/42346 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
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-16convert SvxTimeFormat to scoped enumNoel Grandin
and make the numerators look more like our internal formatting codes Change-Id: I3b3d448cec913e72c7ffb6cc3e7754241af36d93 Reviewed-on: https://gerrit.libreoffice.org/42345 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-09-13tdf#112311 oox: fix UAF of std::shared_ptrMichael Stahl
OOXMLFastContextHandlerShape::sendShape() deletes the parent context's ShapeTypeContext::mrTypeModel. It looks like the sendShape() can't be delayed because writerfilter wants to import the v:textbox content into a text frame. Keep the shape alive until the end of the containing context. Not sure if it's going to process the v:fill element properly, but at lest valgrind is happy. (probably regression from CWS writerfilter32bugfixes01) Change-Id: Ifeab84751a1b20b2f272c4dd74b7097deb5eece0
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-11tdf#97648 vml import: fix horizontalLine percentageJustin Luth
o:hrpct (horizontal line width as a percentage) was overwriting valid widths with an invalid string since 2012. For some reason, commit 96c7ab19b77c2f90acd4c34552474b0f616f48a7 thought it would be a good idea to set the width as a percent string, even though the code doesn't seem to handle percent strings. (like "100%"). The logic was that since 100% width is saved as nWidth=0 by Microsoft, so it doesn't make a difference. Well, it does make a difference for every other percentage, since nWidth IS provided for those. That width value is the only thing LO can currently handle - it does nothing with the maWidthPercent for these horizontal lines. Saving hrpct to maWidthPercent seems like the proper variable for this data, but once again, this doesn't in fact change much in LO. It certainly doesn't affect the width of the line. Since this patch only affects o:hr shapes, this is a pretty safe change, for the benefit of all <100% o:hrpct's. An "assert false" and "make check" only showed docs containing 100%, width=0 samples. I added a unit test for several other lengths. I also hacked that test to provide a width value for the 100% line - even though that is not natural - just so it can be seen in LO. Change-Id: I9d6ddbbaa99ec8df32abb1047a80522322a1f631 Reviewed-on: https://gerrit.libreoffice.org/42088 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-09-10iOS, avmedia library depend on autogen flag.jan Iversen
Disabled linking of avmedia if not present. Change-Id: Id64192ec8172d4388b3624b5f832a90f7af1179c
2017-09-07Replace macro with lambdaStephan Bergmann
Change-Id: I47810e067d9dab0e40b5b1583193c01ad8c91759
2017-09-07tdf#106867: Unit test for the export of embedded videos.Jan Holesovsky
Change-Id: Ibbc3da56ace2eaaf4670e869a34ec4c1bad4bf5d Reviewed-on: https://gerrit.libreoffice.org/41982 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-09-07tdf#106867: Write also the extended markup to fully support embedded videos.Jan Holesovsky
Change-Id: I33398bff32077a8a109e0addcebab039f734c1bb Reviewed-on: https://gerrit.libreoffice.org/41981 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-09-07tdf#106867: Export videos in PPTX.Jan Holesovsky
Change-Id: I7f4f389a72aa7ecef65d87f07bb69ba8f3374a14 Reviewed-on: https://gerrit.libreoffice.org/41979 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-09-06tdf#106867: Import target for commands in PPTX.Jan Holesovsky
Change-Id: I859335085038433ef862a669430f8be993b92cb2 Reviewed-on: https://gerrit.libreoffice.org/41980 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-06tdf#111838: Revert "Decrease duplicated code"Tamás Zolnai
This reverts commit 787732fac0aef255bdc51479fdaddf15532d118e. Change-Id: Idd36f0d434c5ec867e0e1bbbfa70d8a4644d53c6 Reviewed-on: https://gerrit.libreoffice.org/41976 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
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-09-05Use LanguageTag::getBcp47MS() to write MS malformed tags to OOXML, tdf#83190Eike Rathke
Change-Id: Id706cf40f717005df840e7856528dd7bbc866e98
2017-09-04loplugin:unnecessaryparen include c++ castsNoel Grandin
Change-Id: I132d3c66f0562e2c37a02eaf4c168d06c2b473eb Reviewed-on: https://gerrit.libreoffice.org/41874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-09-02convert SHAPEFLAG defines to scoped enum ShapeFlagJochen Nitschke
they were defined in escherex.hxx as SHAPEFLAG_* and in msdffimp.hxx as SP_*. Added include for escherex.hxx to msdffimp.hxx. Filled the missing flag bits. ShapeFlag::Deleted is not used at the moment. Convert ADD_SHAPE macro to lambda. Fix horizontal/vertical mixup in RtfSdrExport::AddLineDimensions. Comments for flag Connector were wrong. The flag applies to shapes which ARE connectors. MSO definition: "connector: A line that is used to connect two or more shapes and that remains connected to those shapes." So Rectangles and such with Connector flag don't make sense. Change-Id: I735de00110411b280a302840dc0fcdfac5156399 Reviewed-on: https://gerrit.libreoffice.org/41754 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-09-01tdf#111884: Implement export of group shapes in pptx.Jan Holesovsky
Change-Id: If12984c0670db6396cbfd0dcb8ae1f5a9b591705 Reviewed-on: https://gerrit.libreoffice.org/41766 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-08-31inline some use-once typedefsNoel Grandin
and remove some dead ones Change-Id: I6946d717d3c15dc5207489ed3d56d985dd953d59 Reviewed-on: https://gerrit.libreoffice.org/41746 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-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>