summaryrefslogtreecommitdiff
path: root/oox/source/drawingml
AgeCommit message (Collapse)Author
2014-03-10WaE: unused variable 'aPropertyName' [loplugin:unusedvariablecheck]Tor Lillqvist
Change-Id: I8c95ca06e2a688811310d62470c4173d30d20c91
2014-03-10oox: handle all w14 text effects at groupshape importTomaž Vajngerl
When dealing with groupshapes, the responsibility to process the w14 text effects elements is in oox. This commit adds the code to handle all elements and its children elements and attributes and puts the values into a CharInteropGrabBag. Change-Id: Iafb8759bd60e0ee831296dc2d9159f4311ad5403
2014-03-10fix OOXML strict chart importMarkus Mohrhard
Change-Id: I84a2fd575ced64d4774147063f13ebb8605c100f
2014-03-09Fix signed/unsigned comparisonMatteo Casalin
Change-Id: Iedc3b5c20b5f47117f29dcbeaf84efacbd4ce497
2014-03-08coverity#707955 Uninitialized scalar fieldCaolán McNamara
Change-Id: Ia6416e8c3c2e90bdf33908b53f67a77abef765b1
2014-03-07drawingML export: fix handling of dkVert pattern fill presetMiklos Vajna
We convert the dkVert preset to a certain hatch configuration (style, distance, angle), but when we exported it back, then we didn't recognize it, and wrote ltVert instead. Change-Id: I021885496843f5ea5453af3473453bbec50d928f
2014-03-06Replace [] with getProperty()Muthu Subramanian
2014-03-06n#821567: Fix TextFrame background import for sw.Muthu Subramanian
TextFrame in sw unfortunately doesn't seem to support nametable!
2014-03-06n#821567: Import PPTX background images with table-name.Muthu Subramanian
Seems like using the URL directly causes ODP export to ignore the background image. Probaby ODP Export requires updation as well?
2014-03-06fix OOXML strict importMarkus Mohrhard
fix the problem introduced by 6536826f2f4c747582d60ed40b0418c6a67a9829 Change-Id: I6c499f8490d92badda0f086d48c2347fa112bb4e
2014-03-05Revert "remove unused code oox::core::Relations::getRelationsFromType"Caolán McNamara
we need it again now This reverts commit 77c45eb25eb462bacdf7d658d6cb485f755beaa5. Change-Id: I3e171d95e4f50c8e26824da2f6e6817d3b597d4d
2014-03-05getRelationsFromType -> getRelationsFromTypeFromOfficeDoc (?)Caolán McNamara
Change-Id: I492020d03ed4178510e6aae431cf4827c1166f0b
2014-03-05fdo#74792 [DOCX] Grab-bag rels and images for SmartArtVinaya Mandke
Added support to grab-bag rels and associated Images for data[i].xml, and drawing[i].xml. Added UT for the same Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8362 Change-Id: I545825f67214f14037ab72b77764a07d575b8b5b
2014-03-04better safe than sorryMarkus Mohrhard
Change-Id: I1e22f166381b3bc8122b3bbef7fc760705e402d1
2014-03-04in the old design all lists needed to be the same size, fdo75200Markus Mohrhard
We did not crash in the invalid memory access because the lists were continuous in memory and we would just pick the next id. However it crashed when trying to map some of the ids to non existant strings. This commit also removes the need for the earlier fix for this bug that just hit the problem behind some checks much later in the call chain. Change-Id: Ic6658987815c4e84ed2449934c310e30dcd0ed4c
2014-03-04remove the inheritance to std::map in PropertyMapMarkus Mohrhard
Change-Id: Iaaf5b7ab47ffa151cd7c8ea376763d02c883f377
2014-03-04adapt the genrated files to use setPropertyMarkus Mohrhard
Next step on my way to remove the inheritance from std::map Change-Id: I96e8e4c05f1bd821a0c1c4de5c78af1706fe50e5
2014-03-04adapt script to use setProperty instead of <<=Markus Mohrhard
2014-03-04adapt script to instdirMarkus Mohrhard
Change-Id: Ibf88802777c09786f05c6ffff20d985fbbe491af
2014-02-28DOCX import: handle font theme references in group shape textMiklos Vajna
Change-Id: I1d5b86ad17b2c4a0945f483c94ac6abf410cf1d6
2014-02-26cppuhelper: retrofit std::exception into overriding exception specsStephan Bergmann
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-26Remove visual noise from ooxAlexander Wilms
Change-Id: Ie25838f20f00dc32d9d22959308c118cef688e94 Reviewed-on: https://gerrit.libreoffice.org/8288 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-24OOXML chart import: ignore rot values outside the valid rangeAndras Timar
Change-Id: I506a78a024d761d1d263a7bb1dcbf09a4bbcf4ef
2014-02-23drawingML import: remove some unneeded memberZolnai Tamás
Change-Id: Iea975665b9225e535dcc4fbdcd666d7c7bff8ef3
2014-02-23Remove unneccessary commentsAlexander Wilms
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-22we only support simple labels in the InternalDataProvider, bnc#864396Markus Mohrhard
Change-Id: Ie31c5c73bb5185125fd4493c4e476997e2e9bc63
2014-02-21drawingML import: paragraph spacing inside group shapeZolnai Tamás
unotext: a conversion was missing during the corresponding SvxLineSpacingItem was filled with "ParaLineSpacing" UNO property. Change-Id: I02559ed7e8b46150a88eed2bf20afdf084aec47b
2014-02-21vcl: sal_Bool -> boolStephan Bergmann
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
2014-02-21drawingML import: run fonts inside group shapeZolnai Tamás
Change-Id: Ib54fe868c11c0c22b85d8821fa7274c80918362c
2014-02-21drawingML export: gradient fill defined by imported themeZolnai Tamás
Plus avoid writing out empty <a:gradFill></a:gradFill>. Change-Id: I50fa92b2cc30eedfe28a8c6af697d43d98a3aee8
2014-02-18drawingML import: fix position of cildren in shape groupsZolnai Tamás
Translate component of parent shapes' transformation have to be applied to children when there is no explicit child transformation. Note. Export also use this concept. Change-Id: I51bd3325fb53ee250402326ee361c8f07038ed07
2014-02-18DOCX drawingML import: handle paragraph top marginMiklos Vajna
Change-Id: I4a69647af5b068c35bea0a5f9665a5e68eb76293
2014-02-15fdo#74137: Fix for courruption of Pie chart after roundtrip.Rohit Deshmukh
Problem: - Pie chart with data labels files gets corrupt because of label position is bestFit in original file. - But after round trip, data labels position gets changes to top, left and right. For some data labels postion value is missing. Implementaion: - In LO, while converting data label from model, the position gets changed. So we are ignoring this hack for Pie chart. Conflicts: chart2/qa/extras/chart2export.cxx Change-Id: Ic51845cd6f39bc905439eea8971e878607d25dac
2014-02-14drawingML import: fix inheritance of character heightMiklos Vajna
The problem was that in case a shape had multiple (e.g. two) paragraphs, and in case the first paragraph had an explicit character height, but not the second, then the cursor carried over the explicit character height to the second paragraph, but it shouldn't, as that leads to incorrect character height in the second paragraph. Fix this by remembering the default character height and using that in case nothing is set explicitly. Change-Id: I66e06d5cf192739fb254f7280c74617171d9ee6a
2014-02-13Fix win buildZolnai Tamás
Use namespace to avoid ambiguity. Change-Id: Iaef6869b12839edbb94695aa5e3d877863e9b669
2014-02-13drawingML export: hatching of shapesZolnai Tamás
Change-Id: I7111d4064d033e27659c7b45650d596df22c593f
2014-02-13drawingML import: improve mapping of some filling pattern to hatchingZolnai Tamás
For a better visual match. Change-Id: I6f8a2f4b500c4ea04ef92572984a2bac597d85be
2014-02-12drawingML export\import: cropping of shape's fill textureZolnai Tamás
In Writer shapes had no cropping property so far. With this commit this is introduced as a FillProperty and has the same type as the cropping used for pictures (Picture context menu > Picture > Crop). Layout and UI will be an other step. On the UI it would be placed on the Shape context menu -> Area, when Bitmap is selected as fill type. Note: In case of picture/graphic, cropping property is imported from and exported to a:srcRect instead of a:fillRect. Change-Id: Idc1ed2d40cb20b6992e94f14e7e4d853e1f55d02
2014-02-12fdo#72520 : Preserving external data path in chart import.sushil_shinde
- Preserved external data path for chart in newly added property for external data. Change-Id: I3c49093c9e71cd126c097500b3951a345e81039e Reviewed-on: https://gerrit.libreoffice.org/7214 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-02-12fdo#74111 3D Rotation is wrong after Round trip for bar chartPriyankaGaikwad
3D Rotation is lost after Round trip for bar chart. XML Difference: Original: <c:rotX val="30"/> <c:rotY val="50"/> Round Trip: <c:rotX val="42"/> <c:rotY val="42"/> Implementation: The RightAngledAxes should set first then the RotationVertical and RotationHorizontal because the RightAngledAxes is needed while setting Rotation. Conflicts: chart2/qa/extras/chart2export.cxx Change-Id: I64f3b6e56f8515bf6c3d935c59dfaf1d440dba31
2014-02-12fdo#74115 Fix for DOCX GradientFill for Chart WallVinaya Mandke
Fixed import and export for chart wall Gradient Fill in DOCX Added UT for the same. Conflicts: chart2/qa/extras/chart2export.cxx Change-Id: Ie6caa2b238aeb70f7225145da8c5c78003e73002
2014-02-11fdo#74112 Added properties to store chart display unit information in import.sushil_shinde
- added display unit properties. - added axis display unit converter class. Change-Id: Iaa1f9a175b1109c8da7321a1567a04fb981568d1 Reviewed-on: https://gerrit.libreoffice.org/7720 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-02-11ooxml: Preserve color transformations for shape theme colorsJacobo Aragunde Pérez
Colors can have modifiers like in the following example: <a:schemeClr val="accent6"> <a:lumMod val="40000"/> <a:lumOff val="60000"/> </a:schemeClr> In the case of RGB colors, the transformations are merged within the RGB color itself on import, so there's no need to preserve the original transformations, but that's necessary in the case of scheme colors. Slightly modified an existing unit test to check this feature too. Change-Id: I3a03a56f2b633f283c392e54842b326bd4df316b
2014-02-11coverity#736026 Invalid iterator comparisonCaolán McNamara
Change-Id: If0a501cd19955d472c85341772385afbfe8768ca
2014-02-08drawingML: remove code duplication: use GetRelativeRect()Zolnai Tamás
Change-Id: I7368ad15292c82e5320deb9ab60e04f70d0c92b8
2014-02-08drawingML export/import: text frames with vertical alignmentZolnai Tamás
Change-Id: I469da0a8234dd2979facfed3d66907aad1a138ab
2014-02-06typo fixes in commentsAndras Timar
Change-Id: Idd49478d59cd062118fbf8e99d1c8bc5250013fc
2014-02-05drawingML import: paragraph adjustment inside group shapeZolnai Tamás
Change-Id: I875cb1f12c9f81d329d7fe9cd3aa32a4cd818573
2014-02-05drawingML import: capitalization inside group shapeZolnai Tamás
There are two types of capitalization in DOCX: -uppercase: <w:caps> -smallcaps: <w:smallCaps> Change-Id: I6a5d238bed68aa3fd3478a77cf1942f009480eb6
2014-02-05ooxml: preserve gradient shape fillJacobo Aragunde Pérez
LibreOffice is unable to properly import the custom gradient fills defined in ooxml documents. To prevent data loss, we save the original gradient fill definition in the shape interopgrabbag and we write it back to the document on export. In case the user has changed the fill properties of a shape, the original fill will be discarded in favor of the new fill. We have added a new ooxmlexport unit test to test this feature. We have also added some missing transformations to the methods getColorTransformationName and getColorTransformationToken in Color class, and refactored some code in class DrawingML to the method WriteColor( OUString, Sequence ). Change-Id: Ie71f89eaa20313561aa9180ea33b76f3fb5e5df6