summaryrefslogtreecommitdiff
path: root/oox/source/drawingml
AgeCommit message (Collapse)Author
2017-04-06loplugin:singlevalfieldsNoel Grandin
Change-Id: Ia681765aa1da5c80a3dbe91b7376af841a9c9ec1 Reviewed-on: https://gerrit.libreoffice.org/36145 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-03-31use actual UNO enums in ooxNoel Grandin
Change-Id: I7fbb3619287acde0c397ff9b4015271ec785cc46 Reviewed-on: https://gerrit.libreoffice.org/35958 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-03-23loplugins:redundantcast teach it about c-style typedef castsNoel Grandin
Change-Id: I1ac11a2481c0f4d8be1e1fd7c7637ac0ece3d65c Reviewed-on: https://gerrit.libreoffice.org/35558 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-03-11Passing shaperect to addShape function is uselessTamás Zolnai
Shaperect is ignored by createAndInsert() so it has no effect at all. Also when this parameter is set the size and position is set using the same shaperect, so don't need to pass it also as a parameter. Change-Id: I35a7953f3eda1bdd19af6f3e77c55b5c7e1f7161 Reviewed-on: https://gerrit.libreoffice.org/35073 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-03-11Use the converted shape rectanle hereTamás Zolnai
Change-Id: I38092b9ca0de2c73a639588d441eff56eb88e33e
2017-03-11tdf#106217: Wrong size and position of a shape inside chartTamás Zolnai
Same code which was added to the method DrawingFragment::onEndElement() in d178d7bef193565a7d6aacbc37a58dfc4bd7b316 A shape's size and position inside a chart object are primarily defined by <cdr:from> and <cdr:to> tags in drawing.xml, but in the same file we also have an <a:xfrm> tag which is used for the same thing (defining size and postion) in general. Testing with MSO it seems it ignores what values are set to <a:xfrm> and uses only the <cdr:from> and <cdr:to> values. The test document showing this problem must be created an earlier version of MSO, becuase <a:xfrm> is set to some random values. Editing the chart and saving it with MSO 2013 the <a:xfrm> values are set consistently with <cdr:from> and <cdr:to> pair. Change-Id: Icbaff78e5a6fcea36678c3b3755c97f57976b626 Reviewed-on: https://gerrit.libreoffice.org/35069 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-03-07loplugin:loopvartoosmallStephan Bergmann
Change-Id: Id9ac335bcb365afdae66ec7836d6b3bfb6de8577
2017-03-03Remove redundant 'inline' keywordStephan Bergmann
...from function definitions occurring within class definitions. Done with a rewriting Clang plugin (to be pushed later). Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8 Reviewed-on: https://gerrit.libreoffice.org/34874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-03-02Fix typosAndrea Gelmini
Change-Id: Ic6c41fbcc36c11a7528cde0986593a39c2d6738b Reviewed-on: https://gerrit.libreoffice.org/34803 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-28Fix incorrect function name in SAL_INFOTor Lillqvist
Change-Id: I75ee5f1a20fadef7c20103278bc03abd41b815cf
2017-02-28new loplugin unoanyNoel Grandin
Change-Id: I5d6c4a67cb2a09e7cd5bd620c6b262d188701b89 Reviewed-on: https://gerrit.libreoffice.org/34714 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-27Rename misleadingly named include file fillpropertiesgroupcontext.hxxTor Lillqvist
There is nothing called FillPropertiesGroupContext. Rename the file to "misccontexts.hxx" as I could not come up with some more specific name that would describe the collection of classes defined in it. Rename the corresponding cxx file, too. Change-Id: I44db1db8c63c8e897774597b46a237a214aacedf
2017-02-27There is nothing called FillPropertiesGroupContext since 2009Tor Lillqvist
So bin two pointless and misleading comments that consist of just that identifier. Change-Id: I14724b21d43283dbda1856ab28c56ae44512c3cc
2017-02-27Clean up a few SAL_INFOs a bit and add useful note about the ==cscode== etcTor Lillqvist
I dislike OSL_THIS_FUNC, it is too verbose, at least with Clang on Linux. Just use the Class::Name without parameters and namespaces. Change-Id: Ic8722a131463762ab70ff35d64ae7040c67bf595
2017-02-21loplugin:subtlezeroinit: ooxStephan Bergmann
Change-Id: I8a1b6baba6191b20264f32cbf73f5d75bc50235b
2017-02-10Related: tdf#105707 PPTX import: warn on invalid SmartArt fallback relidMiklos Vajna
We already warn when the SmartArt doesn't have a drawingML fallback, but having a reference to a fallback that is not a valid one (so resolves to an empty fragment path) is also unusable. So warn in that case as well. Change-Id: I03b2325003b4eb38b1347a88899799c6d5c33606 Reviewed-on: https://gerrit.libreoffice.org/34129 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-02-03tdf#105707 PPTX import: warn when SmartArt is missing DrawingML fallbackMiklos Vajna
By the time DiagramGraphicDataContext::onCreateContext() completes, we know if there will be a DrawingML fallback for the SmartArt (called ExtDrawing in the code) or not. Warn about this case once at the end of the import when in interactive mode. Headless mode silently ignores the warning as expected. Change-Id: I2bfeeedcaa244f08d8a0c208167e79d7bb697e6d Reviewed-on: https://gerrit.libreoffice.org/33866 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-01-26Remove dynamic exception specificationsStephan Bergmann
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-01-25loplugin: unnecessary destructor oox..saxNoel Grandin
Change-Id: Ie12bfabc92bce04d702f3e77aa5896366e49245e Reviewed-on: https://gerrit.libreoffice.org/33509 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-01-24Move two include files to oox/inc as they are used only in ooxTor Lillqvist
Change-Id: Ie13614c1977f45aa8086f4db65ca86b7d9212735
2017-01-24Drop incorrect "artistic" prefix from some token namesTor Lillqvist
Apparently copy/paste mistakes in the 642a252cf1a2f1d08c4bbfcae15527bb82c7664d and 21d4cfe19e2796ebf89c408e292c4473924b2bc4 commits from 2014; most of the picture effect type tokens added in that commit do have names that start with "artistic" but not all. Does not break any unit test. (Does not fix the bug I am investigating either, though.) Change-Id: I2c3bb7243e1feaa3fa949b58d3acf34825d6987b
2017-01-17new loplugin: useuniqueptr: jvmfwk..saxNoel Grandin
Change-Id: I732e2e22c6f953f0982fbc8833453e7c23cf9d49 Reviewed-on: https://gerrit.libreoffice.org/33166 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
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-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-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-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-23loplugin:unnecessaryoverride (dtors) in ooxStephan Bergmann
Change-Id: I55b82f4669d89e8492b456ff8b0b430f444674a3
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-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-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>
2016-11-02loplugin:oncevar in helpcompiler..reportdesignNoel Grandin
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-17fix wrong usages of setProperty vs setAnyProperty...Jochen Nitschke
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-07tdf#102997 Fix Error in OOXML Transparency Conversion Mathlbenes
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 Grandin
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>
2016-10-04tdf#100830 drawingML import: handle <a:alphaModFix>Miklos Vajna
Fill transparency on the UI. Regression from commit 57450afb768c085df0ba2344aa94b5f843060178 (DOCX import: declare wps as a supported feature, 2013-12-03), as the VML import handled this. Change-Id: I654b51d51448d25d400979a4a62189b86126ac01 Reviewed-on: https://gerrit.libreoffice.org/29517 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-09-30loplugin:constantparamNoel Grandin
Change-Id: Idbe8c8e6b3d44cacce296ec8c79b2b244281057c Reviewed-on: https://gerrit.libreoffice.org/29321 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-09-18loplugin:unusedenumvaluesNoel Grandin
Change-Id: Icf17f936ce6d07d0e152252833c8645cf9b1163b Reviewed-on: https://gerrit.libreoffice.org/28942 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-09-18fix missing default ctor for ObjectTypeFormatEntry with MSVCJochen Nitschke
MSVC can't create the default ctor (likely because members are pointers). deleting default ctor will trigger gcc (4.8) fault where aggregate initialization fails. create ctor which does same as aggregate initialization, this also prevents implicit creation of default ctor. Change-Id: Ica79c7404de240f38ad18100e6dbc25f1b427960 Reviewed-on: https://gerrit.libreoffice.org/28981 Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de> Reviewed-by: Luke Deller <luke@deller.id.au> Tested-by: Luke Deller <luke@deller.id.au>
2016-09-17convert ShapePropertyId to scoped enum and use it for enumarrayJochen Nitschke
new type ShapePropertyIds replaces vector and plain arrays replace END enum member with LAST remove PROP_END_LIST from plain arrays and properties script store ShapepropertyInfo as reference in ObjectTypeFormatEntry store ShapePropertyIds as reference ShapePropertyInfo Change-Id: If273cc9e6c7bbd625dba5dc79f1c4ae0b21bdb3c Reviewed-on: https://gerrit.libreoffice.org/28960 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-09-16fix copy&paste in DownBarFillsJochen Nitschke
Change-Id: Id1e61caa2252c2d27560b8565abd3255faaf684b Reviewed-on: https://gerrit.libreoffice.org/28939 Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de> Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>