summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)Author
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>
2017-08-26tdf#111980: DOCX: Handle ActiveX radio button groupTamás Zolnai
Change-Id: I3372b3b69623bda5c6e8587215e8fb7056fdf0a7 Reviewed-on: https://gerrit.libreoffice.org/41586 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-08-25loplugin:unusedmethodsNoel Grandin
Change-Id: Iaaf9092ec4d6189492906648b84494d087fed81f Reviewed-on: https://gerrit.libreoffice.org/41539 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-08-24tdf#111798 Fix deformed export of flipped custom shapes to pptxPaul Trojahn
Shapes were deformed because flipping wasn't considered when removing the rotation. Also WriteShapeTransformation needs information about flipping to convert the angle correctly. Change-Id: I7d485e93c00e02b9ec6c73ad6ae2876e5bc6360a Reviewed-on: https://gerrit.libreoffice.org/41462 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@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-24oox: kill redundant breaksThorsten Behrens
Change-Id: I18aadb7b6b2fa50159624df1b4a7de9270473785 Reviewed-on: https://gerrit.libreoffice.org/41480 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-08-23DOCX: Fix an other test case of ActiveX control exportTamás Zolnai
When LO control is anchored to the end of the run, it is exported into a new run. Change-Id: I9269fd1b34924780aad61c452d1e2094dc8e4aad Reviewed-on: https://gerrit.libreoffice.org/41472 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-08-23VML, Watermark: detect shapetype from other subdocumentsSzymon Kłos
In some documents Watermark wasn't visible because shapetype wasn't detected. It was impossible to use shapetype defined in header1.xml in shape placed in the header2.xml. Change-Id: Ib406c8fc702968684ad46efd0857b768af2820f5 Reviewed-on: https://gerrit.libreoffice.org/41395 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-08-23convert message box style bits to scoped enumNoel Grandin
and fix harmless bug in ImpSVGDialog::ImpSVGDialog, which there since commit 6456f1d81090dd5fe44455c09ae3ede7ec6ac38a Date: Fri Feb 4 14:52:54 2011 +0100 ka102: added/removed files for SVG import and module cleanup Change-Id: I66b2ec2b029431ab453e54e962863e4ed7d78962 Reviewed-on: https://gerrit.libreoffice.org/41412 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
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-22Fix two issues in ActiveX DOCX import / export codeTamás Zolnai
* Inline anchored VML shape had wrong vertical position ** In MSO inline shapes are positioned to the top of the baseline * During export all shape ids were the same (shape_0) ** VML shapes used to be exported only as fallback, I guess that's why it did not cause any issue before. ** Override the shapeid generator with a new one, which actually generates unique shapeids. Change-Id: I752f39d092d0b61d91824141655dae662dbeafbc Reviewed-on: https://gerrit.libreoffice.org/41319 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-08-18NdTopLeft is unused now.Tamás Zolnai
Change-Id: I39184b8fdf666676c21560d39911f6204b0afd52 Reviewed-on: https://gerrit.libreoffice.org/41257 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-08-17tdf#50097: DOCX: export form controls as MSO ActiveX controlsTamás Zolnai
* Use the same structure for export what MSO uses ** Position and size information are exported as VML shape properties ** Different handling of inline and floating controls (pict or object) ** Do some changes on VML shape export to match how MSO exports these controls ** Write out activeX.xml and activeX.bin to store control properties ** Use persistStorage storage type defined in activeX.xml * Drop grabbaging of activex.XML and activeX.bin * Cleanup control related test code Change-Id: I38bb2b2ffd2676c5459b61ec2549c31348bab41c Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/41256 Tested-by: Jenkins <ci@libreoffice.org>
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-14Decrease duplicated codeTamás Zolnai
Change-Id: Icadb800c8c31649a8db3da68ff6e9761a8f4d916 Reviewed-on: https://gerrit.libreoffice.org/41128 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-08-12tdf#107197: Replace relationship URIChristian Barth
Replaced URIs in sc/source Change-Id: I5227d4d471cf7e579c8c6ec43e0ea3d04b65b331 Signed-off-by: Christian Barth <Christian.Barth@zoho.com> Reviewed-on: https://gerrit.libreoffice.org/41062 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-08-12tdf#107197: Replace relationship URIChristian Barth
Replaced URIs in sd/source Change-Id: If035c10c680fc106eeddb08d127a337701adb85c Signed-off-by: Christian Barth <Christian.Barth@zoho.com> Reviewed-on: https://gerrit.libreoffice.org/41056 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-08-12tdf#107197: Replace relationship URIChristian Barth
replaced URI in oox/source/export/ Change-Id: Ida65ee05cd0dc66ccdd3253260c6523ffd5ceae2 Signed-off-by: Christian Barth <Christian.Barth@zoho.com> Reviewed-on: https://gerrit.libreoffice.org/40996 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2017-08-12tdf#107197: Replace relationship URIChristian Barth
Replaced URIs in sw/source/filter Change-Id: If73c30e9d590742568a3009a6d593f1b3249a5a4 Signed-off-by: Christian Barth <Christian.Barth@zoho.com> Reviewed-on: https://gerrit.libreoffice.org/41055 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
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-11convert std::map::insert to std::map::emplace IINoel Grandin
Change-Id: Ief8bd59c903625ba65b75114b7b52c3b7ecbd331 Reviewed-on: https://gerrit.libreoffice.org/41019 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-08-11convert std::map::insert to std::map::emplaceNoel Grandin
which is considerably less verbose Change-Id: Ifa373e8eb09e39bd6c8d3578641610a6055a187b Reviewed-on: https://gerrit.libreoffice.org/40978 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
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>
generated by cgit (git 2.34.1) at 2025-01-16 10:50:04 +0000