summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2019-03-11tdf#121744 XLSX Export Combinated Chart (Column and Line)Jozsef Szakacs1-8/+18
Each of the Column and Line Chart creates it's own x and y Axes. So now the LineChart Exporter Method uses the same Axes as the BarChart. Thanks for the help: - Balazs Varga - Adam Kovacs Reviewed-on: https://gerrit.libreoffice.org/64146 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> Reviewed-on: https://gerrit.libreoffice.org/65449 (cherry picked from commit d58d92d72b00f45c56a3b0fe55ca9fd837d244a9) Change-Id: Ie763cf831c2ce63ef204d1fdcbff634e7ca8fad5
2019-02-18fix assert seen on opening attachment from tdf#123163Caolán McNamara1-1/+2
I imagine it should have been seqPos-(idPos+2) seems to be like this since the initial commit of commit 091fe76b6329b4bb974987554369cbfadd8f2401 Date: Tue Jun 30 12:55:18 2015 +0300 tdf#87348 implement mso-next-textbox vml-style textbox chaining import Change-Id: Ic2f527ede2102c01c8589d58d8c705d59b0a6ffe Reviewed-on: https://gerrit.libreoffice.org/67454 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 45510866fedac63014a3120a1130dbea9fd803ee)
2019-02-05oox: disable gradient fill grab-bag for PPTXMiklos Vajna1-1/+3
This was added in commit 2fcf3a871c94feeca11619ef5c8c0466ce61eb74 (ooxml: preserve gradient shape fill, 2014-01-31), and assumes that the theme colors can be preserved, as the theme definition is grab-bagged as well. But the theme is grab-bagged only for DOCX, not for PPTX, so skip gradient grab-bag for PPTX, otherwise the gradient would refer to incorrect colors in the theme. Change-Id: I98e1c67d4b10e68916f81dd7fc508eb4146d506b Reviewed-on: https://gerrit.libreoffice.org/67386 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit cfc1f4ea4889f768d689a0df71519e9bcb707bc0) Reviewed-on: https://gerrit.libreoffice.org/67396 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-02-05Related: tdf#94238 PPTX export: handle border and center of radial gradientMiklos Vajna1-4/+55
Map Border to a gradient stop before the final one. Map X/YOffset to the focus rectangle of the center shade, i.e. the opposite of what the import already does. (cherry picked from commit 82365563fb2fd55d90d444a104fa475d4ffc4cf1) Conflicts: oox/source/export/drawingml.cxx sd/qa/unit/import-tests.cxx Change-Id: I88db7d579da7327e5e06b736a75a6892b338dd73 Reviewed-on: https://gerrit.libreoffice.org/67395 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-02-04Related: tdf#94238 PPTX import: handle subset of radial gradient fillMiklos Vajna2-6/+50
Handle the case when the horizontal center is at 50%. Other cases are still unhandled, those are more complex. After fixing the style, center and border, the gradient fill looks similar to how PowerPoint renders it. Change-Id: I419da70482de37031aa2c7fc735692019d7665f5 Reviewed-on: https://gerrit.libreoffice.org/67175 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-01-21tdf#122031 Change element order for OOXML compatibility.Gülşah Köse1-1/+1
Change-Id: I8cca2db6157996dd25afa4c95e769725188fdfb9 Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/66686 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins (cherry picked from commit 1e38d5b976dacd8b42b8330b4b9635a058ffe20b) Reviewed-on: https://gerrit.libreoffice.org/66702 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-01-18tdf#122031 Export number format of chart label to OOXML Gülşah Köse1-2/+18
The patch fixes missing numFmt. numFmt element has been added as child under the dLbl element. Change-Id: Ic81ac58c2ea087cd7599351034eb4298ee613843 Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/66493 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Jenkins (cherry picked from commit 102f42fa6398fa7e6bf8e9bcfa4c28c22473cd26) Reviewed-on: https://gerrit.libreoffice.org/66631 Tested-by: Andras Timar <andras.timar@collabora.com>
2019-01-17tdf#121804 DOCX import: handle sub/superscript inside group shapesMiklos Vajna1-0/+11
Regression from commit d5c934d150cb6cea5f96cbbee4fb5e8312bf027e (n#792778 DOCX import: parse group shapes in oox only, 2012-12-14), where where manual wordprocessingML -> drawingML translation did not handle this character property. Reviewed-on: https://gerrit.libreoffice.org/65289 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit dafbc86037d63e938967c0f501bdfe3ae19fa992) Reviewed-on: https://gerrit.libreoffice.org/65414 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit ba7435e5914a713730265c3378ce616de543667f) Change-Id: I87481bc9c26651fd15dd39a58a92f467e8311256
2019-01-17tdf#121282, tdf#121279, set text properties also on complex data labelsMarkus Mohrhard1-4/+10
Change-Id: I2304b6050b786b6e4a9a8a968d7a4846d9da8be8 Reviewed-on: https://gerrit.libreoffice.org/64306 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 6a04b9298ae993881d20fc4b5aa91516d4df6695) Reviewed-on: https://gerrit.libreoffice.org/64309 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5c380a7fe3b3399002aabdc980842ce46a50d012)
2019-01-17tdf#121205: Convert <a:br> to newline chars in chart titleVasily Melenchuk2-1/+2
Reviewed-on: https://gerrit.libreoffice.org/62752 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 57d4cd80dcaf01fe4897d79d89e906d355410243) Reviewed-on: https://gerrit.libreoffice.org/62990 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit a1ea94fde40b82d0ec7ec842bf44cdeeea676aca) Change-Id: I43d14025c48878c5bc035d492623f4fc52426e5e
2018-11-20tdf#104579, if no data point shape props are set take the series propsMarkus Mohrhard1-0/+4
Change-Id: Ia2c0d6b05385a0f3900e20ef807b869e4098654c Reviewed-on: https://gerrit.libreoffice.org/63541 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit afe5e1f8de0a25364c8c98b453cfe831330c4eed) Reviewed-on: https://gerrit.libreoffice.org/63544 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3633414c485b39a1eb824bae0dd2002976a4dc6e)
2018-11-20tdf#102186, don't overwrite the deleted flagMarkus Mohrhard1-2/+2
Change-Id: I3cc69a0baebc55ad52b64960657e9daa4be8f39d Reviewed-on: https://gerrit.libreoffice.org/63510 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 4bd2e57653ce22044ab984b06c84f22ef287cecf) Reviewed-on: https://gerrit.libreoffice.org/63513 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 47c05f6e1bb4ec77f242001e4c2d297af48f511e)
2018-10-11tdf#111980 oox optionbutton autoGroup inside GroupBoxJustin Luth2-7/+57
The area of a GroupBox indicates which radio buttons are considered to be part of the same group. The button needs to be fully inside of the groupbox in order to participate. This patch resolves the last worry of commit 9f969799629fe6bdf8b922d8cb922846aa646ece Reviewed-on: https://gerrit.libreoffice.org/61131 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 048b8e45813f6a19a4ff56e1d676fe9450325cd2) Change-Id: Ie6057337c63bf9eb173a0615e30c8d4e4d0c7a19
2018-10-08tdf#120301 oox: lclIsWhiteSpace should return true for a spaceJustin Luth1-1/+1
Reviewed-on: https://gerrit.libreoffice.org/61388 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 2cae2ecfef47d8dd10647c10f9577392c1887d3a) Change-Id: I72c79c1fed4d9a91bf02024eef23cd3b1a58632e
2018-10-03tdf#120028 PPTX import: map shapes with multiple columns to table shapesMiklos Vajna9-1/+89
This is a combination of 3 commits. 1st commit: Longer term the core Impress shape has to be improved so that it can have text in multiple columns. Shorter term, map text with multiple columns to table shapes, that gives correct layout in many cases and requires changes to the import filter only. (cherry picked from commit aef569ed83a3ccc02639e5b2a1c7cc131ba262fc) Commit #2: Related: tdf#120028 PPTX import: fix font size of multi-col shape text Normal shapes have a TextFitToSize property for this, but table cell content has to be scaled manually, as the rendering has no automatic support for them. Luckily the file format has the info we need to scale at import time. (cherry picked from commit c8b2849d140677f7b35523096eb2bc715b3dc507) Commit #3: Related: tdf#120028 PPTX import: fix font color of multi-col shape text Not just font color, anything defined via list styles were not imported. (cherry picked from commit 800bf1071a30955ff70373b2fb5886eadce59dee) Conflicts: oox/inc/drawingml/textbodyproperties.hxx Reviewed-on: https://gerrit.libreoffice.org/61244 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 6f1fb474694876bc4ffeb552dcc7bed8f32cd221) Change-Id: Id7942b16882ab1f083ded2f0e577e8c9e128697c
2018-09-28tdf#111980 oox: connect empty radio groupsJustin Luth1-1/+11
affects doc, docx, xls, xlsx (at least). Handling optionbutton groups is new since 2017, so incremental enhancements are OK. In LO, if an option button with an empty groupName (like any form control which has no groupName option), then it stands alone, which is a ridiculous position to be in for a radio button. So, lets put them all together into an automatic group. In MSO, buttons without any explicit group stick together, so the effective group is the entire document, or entire sheet. One complication is that ActiveX radio buttons don't interact with Form radio buttons, even if all of them have no group name. That situation is not handled by this patch (and not very likely to happen since ActiveX defaults the group name to the sheet name). (A Group Box can also be used, which automatically groups all buttons fully within its area. That will be much harder to implement since every object will need to first be categorized as groupbox or optionControl - meaning that everything must first be imported. That implies a function call from every application doing the import.) Change-Id: I204adaea75ce99999a16c0cc4e9c3b8b08da9433 Reviewed-on: https://gerrit.libreoffice.org/61064 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 9f969799629fe6bdf8b922d8cb922846aa646ece) Reviewed-on: https://gerrit.libreoffice.org/61072 Tested-by: Michael Meeks <michael.meeks@collabora.com>
2018-09-13tdf#91999 export/drawingml: shape rotate 180 is not specialJustin Luth1-36/+10
This commit reverts the first (LO 4.3ish) regression commit 6063555744ed89d8a757b667cddcdd4357839466 and most of the two commits that tried to fix that: commit 9ae1e094d5a8a5b4432c88ebea0ca9fc1c79f602 and commit ee45d881efab230e7682f964d6ad4d00f85b0006 in LO6.0/6.2. The ooxmlexport6 unit test shows that there is nothing special about 180degrees. So, all transformations need to be avoided in docx format - not just 180 degree ones. I removed IsInGroupShape() since it is no longer being used - as per standard procedures. Reviewed-on: https://gerrit.libreoffice.org/58434 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit ab296726263655bd3a722c125dd9cec2d507aaa5) Change-Id: Id2bba5bc542875a10ac21fbb67f29b2d59705493
2018-09-12tdf#115670 vml shadow: shadow is off unless explicitly set onJustin Luth1-1/+1
The absence of "on=" is treated in Word (tested 2003) as off. Change-Id: Ibc6b0e5ca0f25a9c3ca1b9505fa24c4d821bfd0 Reviewed-on: https://gerrit.libreoffice.org/59457 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit b914c4c98bfca32168ff05fec7cc687c95754d36)
2018-09-12tdf#107690 OOXML import/export of setting "Open as read-only"László Németh1-15/+35
Import custom document property _MarkAsFinal as LoadReadonly setting, export LoadReadonly as _MarkAsFinal in DOCX, XLSX and PPTX documents. Before this fix, LibreOffice opened read-only OOXML documents as editable, also saved and exported _MarkAsFinal=true silently, resulting unintented read-only warning info bar in MSO. This commit improves interoperability a lot, because this is a basic document protection of MSO, recommended on its UI. Note: LoadReadonly (on File->Properties...->Security, property "Open file read-only") doesn't show "Edit read-only" info bar from commit 630186ff4e0eba7317e542f8c3eca39ebd068721, but it's still possible to switch on editing by Edit->Edit Mode. MSO shows info bar for _MarkAsFinal. (There is an advantage to hide the info bar in LibreOffice in a mixed environment, to avoid overwriting of press-ready MSO files by LibreOffice.) Note 2: Other differences of LoadReadonly in LO and _MarkAsFinal in MSO: (1) Switching on editing doesn't remove the LoadReadonly property automatically in LO. (2) Saving with LoadReadonly doesn't switch off editing of the actual (still opened) document in LO. Reviewed-on: https://gerrit.libreoffice.org/56180 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 9a5c56a9c4e04589b0a6bb710573922e459d9685) Change-Id: Ie279c0670090d075103384cfa44ff1c2a2898216
2018-09-12tdf#108064 OOXML export: keep preset dashes with any line widthAdam Kovacs1-12/+28
Change-Id: I496e1cbac527383837a4e8fcdee42967ecf555e4 Reviewed-on: https://gerrit.libreoffice.org/59968 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit f3d6c44c9cb533fe4f1cd28fc95adc36cac4bfd5)
2018-09-12tdf108064 OOXML export: keep preset dashes in shape outlinesAdam Kovacs1-7/+27
Extending commit d7551e32609d0e0de8ac419576ca42d65c5015be to all default MSO 2016 preset dashes: Saving an ooxml file with LibreOffice now preserves the prstDash tags with the values sysDot, sysDash, dash, dashDot, lgDash, lgDashDot, lgDashDotDot, instead of converting them to custDash tags. Note: the import of the preset dash outlines are still not relative to the line width, in spite of their original behaviour in MSO. Change-Id: I65eaf06952a968019495664067010c874fce1352 Reviewed-on: https://gerrit.libreoffice.org/59203 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit f5f235051055d24c8aced602078c54261603efea)
2018-09-12tdf#119617 Fix export of Autofit property of shapes to PPTXBalazs Varga1-0/+6
With this patch the "Resize shape to fit text" property (TextAutoGrowHeight-->spAutofit/noAutofit) will be exported correctly to PPTX format. Change-Id: I5fa975c6390a17bad30c360b3b17aa944bbe72af Reviewed-on: https://gerrit.libreoffice.org/60043 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 86b14cc8bd910651cef422a0f7408adc0fc51a17)
2018-09-12tdf#119562 Fix export of AutoFit property of shapes to XLSXBalazs Varga1-1/+1
With this patch the "Resize shape to fit text" property (TextAutoGrowHeight) will be exported correctly to XLSX format. Change-Id: I488ceead452aef9096e7766f957de425c8486f85 Reviewed-on: https://gerrit.libreoffice.org/59778 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 7626dc2d81dc5eb647d6f8937cc1d220a8b8ef4b)
2018-09-12tdf#94502 Fix overlap export of Stacked Bar Chart to *.xlsxBalazs Varga1-1/+16
Export the Overlap value with 100% for stacked charts, because the default overlap value of the Bar/Column chart is 0% and LibreOffice do nothing with the overlap value in Stacked Chart case, unlike the MS Office. Change-Id: If4e20b88c2b1180f68a8d2b610c407d674a8498b Reviewed-on: https://gerrit.libreoffice.org/59448 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins (cherry picked from commit 17c2b0af97f73b9103be982b15d7111b3980e027)
2018-09-10tdf#108691, tdf#119639 Don't print hidden objects in XLS(X)Aron Budea1-0/+3
In Excel hidden drawing objects aren't printed. When not hidden, printing is controlled by a separate 'Print object' setting. Only rely visibility setting for now, but properly: visible means also printed, hidden means not printed. Ie. import visible property also as printable, and only output visible property in XLS(X) formats. For the future, in XLSX format printability is controlled by attribute 'fPrintsWithSheet' of element 'clientData', don't know about XLS, there fUsefPrint/fPrint bits don't appear to be used anymore (see note in tdf#119639). Reviewed-on: https://gerrit.libreoffice.org/59915 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit b38065ea941375bf4f78f13314e84f4a875545d9) Change-Id: I728107b30056f7bf073f2fefddece1bef1eb2e7a Reviewed-on: https://gerrit.libreoffice.org/60275 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-08-29tdf#96469 Export Data Point properties in Charts on DOCX/XLSXBalazs Varga1-0/+51
If the color or other property of a datapoint in the chart deviates from the dataseries property, this patch will write it into a separate dPt tag and fixing the lost properies during OOXML export. Reviewed-on: https://gerrit.libreoffice.org/58806 Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> Tested-by: Jenkins (cherry picked from commit 15035b98dc694bde4c4073fa75bdd2ce9d7e6670) Change-Id: I3d975675ac3691fcafe76de16e46851561eb2807 Reviewed-on: https://gerrit.libreoffice.org/58807 Tested-by: Jenkins Reviewed-by: Balazs Varga <balazs.varga991@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 6fa9aaaa5dca4d6b79698b55a2f2c956c99c3482)
2018-08-21tdf#119234 OOXML Shapes from Word fail to renderNoel Grandin1-1/+1
regression from commit 65e4a776e8315fd61fd67ad00d28985b11f0b79e simplify some OUString::copy calls I got the params switched around Change-Id: I68da0ae681f2b886e35f74bd72de0c482c843ae9 Reviewed-on: https://gerrit.libreoffice.org/58986 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit df71ea1b01c3fd35d959053c84f615f661b69f8a) Reviewed-on: https://gerrit.libreoffice.org/59000 (cherry picked from commit a05df1744a9da71f255b9b413df59f321d81bb33)
2018-08-20tdf#118385 Avoid crash on loading documentSzymon Kłos1-1/+1
Change-Id: Ifb18fee79667a5d0284407e84877b0d4d89536d9 Reviewed-on: https://gerrit.libreoffice.org/59173 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/59250 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-08-20tdf#116350 Better text layout for big shapesSzymon Kłos1-0/+8
Added some horizontal padding - for bigger shapes and vertical adjustment for multi-line labels. Change-Id: I665b238b0d08a499cd846952d831fe449f72f575 Reviewed-on: https://gerrit.libreoffice.org/58975 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/59161 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-08-10tdf#119160 remove fill from all fontwork shapesSzymon Kłos1-1/+1
Change-Id: I66cd5ab39c3f3b8635eb4e9b5261e100a8037abf Reviewed-on: https://gerrit.libreoffice.org/58817 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/58844 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-08-10forcepoint#59 the "matrix" is always one row in heightCaolán McNamara1-23/+17
so it can be a vector instead, and by using vector::at() instead of matrix::at() vector bounds checking is performed, unlike matrix::at() which does no checking Change-Id: Ic767c2dd884bffbf1cdff65c0980b21170612f4d Reviewed-on: https://gerrit.libreoffice.org/58399 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit ccfdc4b675233131fb99c998d2dc48affb0ac7af)
2018-08-10tdf#108078 OOXML Export Chart shapes area fill propertiesBalazs Varga2-17/+14
Verified with color, gradient, bitmap for: Chart Title in DOCX, XLSX and PPTX. Also verified with gradient, bitmap for Chart Legend, Plot Area, Dataseries and Background in DOCX, XLSX and PPTX. Change-Id: I15d29f3ca2d75f45f612766b635d50a29d8551ae Reviewed-on: https://gerrit.libreoffice.org/57880 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> (cherry picked from commit 051399740e41c6495ed362e78c63e0868bcd180c) Reviewed-on: https://gerrit.libreoffice.org/58349 Reviewed-by: Balazs Varga <balazs.varga991@gmail.com> (cherry picked from commit e3cad36dbcad73f41b921cd079317c20e770c249)
2018-08-10tdf#118150 Fix displaying of chart where Legend is set manuallyBartosz Kosiorek1-3/+5
By default Legend's position is automatic and it is located at the right side of the chart. Unfortunately even if layout with manualLayout is set: http://www.datypic.com/sc/ooxml/e-draw-chart_manualLayout-1.html the empty space for the automatic legend on the right side of the chart, was left. This is issue with opening of the OOXML charts by LibreOffice, as MS Word is opening the same document properly. This patch fixes issue with wrong chart displaying, when manual position of the legend is set. Change-Id: Id5363d48b049c469b6761b43cecfbb56514bf7d8 Reviewed-on: https://gerrit.libreoffice.org/57788 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins (cherry picked from commit bfbf276c9e1b7da55b613fade763fad56a1cd6fe)
2018-08-10related tdf#114845 oox: ensure rXShape.is()Justin Luth1-1/+1
Change-Id: Ic5a78d3f650bff82ce8d86a62ecfc025ca2062e0 Reviewed-on: https://gerrit.libreoffice.org/57276 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 10272122b2ace68add7d2b0191aa516558f8401f) Reviewed-on: https://gerrit.libreoffice.org/57442 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit c262dcbc1bc7d0293c971d01e323cc48e978872a)
2018-08-10tdf#114845 sd: only shift rotated group itemsJustin Luth1-5/+24
fixes 6.0 commit 9ae1e094d5a8a5b4432c88ebea0ca9fc1c79f602 > PPTX export: correct position of rotated groups However, there was nothing excluding the re-positioning to only group items. Change-Id: I62e36b46c0d2ac3e41f8d7d4ed82df11e6eb1ee5 Reviewed-on: https://gerrit.libreoffice.org/56386 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/56542 Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 3fdff39af3b793f68f9c72d940590948dbb840e2)
2018-08-10coverity#1438224 Dereference null return valueCaolán McNamara1-0/+1
Change-Id: I794c54867b83d738a075f9fa0dbd31fe62de49b9 Reviewed-on: https://gerrit.libreoffice.org/58610 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e5c3b913cc5b656710677e3597079e0cd5040f82)
2018-08-10tdf#116350 Fix export of fontworkSzymon Kłos1-1/+6
Change-Id: Icf3a07c6b79296feb233bbe08a6d69ab21a41414 Reviewed-on: https://gerrit.libreoffice.org/58746 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2018-08-10tdf#116350 Correctly display text on arcSzymon Kłos1-1/+10
Change-Id: Ice8c141db20d43ccc8d6e2b56004a4a28d2b257a Reviewed-on: https://gerrit.libreoffice.org/58729 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2018-08-10tdf#116350 Export preset text geometry (text effects)Szymon Kłos1-1/+6
Change-Id: Ifb921b56387ca183b5a57126f6e88e2f9a4ecb3d Reviewed-on: https://gerrit.libreoffice.org/58430 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2018-08-10tdf#116350 Import preset text geometry (text effects)Szymon Kłos12-5/+371
"Font effect" implementation, instead of normal text, content is converted to "fontwork". Change-Id: I5d02c7faedb66a4b919e64ae1b830bffb69984c1 Reviewed-on: https://gerrit.libreoffice.org/58358 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2018-08-10tdf#118651 OOXML ActiveX textbox: fix multiline supportBalazs Varga1-2/+7
of textfield component in DOCX/PPTX by handling properties AX_FLAGS_MULTILINE and AX_FLAGS_WORDWRAP during the import and export. Both of them need to be enabled to get multiline textfield in MSO, but LibreOffice has got only one multiline property. With this fix, LibreOffice imports only really multiline textfields as multiline, and it doesn't export multiline textfields as single line anymore. Change-Id: I9b567c3fcdc5d01a5838a3ec2517579f8d788954 Reviewed-on: https://gerrit.libreoffice.org/57552 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> Reviewed-on: https://gerrit.libreoffice.org/57619 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 076cb54472d5bba8916df9ee50074ac74433d694)
2018-08-02tdf#119029: also export rotation for data seriesMike Kaganski1-7/+21
Reviewed-on: https://gerrit.libreoffice.org/58401 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 8f90492812d1edac6c91e83b84f3512877dcd552) Change-Id: I6a9895145e0c54d35bf404f209721a0c718e4446 Reviewed-on: https://gerrit.libreoffice.org/58470 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-08-02tdf#115945 oox export: data label writeRunPropertiesJustin Luth1-0/+2
DataLabel font was always returning to the default - black. Change-Id: I6c72a8daa699394b36f69fc54e0ba042f0255c18 Reviewed-on: https://gerrit.libreoffice.org/56616 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit ae2fd281e046b2199ef44777b84518cd3abb2952) Reviewed-on: https://gerrit.libreoffice.org/58468 Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-07-20tdf#114821 import/export/place complex data labels in chartsSzymon Kłos4-4/+184
Change-Id: Ia44abcebb4febcabb1704aef85e396730ac2cd6f Reviewed-on: https://gerrit.libreoffice.org/57530 Tested-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2018-07-06tdf#104199 sd: export non-borders as noFillJustin Luth1-1/+4
...followup to commit 76505bbd862b17b9b02a2d6e68bac308890dec70 which made the border invisible by setting the color to COL_AUTO. But being invisible isn't good enough because on a round-trip we are now losing the "noFill" attribute and saving a defined border. However, COL_AUTO is turned into white during import, in both LO and in MSO, so round-tripping displayed a white border instead of an invisible one. Reviewed-on: https://gerrit.libreoffice.org/55658 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 4087130d0531a31456310bfe5c41a028dacd5a4d) Change-Id: If6cb513ca6e4336e49bc56a9509aede2e1937063 Reviewed-on: https://gerrit.libreoffice.org/56751 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit fb043986ca8d2d1b7b6179ef7e2412aa677d5c7d)
2018-07-06NFC oox export shape: move replicated code into functionJustin Luth1-48/+20
Reviewed-on: https://gerrit.libreoffice.org/56083 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 3ef18b28ade43a38bb46a2400e4e81a9ae8796bc) Reviewed-on: https://gerrit.libreoffice.org/56137 Change-Id: I1d306769bee8390626b513c63c5b889ba3d3d3d6 Reviewed-on: https://gerrit.libreoffice.org/56750 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit aadbe0e83c0ae0190e1bc36360893fce8f8a2b68)
2018-06-27tdf#104199 sd: nofill borders shouldn't be visible.Justin Luth1-2/+1
regression from export bugfix tdf#90190. rLineProperties.maLineFill was set, but that value was never used, leaving aBorderLine with the default value. Setting borderline to COL_AUTO lets it merge in with background colors while still taking up the space defined by the border width. The existing unit test says "it is likely you will break this if fixing background issues, so feel free to adjust the test values." Indeed, this patch removes an unwanted black border, so utilizing that test as a proof. Change-Id: I0725a3d5874a509a4464c586d60c77cde2b49fcb Reviewed-on: https://gerrit.libreoffice.org/55205 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 76505bbd862b17b9b02a2d6e68bac308890dec70) Reviewed-on: https://gerrit.libreoffice.org/55777 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 552b3fa548e19436af24f4b413e34b2f15100718) Reviewed-on: https://gerrit.libreoffice.org/55883 (cherry picked from commit 05021abd97316fe3d188cd9f15c44db2170927d7)
2018-04-12Add export of the side wall for 3D chart, during .xlsx exportBartosz Kosiorek1-6/+12
LibreOffice doens't distinguish between sideWall and backWall. It is controlled by the same Wall property. Change-Id: If1919cf0a9bad3e80544cc5b2ae0f40f606febeb Reviewed-on: https://gerrit.libreoffice.org/49429 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> (cherry picked from commit ff63bae0133e3b90b32af88a4307fb4f5dafd95f) Reviewed-on: https://gerrit.libreoffice.org/50679 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 49c0d98cb2bec7d171f9847b1335874c05042187)
2018-04-12tdf#114168 If minor axis unit is automatic, then set it to 5Bartosz Kosiorek2-4/+20
Based on OOXML implementation in MS Excel, if Minor axis Unit is set to automatic, then during chart import, LibreOffice should set Interval Count to 5, to mimic behaviour of MS Excel. Becaues default Interval Count for LibreOffice is 2, we need to override it to 5. With that solution, the Minor axis unit is preserved also after saving to .ods file format. During .xlsx export, if Interval Count is set to 5, then treat is as automatic axis unit. Change-Id: Iab9209fb3950ef73e79229329606363b528d35fe Reviewed-on: https://gerrit.libreoffice.org/49327 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> (cherry picked from commit 274825b4180c81540cd0d1b22c5243f1b39fe4db) Reviewed-on: https://gerrit.libreoffice.org/50676 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 40e722fd44e3cf026e1aee2b2c2c97eb57b53468)
2018-04-12tdf#114139 Don't export Plot Area shape property fot 3D chartsBartosz Kosiorek1-1/+5
For 2D charts Plot Area equivalent is Chart Wall. Unfortunately LibreOffice doesn't have Plot Area equivalent for 3D chart. It means that Plot Area couldn't be displayed and changed for 3D chars in LibreOffice. We cannot write Wall attributes into Plot Area for 3D charts, because Wall us used as background wall. Change-Id: I16d3b326571c1e411a094ec799e20c7aeeb2c1d4 Reviewed-on: https://gerrit.libreoffice.org/49428 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 5b9e76557d2b5c835a5873de1ce530f36ea98d2d) Reviewed-on: https://gerrit.libreoffice.org/50678 (cherry picked from commit dfd19459a336a6cd9a67a0d3dc3cf305de567be1)