summaryrefslogtreecommitdiff
path: root/oox/source
AgeCommit message (Collapse)Author
2017-01-12tdf#104414: don't stop on exception from SwXFrame::setPositionMike Kaganski
Change-Id: Ib6d4e398d546d6fe250b9c1efe099ae8eef2d580 Reviewed-on: https://gerrit.libreoffice.org/32978 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-01-10New loplugin:conststringvar: ooxStephan Bergmann
Change-Id: Id27e8c51fe87cbe7fa45a68cbaa8196767473b93
2017-01-06tdf#105150 PPTX import: try harder to handle <p:sp useBgFill="1">Miklos Vajna
The bugdoc has two shapes. The red rectangle is supposed to be covered by the other shape, but it wasn't as the fill style was set to none. The reason for that was we ignored useBgFill, unless the slide had an explicit fill style. Assume that in that case a white solid fill is the default. Change-Id: Iea20e216e44e13db68887f285c10bc1a8feacf0a Reviewed-on: https://gerrit.libreoffice.org/32786 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-01-06tdf#105127 VML import: handle <v:shape style="flip:..." path="...">Miklos Vajna
I don't see an easy way to implement this via UNO, so use the internal API. As to the internal API usage, SdrEditView::MirrorMarkedObjVertical() (for UI) and SvxMSDffManager::ImportShape() (for WW8 import) are example client code. Change-Id: I9bf27788db32fd35d6b56e0f1a240c4b7abc5604
2017-01-05No need to check isEmpty() before clearingStephan Bergmann
Change-Id: Ie32a4ee915d57618d2a6a661febf39fd0d55dd80
2017-01-05getLength -> isEmptyStephan Bergmann
Change-Id: I5a8c2911851d1a798d8c6f3c25b08cb0469f07a0
2017-01-05oox: rename misleadingly prefixed m_pShapeStyleMichael Stahl
Change-Id: I07fdc4fff2dd05b57d1a0635d0bed8d1afd6dc58
2017-01-05No need for heap-allocated OUStringBufferStephan Bergmann
Change-Id: Id2dbe3ecce9eba2eefab90f43b9a2a6894839cfb
2017-01-05Replace side-effect--only uses of makeStringAndClear() with setLength(0)Stephan Bergmann
Change-Id: Iaf8011f1bd6a10b324653899b7f51458f7d0b68a
2017-01-04replace namespace URL strings with function calls...Rosemary Sebastian
Change-Id: I0b8b265df487aaeb76238013bc93c78e49a9e1a6 Reviewed-on: https://gerrit.libreoffice.org/32723 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-01-03TyposJulien Nabet
Change-Id: I487db955caff589b9f62c50b83067628bb768d50 Reviewed-on: https://gerrit.libreoffice.org/32460 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-01-02OSL_ENSURE->SAL_WARN_IF for progressbar (oox)Julien Nabet
Change-Id: I88f143d823b83cc7db1b0ebde01f416eca84840e Reviewed-on: https://gerrit.libreoffice.org/32642 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2016-12-28tdf#104539 dir attribute of outerShdw has to be non-negativeAndras Timar
Change-Id: Ic6f1c8555eb8d137ced2f4e87baa866df84c69ac Reviewed-on: https://gerrit.libreoffice.org/32467 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2016-12-26use the existing namespace map for the oox namespace exportMarkus Mohrhard
Change-Id: I7909b08db556c6c65c1547303f2b899c30feaba4 Reviewed-on: https://gerrit.libreoffice.org/32425 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-12-26use uniform initializer syntax to simplify codeMarkus Mohrhard
Change-Id: I617c63c16cc2ba06f88d7101716ab05daf4b30a4 Reviewed-on: https://gerrit.libreoffice.org/32423 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-12-26OSL_ENSURE -> SAL_WARN_IF in oox relationship codeMarkus Mohrhard
Change-Id: Iac742e253c1f96a412a803025bb89578f8d96018 Reviewed-on: https://gerrit.libreoffice.org/32424 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-12-17Adapt to no-longer explicit OUStringLiteral ctorStephan Bergmann
...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 Bergmann
...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 Grandin
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 Grandin
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 Grandin
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 Zolnai
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 Grandin
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 Grandin
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 Grandin
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 Kaganski
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 Subramanian
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 Mohrhard
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 Bergmann
Change-Id: I75de45677603800baec18d03114418181c4393c2
2016-11-29tdf#104115 DOCX export: ClosedBezierShape should always result in <a:custGeom>Miklos Vajna
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 Zolnai
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 Bergmann
Change-Id: I52a97b8ec273509131c2200e47527221cb62d7ee
2016-11-25tdf#96052 - export the forbidden shape as path instead of preset shape.Mark Hung
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 Bergmann
Change-Id: I55b82f4669d89e8492b456ff8b0b430f444674a3
2016-11-20tdf59046 oox: fix incorrectly combined shapesMark Hung
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 Hung
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 Zolnai
...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 Zolnai
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 Bigot
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 Vajna
These files had a consistent style previously, keep them that way. Change-Id: I6347efd4a301ddd758f4661778c0dfb68585940d
2016-11-13drop extra semicolonsDavid Tardon
Change-Id: Ie6713d1bdf0010e5bc0bb70ca995c4dd36408673
2016-11-12tdf#100733 oox: update preset shape definition for polar handles.Mark Hung
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 Hung
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 Zolnai
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 McNamara
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 Grandin
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 Grandin
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 McNamara
Change-Id: I2a3dcae5361929c6880b2da1b3107cb2c8141f32
2016-11-07oox: exporting the block arc as its corresponding drawingml preset shape.Mark Hung
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 Bigot
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>