summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2015-11-03chart series support hatches, tdf#94227Markus Mohrhard1-0/+1
Change-Id: Ib3a1ccda738091466d5e2866823f64b254ed5bab (cherry picked from commit 6e3c36255b9a17095745aba2489b347bccf42423) Reviewed-on: https://gerrit.libreoffice.org/19740 Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit c34958475373397bd0c29f81c12ae918646d28fb)
2015-10-17tdf#91293: Preserve hyperlink on URL field OOXML exportKatarina Behrens1-18/+22
The fix is twofold: 1.Get URL property from the underlying text field, not from the text run -- put text field properties into rXPropSet (that's what GETA macro later queries), not into rRun 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 does s/rXPropSet/rRun/ afaics for no good reason 2. Retrieve string content from URL field early, so that the test for empty text content doesn't fire Reviewed-on: https://gerrit.libreoffice.org/18031 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Conflicts: sd/qa/unit/export-tests.cxx Change-Id: I4317e4a2f6f2e6f15c30932adc80f1227e010af0 Reviewed-on: https://gerrit.libreoffice.org/18706 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e17187c323428b7edea425278ea33bca77db12b5)
2015-09-18tdf#83227 oox: reuse RelId in DML/VML export for the same graphicMiklos Vajna2-5/+37
So that large images are written only once to the ZIP container when they are exported using both markups. This affects drawinglayer images, the Writer ones are handled directly in sw and were already deduplicated. (cherry picked from commit b484e9814c66d8d51cea974390963a6944bc9d73) Conflicts: oox/source/export/drawingml.cxx Change-Id: Iff7c769329b42939833056b727b070f6a60da5e3 Reviewed-on: https://gerrit.libreoffice.org/18491 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-18tdf#93097 oox: fix import of metadata from non-relative stream pathsMiklos Vajna1-1/+6
Commit ef2668bad976f1fbb70759887cafd35ea7833655 (PPTX import: fix missing document metadata, 2014-08-28) implemented metadata import for the PPTX filter, but in case the metadata stream is not an existing one, then OHierarchyHolder_Impl::GetListPathFromString() invoked by OStorage::openStreamElementByHierarchicalName() throws. The bugdoc is generated by a 3rd-party tool that always starts the stream path with a slash, and MSO seems to just ignore that: so let's do the same to be able to open the document. Change-Id: I6c0715adeb19b9055669f6a45055415dd2c44e28 (cherry picked from commit 46cf9bb76b29f2bfa6639d9aaf4f26dee365bc0c) Reviewed-on: https://gerrit.libreoffice.org/18368 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-18Fix tdf#77881,tdf#80520,tdf#89525 bulllets lost issue.Mark Hung1-1/+4
Replace bullet char before write out font description since it may be altered if bullet font has been changed (i.e. StarSymbol to WingDings ). Change-Id: I0461cc0a5e4628b36177602bba7ed7f74a0751eb Reviewed-on: https://gerrit.libreoffice.org/17376 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/18318 Reviewed-by: Mark Hung <marklh9@gmail.com>
2015-09-18tdf#93830 txXfrm offset workaround works in rounded rectangle case as wellAndras Timar1-1/+2
Change-Id: I5d8df5c0d55e8dfd7c978b16b2b220c127f3dac9 Reviewed-on: https://gerrit.libreoffice.org/18226 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit cc88a88caad591270760d947848ad0a032d32bdb) Reviewed-on: https://gerrit.libreoffice.org/18270 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-18Resolves: tdf#91060 don't crash on loading certain pptxCaolán McNamara1-1/+1
Change-Id: Ibf32ef644222a59c5fe6a9736ff64739ab24b74f (cherry picked from commit c874bf3f7bd6bbe31416506d9b4213bcbbbac4fa) Reviewed-on: https://gerrit.libreoffice.org/18225 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-08-20tdf#92256: Improved interop of INDIRECT functionKatarina Behrens5-2/+19
This is a combination of 12 commits from master branch: tdf#92256: ODF save/load syntax for string reference Related tdf#92256: map CONV_OOO to listbox item no.1 tdf#92256: Introducing CONV_A1_XL_A1 address pseudoconvention tdf#92256: OOXML save/load syntax for string reference add unhandled case in switch that comment is not correct anymore don't generate invalid XLSX files tdf#92256: Handle case when string ref syntax is unknown tdf#92256: Make OOXML filter CONV_A1_XL_A1 aware too tdf#92256: Make sure ref syntax of Excel docs gets saved tdf#92256: Save ref syntax when different from native one tdf#92256: Don't force CalcA1 syntax on all !Microsoft xlsx docs Change-Id: I226d5644ce729f1311aefc9a8998b3a75633c334 Reviewed-on: https://gerrit.libreoffice.org/17837 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-08-20tdf#87924 DOCX import: rot=90 and vert=vert270 means no text rotationMiklos Vajna1-3/+30
If the shape is rotated 90 degrees clockwise and the text is further rotated 270 degrees clockwise that means we shouldn't do anything with the text and the result will be correct. Also: cid#1315264 incorrect expression (cherry picked from commit dbfed66eebde65f5844a0f1a2cfe548ad4eda962 and 1c09657c5c25cf941588610eeab653217399f9b5) Change-Id: I7c65319258136288520bd24fa2bf8e3c598b0878 Reviewed-on: https://gerrit.libreoffice.org/17807 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-06oox: fix invalid mime type "image/tif"Michael Stahl1-1/+1
(regression from ccfc02f7691848284403d339ee17054169fbff1d) Change-Id: I29a366228bf08f29edfa4a8e963889e34aa3d2ea (cherry picked from commit f18ca153aac53408284062309db513ab73f7dd2c) Reviewed-on: https://gerrit.libreoffice.org/17144 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-08-06tdf#87348 implement nonsequential and mso-next-textbox textbox chainingJustin Luth3-5/+75
cherry picked from commits 976add10b35e482251ed4c75957baeb6811e6e2c and 091fe76b6329b4bb974987554369cbfadd8f2401 Change-Id: I017049a8f3578ad4c2a1f549be1c683f98c20318 Reviewed-on: https://gerrit.libreoffice.org/16692 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06Prop_pSegmentInfo is totally misunderstood apparentlyCaolán McNamara1-35/+46
digging into the crash on export of kde216114-1.odt reveals various horrors Change-Id: I0d24fe303d561a00a08098b306d10fd8273af928 (cherry picked from commit b04e1e79e64cb7bb3106fd08a019c27b09bdd5c6)
2015-08-06similarly fix fatal export of kde216114-1.odt to docxCaolán McNamara1-11/+30
Change-Id: I78478de91473681fd8d836293dabe7b790dda516 (cherry picked from commit 80fbd731d8b8b101a10466a4d16d4867e9de968b)
2015-08-06fix fatal attempt to export kde302504-1.odt to docxCaolán McNamara1-8/+9
the enhanced-path contains decimal points so the last element is a double not an integer Change-Id: I90be76a2d4cb90ee7a904aa72fe65770c675fc53 (cherry picked from commit aeb52a855d55475ff2e74f5308ae580dce3e069f)
2015-08-06tdf#92000 save rectangle to DrawingML as a preset shapeAndras Timar1-0/+1
Change-Id: I8b39a210490759e9f548c195e516a26b94a8b3cb (cherry picked from commit 113adfe37326f132de2ab1c6220dfd95fec4c6ba)
2015-08-06tdf#92001 'Handles' contains array of PropertyValuesAndras Timar1-1/+2
Change-Id: I17ea45f2b1dd46a7f1c0f3ce8c680bef9ec533fa Reviewed-on: https://gerrit.libreoffice.org/16249 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 7dee641f675e7f472f5bec39cb92a1422fd1ffee)
2015-05-30another DrawingML export crash fixAndras Timar1-0/+12
Change-Id: I0386b4a768a9ac51cb86ac1c3edb17c41caf821a Reviewed-on: https://gerrit.libreoffice.org/15993 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit a819691ecc32586e800566d74ac22b474430d685)
2015-05-28DrawingML export crash fixAndras Timar1-20/+14
Change-Id: I777c6734a7f63240e9021152ecff0a86f530ff8f Reviewed-on: https://gerrit.libreoffice.org/15951 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 62031cd02d1fbb27c2e5bc9eee2a8dd7c7c9e295)
2015-05-28tdf#90338 related: ignore empty shape handles structAndras Timar1-2/+6
Change-Id: I486564a124cfb0d13a8b20e89cf13e752ccb7237 Reviewed-on: https://gerrit.libreoffice.org/15923 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 1a4eeac14b618714bb8be9755f508ee63ac4a422)
2015-05-28tdf#90338 tdf#84254 DrawingML export fixAndras Timar2-10/+213
Change-Id: I610d8099f057a2a34a1f9573d8ac16b5b8da9fc7 Reviewed-on: https://gerrit.libreoffice.org/15918 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 481c185e327cb83ffcb29657d5a354eae2c4a5f3)
2015-05-23tdf#91429 do not convert ooxml preset shape modifier valuesAndras Timar1-10/+1
Revert "Resolves: #i124703# adapt coordinate range from ms relative..." This reverts commit c764a3d978beb2e6197a8d3f7df53d81ebf72467. The reverted commit did not fix anything in LibreOffice in the first place. The document referenced in #i124703# is as good without the patch as with it. But it caused a regression. Conflicts: oox/source/drawingml/customshapeproperties.cxx Change-Id: I65eb114423039e9c9c684cc55009275fd06caacd Reviewed-on: https://gerrit.libreoffice.org/15875 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit da0a44b415f630ce39617b8c8f0c366177a7705e)
2015-05-20fix Win buildNoel Grandin1-1/+1
ambiguous symbol Change-Id: Ie3eea266b6a1bf6ca65edaf6a2f22e543a128646
2015-05-19coverity#1298896 dead codeCaolán McNamara1-5/+0
Change-Id: I27b27b4f6ca4b443ebbfb0898cef7481b47658f9
2015-05-19coverity#1298897 deadcodeCaolán McNamara1-5/+1
Change-Id: I61892eeeb3d90e50f23cb1dbaf303aabaa1225fa
2015-05-18tdf#90245: Support for table merge cell export.Sujith Sudhakaran1-9/+124
Previously, the merged cells were not getting saved. Also it was leading to corruption if saved as pptx. While on opening the round-trip file of odf extension which has merged cells, merged cell properties not used to persist. In the current implementation XMergeableCell class was not having any property to identify the parent cell of a merged cell. This CL includes: - Fixed the above scenario for export of file - Now, the odf file with table merged cells persists its property - MS doesn't complain for any corruption after export an odf file as pptx TODO: Writing a UT seems to be tricky for this change. Need to analyze and will raise the UT in separate CL. Change-Id: I32f9daf77312a0ef3f291f36aef372671554c56d Reviewed-on: https://gerrit.libreoffice.org/15282 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-05-18oox: these ctors can be explicitMiklos Vajna8-8/+8
Change-Id: Ie53422eb4684bc3d720c8922d4764b807df4c8f3
2015-05-18Remove include stdio (part2)Julien Nabet2-2/+0
Change-Id: Iae58d107d8df1c543a165086fb2b7c288e7121dd Reviewed-on: https://gerrit.libreoffice.org/15775 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2015-05-16Fix copy-paste errorJoren De Cuyper1-1/+1
Due the variables above this error, I think this needs to be the .Height, not .Width Change-Id: If796cd1950f59d0e1a6005c1c1185066c688ef55 Reviewed-on: https://gerrit.libreoffice.org/15748 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-05-15tdf#91064: Revert "tdf#89790 DOCX: saving LO version number in app.xml"Joren De Cuyper1-3/+2
This reverts commit 480ca7434a330b2678f9ef287cffd6d9cf27bed5. Change-Id: I69a16425fc36979d49f409bbd7921495a22a35dc Reviewed-on: https://gerrit.libreoffice.org/15737 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org>
2015-05-15tdf#74932 FILESAVE: Shapes appear when saving a .XLSX file with filterPriyankaGaikwad1-0/+6
Problem Description If the attribute hidden is set and then after exporting it to .xlsx, the shape does not remain hidden. XML Difference Original : <xdr:cNvPr id="2" name="Rectangle 1" hidden="1"/> Roundtrip : <xdr:cNvPr id="0" name="CustomShape 1"></xdr:cNvPr> Change-Id: I2e87a484ea984b56415891fd157995cb49453f76 Reviewed-on: https://gerrit.libreoffice.org/15662 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-05-15support iconSets in extLst entriesMarkus Mohrhard5-6/+7
Change-Id: Iec293ec3541b87b16f5a8097d51b878166814670
2015-05-14convert GRFILTER_I_FLAGS to scoped enumNoel Grandin1-1/+1
Change-Id: Ic1cb9b32fe252706cd607abb2ae1fd5a00999901
2015-05-13the secondary axis should be on the rightMarkus Mohrhard1-1/+1
Change-Id: I604acb0b7f0bf8b726ace07c2fa9919c0f0b6aa6
2015-05-12uno::Sequence provides now begin and endMarkus Mohrhard1-3/+3
Change-Id: I7af0db5381737c7d28a491e4aca673d9cc4b1e19
2015-05-12export each axis only once non-deleted, related tdf#84347Markus Mohrhard1-1/+9
Change-Id: Ia0e23faf43fd266b8314f807b77423e9a3e15797
2015-05-12remove and replace old OSL_TRACE messagesMarkus Mohrhard1-6/+4
Change-Id: Id6de1425c03be8552d1dd2597001bf0632292e90
2015-05-12use r prefix for referenceMarkus Mohrhard1-6/+6
Change-Id: Iad76b7263526da4e50ef3c0b6933a8833f567790
2015-05-12use chart2 API for attached axis exportMarkus Mohrhard1-8/+24
Change-Id: Ide1a30307711e3857d83b691c95d984439359005
2015-05-12rename variableMarkus Mohrhard1-5/+5
Change-Id: I6606ca56c28569b6b2ceb1607c8dc570ce50bba7
2015-05-12tdf#90246 PPTX paragraph and bullet leftMargin and Indentation is not exportedPriyankaGaikwad1-6/+69
Problem Description : XML Difference Original : <a:pPr marL="360000" indent="-456840"> After RT : <a:pPr> Solution : added support for marL and indent for paragraph and bullet. Change-Id: I1132d7b90ac1d7fc924f9a048f189e07e255e33b Reviewed-on: https://gerrit.libreoffice.org/15016 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-05-12loplugin:cstylecastStephan Bergmann1-1/+1
Change-Id: I1c0f16d4f68013f126a52976d4ff9f7dde9f3eaf
2015-05-11tdf#90174 FILESAVE: export of bullet color for pptxPriyankaGaikwad1-0/+12
Added pptx export support for bullet color. Change-Id: I0c7713a6d2161e1ecbe0d7f5778e78791e9759cd Reviewed-on: https://gerrit.libreoffice.org/15169 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-05-11loplugin:cstylecast: nop between pointer types of exactly same spellingStephan Bergmann1-1/+1
Change-Id: Ic92c92704e04ce868717a8fabf9919adbf27a54a
2015-05-11Unused oox::AttributeConversion::decodeUnsignedHex()Miklos Vajna1-5/+0
Change-Id: I26d52d4ba49216dd9c3d402dbd5480865e5351e1
2015-05-11only export series for same axis into same chart type element, tdf#84347Markus Mohrhard1-48/+107
Change-Id: I2b8b962054b0e1ca98db3929c6692e7c354e6a93
2015-05-11split exportSeries function upMarkus Mohrhard1-33/+36
Change-Id: I06c09a494bdf37a87ff851a8e3cbc94b22b9a511
2015-05-10tdf#90607:Issue in bullets not having any text following.Charu Tyagi1-0/+8
Change-Id: If0571864684ec484e859c967aebb23c378c302ef Reviewed-on: https://gerrit.libreoffice.org/15298 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-05-10Code is executed in both cases so take it outside the statementJoren De Cuyper1-15/+7
Change-Id: I8d4c3a62d4e63d2666bfce18d6af772a29e271d4 Reviewed-on: https://gerrit.libreoffice.org/15695 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-05-10CppunitTest_sd_export_tests: fix validation errorsMiklos Vajna1-1/+2
Regression from 3e4d2043e99201ec542186039e3be34d3c226111 (tdf#90190 PPTX table cell border width is not exported., 2015-04-16). Change-Id: I9ccbfe32a068ea787f1bb5c62034a54f2a5996aa
2015-05-09Do not write v:fill properties on export of imagedataJoren De Cuyper1-37/+40
See validation log of fdo73214: ERROR cvc-complex-type.3.2.2: Attribute 'type' is not allowed to appear in element 'v:imagedata'. ERROR cvc-complex-type.3.2.2: Attribute 'color2' is not allowed to appear in element 'v:imagedata'. http://dev-builds.libreoffice.org/crashtest/d879d5346b525c478e93363b7ec06e797ce01461/validation/docx/fdo73214-1.docx.log Change-Id: I99eacc05ed28c3cd848326fd08f3668a1ce0f4fb Reviewed-on: https://gerrit.libreoffice.org/15668 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 13:51:53 +0000