summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2016-12-17Adapt to no-longer explicit OUStringLiteral ctorStephan Bergmann1-61/+61
...from previous commit Change-Id: I062b7cd212c17e7eb5274476e6859228d0477c7f Reviewed-on: https://gerrit.libreoffice.org/32098 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-12-15Phase out support for HAVE_BROKEN_STATIC_INITIALIZER_LISTStephan Bergmann1-8/+2
...I'm pondering a change that would make that a hard requirement, and from the comment in configure.ac it looks like only old Clang < 3.4 were affected. Change-Id: I8ef64f759fed1a45d88f94d0e8a60839ad10b263 Reviewed-on: https://gerrit.libreoffice.org/32029 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-12-15teach sallogareas plugin to catch inconsistenciesNoel Grandin9-29/+29
Change-Id: I8bcea5ffc74d48148bea78da8c17744e288c069a Reviewed-on: https://gerrit.libreoffice.org/32004 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-12-13OSL_TRACE->SAL in chart2..ooxNoel Grandin3-4/+1
Change-Id: I133a6441824bfbefcfcda130119b5c5d706f86b2 Reviewed-on: https://gerrit.libreoffice.org/31907 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-12-13OSL_TRACE->SAL in framework..salNoel Grandin18-63/+28
Change-Id: I9a897af88aa9f6f7ca98ce521c69b5a4ee8462e9 Reviewed-on: https://gerrit.libreoffice.org/31903 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-12-09tdf#104445: PPTX import: Extra bullets are added to placeholder textTamás Zolnai2-2/+4
Change-Id: I25ce98ed391f70292bed6238645b121b9cf50d5e Reviewed-on: https://gerrit.libreoffice.org/31771 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2016-12-07convert PolyFlags to scoped enumNoel Grandin1-4/+4
and remove the XPolyFlags enum, which has the same values and was being converted to PolyFlags anyhow Change-Id: Iaead84933c79a7603698a4e50257dd944df89c41 Reviewed-on: https://gerrit.libreoffice.org/31627 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-12-05convert E_GRAPH_PROV constants to typed_flagsNoel Grandin1-1/+1
and drop the never checked E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES constant Change-Id: Idd2598c209b34bfa4a58a84ce5ee14a7340d59d4 Reviewed-on: https://gerrit.libreoffice.org/31553 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-12-02convert some anonymous enums to scopedNoel Grandin3-18/+18
Change-Id: Ia989376c983ff475359e4964abeb1f5a2300ff5b Reviewed-on: https://gerrit.libreoffice.org/31486 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-12-02tdf#104310: Accept x12ac lists and fallbacks in dataValidationsMike Kaganski6-1/+9
Change-Id: I42cf20fcfe3ec03ebd09923be509a9d11e0b40da Reviewed-on: https://gerrit.libreoffice.org/31516 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2016-12-01tdf#103477 buClrTx => use text color insteadMuthu Subramanian1-1/+3
Change-Id: I82d9231d2d0ea95cadc803f9a8dab9c23b88a677 Reviewed-on: https://gerrit.libreoffice.org/30403 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-11-30better varyColors export for charts, related tdf#103943Markus Mohrhard1-19/+55
Change-Id: I4280e708c854c687b6281c56d5bccdb514afd81e Reviewed-on: https://gerrit.libreoffice.org/31252 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-11-29Rewrite some (trivial) assignments inside if/while conditions: ooxStephan Bergmann1-6/+14
Change-Id: I75de45677603800baec18d03114418181c4393c2
2016-11-29tdf#104115 DOCX export: ClosedBezierShape should always result in <a:custGeom>Miklos Vajna1-1/+3
Regression from commit 6b084f0001fc15112bf3c40d20a0c7096c83b7fe (asan: global-buffer-overflow on fdo55736-1.docx, 2015-01-08), the problem as seen by the user was that our VML->DML conversion in a DOCX file resulted in output that wasn't accepted by Word anymore. Now that commit itself is fine, but as a side effect, the somewhat unusual (bezier with no actual polypolygons) child shape of the group shape is now written, but not in a way that conforms to the drawingML schema. Fix that pre-existing, but now visible problem by always writing <a:custGeom> in the DOCX case. Change-Id: Idbcb903dda07b5c2408d2b0ebbf4b5e4a08b20ed Reviewed-on: https://gerrit.libreoffice.org/31347 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-11-27tdf#104201: PPTX: Group solid fill is not importedTamás Zolnai1-3/+3
Change-Id: Iec273714108598d7017e73a9e7d384f8410d6ee1 Reviewed-on: https://gerrit.libreoffice.org/31263 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2016-11-25loplugin:stringconstant: look into 'char const * const var = "..."'Stephan Bergmann1-1/+1
Change-Id: I52a97b8ec273509131c2200e47527221cb62d7ee
2016-11-25tdf#96052 - export the forbidden shape as path instead of preset shape.Mark Hung1-7/+1
OOXML noSmoking shape has different definition so that convert LO's forbidden shape to OOXML noSmoking do not produce good result. I put it on whitelist and now the geometry looks correct although handle is lost. This partially revert unit test for the shape in 2b4f9d0b2b0006fc7bebb9e696a32eabd1aeb993, where forbidden is exported as a preset shape. Change-Id: I2e134940fa4a36e6b7b814b008d859691fbcdd6a Reviewed-on: https://gerrit.libreoffice.org/31110 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2016-11-23loplugin:unnecessaryoverride (dtors) in ooxStephan Bergmann5-46/+1
Change-Id: I55b82f4669d89e8492b456ff8b0b430f444674a3
2016-11-23oox: update README for recent change.Mark Hung1-48/+44
Change-Id: I0c50ec67b7d71c9a59f5a522f19ec40a4b21090b Reviewed-on: https://gerrit.libreoffice.org/31008 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-11-20tdf59046 oox: fix incorrectly combined shapesMark Hung1-8/+10
1. Store the path of all polygons of a PolyPolygon in the same path element so it subtract overlapped area. 2. Set the size of the path as the bounding box of PolyPolygon so the points of the polygon scale and offset properly. Change-Id: If6e21d1ac0544b45ef68073cf14bcc08c1d7dbef Reviewed-on: https://gerrit.libreoffice.org/30982 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2016-11-19tdf#92076 oox - export PolyPolygonShape and PolyLineShape.Mark Hung1-8/+10
1. Export PolyPolygonShape and PolyLineShape. 2. Rename WriteBezierShape to WritePolyPolygonShape because ClosedBezierShape, OpenBezierShape, PolyPolygonShape,and PolyLineShape share the function and all use EscherPropertyContainer::GetPolyPolygon to get PolyPolygon structure and use WritePolyPolygon to write xml tags. Change-Id: I9ffdc26cf1f6fe8ea3b91b7b218d67f9e5585617 Reviewed-on: https://gerrit.libreoffice.org/30972 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2016-11-18tdf#104015: PPTX import: Title shape does not inherit fill propertiesTamás Zolnai1-26/+85
...from slide master. The problem caused by that PPTX files contains not a one-level master slide set, but has two levels: one called slide master, other called slide layout. Slide layout inherit properties from slide master and normal slide inherit propetries from slide layout. Bug appeared because, slide layout inherited properties were not forwarded to the normal slide. Change-Id: I587582498cf4315087f9a576c1b7fc41ee23e2fd Reviewed-on: https://gerrit.libreoffice.org/30969 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2016-11-17tdf#103876: PPTX import: Title shape's character properties are wrongTamás Zolnai5-19/+92
Text properties are applied on a shape during text insertion, but if a placeholder shape has no text, then it has a placehodler text which should have the right text properties. Change-Id: I54175d52dd25915ee4d7153298e01ec07c6be1f6 Reviewed-on: https://gerrit.libreoffice.org/30881 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2016-11-14chartx: (regression) fix crash on label importJean-Tiare Le Bigot1-0/+1
The sparse chart import moved from assuming that the number of elements in the list parsed from ooxml is the same as the real number of elements. For this, the patch relies on a new member that was not always initialized. This patch fixes a missing initialization. According to 'grep' this should be the last one. Change-Id: I31d8a653f227100436360deef4a53c9418de9d93 Reviewed-on: https://gerrit.libreoffice.org/30838 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-11-14oox, xmlsecurity: fix recently introduced style problemsMiklos Vajna1-3/+3
These files had a consistent style previously, keep them that way. Change-Id: I6347efd4a301ddd758f4661778c0dfb68585940d
2016-11-13drop extra semicolonsDavid Tardon1-1/+1
Change-Id: Ie6713d1bdf0010e5bc0bb70ca995c4dd36408673
2016-11-12tdf#100733 oox: update preset shape definition for polar handles.Mark Hung2-14/+20
RefR and RefAngle of polar handles of custom shapes can be handled now. Their values in oox-drawingml-cs-presets and the loader of preset shapes are updated accordingly. Change-Id: Icacb19fbd1f4c202950b0a19afce01ad1cafc82a Reviewed-on: https://gerrit.libreoffice.org/30602 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2016-11-12tdf#100733 oox: imports RefR and RefAngle of polar handles.Mark Hung2-0/+21
RefR and RefAngle was ignored when importing polar handles for customshapes. Change-Id: I2d2aa1b0e54cf4946417c6dc81ecdbe58f6b50e9 Reviewed-on: https://gerrit.libreoffice.org/30601 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2016-11-10tdf#103792: No placeholder text imported for empty title shapeTamás Zolnai2-2/+1
Change-Id: I95b4358f0d4311e8f427c8de18863049fb718d9b Reviewed-on: https://gerrit.libreoffice.org/30731 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2016-11-09crashtesting: unexpected exception on novell403458-1.pptxCaolán McNamara1-3/+3
since commit 4bcf1872bbe9db1388769485a7e4c0cbcce3d53c Date: Thu Oct 13 23:43:41 2016 +0200 chartx: fix sparse chart import because - Matrix< Any > aMatrix( rDataSeq.maData.size(), 1 ); + Matrix< Any > aMatrix( rDataSeq.mnPointCount, 1 ); where rDataSeq.mnPointCount is -1 Change-Id: I4bb4805dd81a342d4c0ce24e3240154daf53b452
2016-11-08loplugin:expandablemethods in lotuswordpro..packageNoel Grandin4-33/+7
Change-Id: Ic9827c998f4f78775fdf5c1eaf9d4749d4986102 Reviewed-on: https://gerrit.libreoffice.org/30682 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-11-08loplugin:unnecessaryvirtual in hwpfilter..rscNoel Grandin2-5/+3
Change-Id: I2e9df8223d503b813b4c458747e8c44bb8ef8868 Reviewed-on: https://gerrit.libreoffice.org/30661 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-11-07google docs can generate a pptx with an empty cmLstCaolán McNamara1-9/+12
Change-Id: I2a3dcae5361929c6880b2da1b3107cb2c8141f32
2016-11-07oox: exporting the block arc as its corresponding drawingml preset shape.Mark Hung1-2/+20
block arcs were exported as paths, stretching it to the whole viewport. Exporting it as a preset shape to prevents distortion. Change-Id: I68bac6ee273d89c0a4333d4d6a4816c6a7f802a0 Reviewed-on: https://gerrit.libreoffice.org/29679 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2016-11-06chartx: fix sparse chart importJean-Tiare Le Bigot3-6/+6
Change-Id: I1bcd2257da900c6a88bc78040fabe5696e2bab7d Reviewed-on: https://gerrit.libreoffice.org/29801 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-11-02loplugin:oncevar in helpcompiler..reportdesignNoel Grandin2-8/+3
Change-Id: I2dc57931fb230953c285aeb18f57c0a41fedafcb Reviewed-on: https://gerrit.libreoffice.org/30463 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-10-31Nonsensical OUString null checkStephan Bergmann1-1/+1
...ever since acd2c90978052723475a41144dd5d92090fbf6b4 "fdo#80897: Preservation of text warp properties." (That happened to redundantly check for non-empty presetWarp, too.) Change-Id: I6162f7cb5c82b7950eb3742c61bc3297e9c6fa1b
2016-10-28tdf#63846 assign macros after VBA project fully loaded.Justin Luth1-3/+2
fixes regression caused by d4743045a0b320449d07a957463a76bb8b13f939. see the documentation for VbaMacroAttacherBase, which indicates that the macros are to be attached after all objects are finished loading. Made attachMacros() public so it could be called separately since so many things are inter-dependent in the logic flow. Change-Id: I11f7f4a1a75d6f77a97e12e3359d6ea8a995f518 Reviewed-on: https://gerrit.libreoffice.org/30337 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-10-28update unnecessaryoverride plugin to find pure forwarding methodsNoel Grandin1-5/+0
which can be replaced with using declarations. Is there a more efficient way to code the search? Seems to slow the build down a little. Change-Id: I08cda21fa70dce6572e1acc71bf5e6df36bb951f Reviewed-on: https://gerrit.libreoffice.org/30157 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-10-25tdf#103389: Resaving a DOCX document with two canvases leads to a broken file.Tamás Zolnai2-8/+11
Make custom shape export more robust. In case of the test document, WriteCustomGeometry is called, but this call does not export anything, and so we get a shape without any geometry in the DOCX file, which causes problem to MS Word. Change-Id: Ie7a4e2b8a18bfddaeeb81425ae5f1de04140d43f Reviewed-on: https://gerrit.libreoffice.org/30241 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2016-10-21loplugin:expandablemethodds in include/ooxNoel Grandin2-14/+4
Change-Id: I06b82e8b927d24204e5a952474a2dfd780b3cae6
2016-10-21move some useful header information to mscodec for reuseCaolán McNamara3-58/+37
Change-Id: Ic7adf3ed3c8279cc93a06975d6fb337210d1af87
2016-10-21hash len isn't going to change depending on who implements itCaolán McNamara3-26/+18
Change-Id: Iee585cba4acad74c11d083085153e2af96c8894f
2016-10-20clarify hash lengths a bit moreCaolán McNamara2-6/+6
Change-Id: I66cea4b9efb82d29e6c052ac11a6f2eaca823ce0
2016-10-20hash len is 20 for xls cryptoapi configurationCaolán McNamara1-4/+4
Change-Id: I6e06b8578959b8147043179db57e875b1d98d57d
2016-10-17fix wrong usages of setProperty vs setAnyProperty...Jochen Nitschke5-22/+22
and remove some useless casts. setAnyProperty takes an Any for property value. setProperty takes any value and creates an Any. Change-Id: Ida0a80bd679775c08925309bfbc695630af2225f Reviewed-on: https://gerrit.libreoffice.org/29917 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
2016-10-13tdf#103143 Fix importing number of characters from docx filesBartosz Kosiorek1-1/+5
Change-Id: I45429626f7299f84fda2969dd6000c8aa8d23982 Reviewed-on: https://gerrit.libreoffice.org/29721 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-10-13loplugin:unnecessaryoverrideNoel Grandin1-5/+0
Change-Id: I08c55a3023ec2e8990098eeb60e91cd18556e7ae Reviewed-on: https://gerrit.libreoffice.org/29656 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-10-07tdf#102997 Fix Error in OOXML Transparency Conversion Mathlbenes1-1/+1
This fixes the import logic for tdf#100830 to handle transparencies other than 50%. Change-Id: If4e2e369a9674488878bb0a4378d48292ea4e0cb Reviewed-on: https://gerrit.libreoffice.org/29581 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-10-05convert MapUnit to scoped enumNoel Grandin4-6/+6
I left a prefix on the names "Map" so that I would not have to re-arrange each name too much, since I can't start identifiers with digits like "100thMM" And remove RSC_EXTRAMAPUNIT, which doesn't seem to be doing anything anymore. Change-Id: I5187824aa87e30caf5357b51b5384b5ab919d224 Reviewed-on: https://gerrit.libreoffice.org/29096 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>