summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2020-04-23tdf#131936 Correctly detect OOXML variant on importSamuel Mehrbrodt2-2/+34
Change-Id: I29a6b0454bf741ce8ad49078597b3412a83dedb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92278 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-04-23tdf#130058 Import shadow size.Gülşah Köse5-1/+25
Change-Id: Ie1cee377a33567088fb76ea47f0e6fc51d47f0fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92188 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-04-22use more make_shared in ooxNoel Grandin4-8/+14
Change-Id: I54c085a0720a381cf8bc27b2a4b4d2a3b2900918 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92620 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-22uiobject.hxx only needs forward declaresCaolán McNamara3-37/+43
and update pches accordingly Change-Id: I411712532fd85961bffe6678416fcdc1d9c7f53d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92617 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-21tdf#131775 DOCX DrawingML shape import: fix missing spacingTibor Nagy1-1/+7
Character spacing of grouped shapes wasn't imported. Co-Author: Balazs Regenyi, Szabolcs Toth Change-Id: I9c4f204a5ab7c7e55e26968a71b315d84e5d8515 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91490 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-04-20tdf#119187 fix: Top-aligned text in PPTX becomes bottom-alignedSerge Krot1-44/+81
Change-Id: Ic6c03e512ce3f6e240d86186fb16e24c86942343 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92051 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-20tdf#78749 DOCX: import VML background imageAttila Bakos1-2/+7
of text boxes. DOCX relationship identifier wasn't handled earlier, only XLSX. Co-developer: Tibor Nagy Change-Id: I72f246e6f69d70d1e203087516ee93a57563f777 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91933 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-04-17tdf#131922 DOCX DrawingML shape import: fix lang-idRegényi Balázs1-0/+3
The language identifier of text of grouped shapes wasn't imported. Co-Author: Szabolcs Tóth Change-Id: Ic71ea1bdf3aed27ad813cfa33659921060c0ec0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91801 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-04-15loplugin:buriedassign in l,o,p*Noel Grandin1-1/+3
Change-Id: Ib2dd157d43c4387eda009475311761fe2eb627cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92241 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-09tdf#131776 DOCX grouped shape import: fix regression for strikeoutsRegényi Balázs1-2/+4
Because of previous commit we applied strikeout on shape text if its attribute "val" was false. Regression from commit 143e6641cea7a06faeec8b3b65aa09b153a6490f (tdf#131776 DOCX DrawingML shape import: fix missing strikeout). Co-Author: Szabolcs Toth Change-Id: Iff2331cc183be59aee66a7f6f0ad65af89b13093 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91796 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-04-07loplugin:unusedvariableplus in ooxNoel Grandin2-2/+1
Change-Id: I742c0c9416a5cfaa1b2d471d25fbf6c7439f7ec8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91779 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-03crashtesting: mismatched start/end tag assert on reexport of tdf113187-1.pptxCaolán McNamara1-2/+0
since... commit 86be3422cd55fa9e44104f1628648061bb6a3495 Date: Wed Dec 18 16:46:36 2019 +0100 tdf#129857 Chart OOXML export: fix deleted legend entries The legend showed deleted legend entries too after export. the bare return leaves a start inserted, but no end Change-Id: If474b53ed7ff18334d095da0a8996a93a8e62e09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91656 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-03tdf#131776 DOCX DrawingML shape import: fix missing strikeoutRegényi Balázs1-0/+6
The absence of simple and double strikeouts is fixed. Co-Author: Szabolcs Toth Co-Author: Tibor Nagy Change-Id: I5d7eef660f87c67855bce9847ad8e07d074183e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91555 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-04-03loplugin:flatten in ooxNoel Grandin39-2063/+2104
Change-Id: Ia57944653fa10e864822518372acab83555e0f20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91618 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-02tdf#123351 DOCX DrawingML shape import: fix missing underlineSzabolcs1-0/+40
in shape texts. Handling of 18 underline types in DrawingML shape objects, i.e. in grouped shapes did not exist. Note: Underline type "words" imported as "single" temporarily. Also testing of dashLong is missing, because it is exported as dashLongHeavy in DOCX. Co-Authors: Balázs Regényi, Tibor Nagy Change-Id: I620d919da6b85eaed211e5cbdd5c1a55e60436d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91461 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-04-01Fix typoAndrea Gelmini1-1/+1
Change-Id: I805ca9fd60b2ad11005bf0eea30f360cffb6166a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91527 Tested-by: Jenkins Reviewed-by: Andrea Gelmini <andrea.gelmini@gelma.net>
2020-04-01tdf#131554 placeholder iteration fails to stop when a match is foundnd1011-1/+3
Wrong placeholder is returned due to iteration not stopping when a match is found. It causes a text element position to be incorrectly set. Change-Id: I58be6825cec7a61f48b46418bdf28964c1afe4ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91023 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-04-01Remove unused includeMiklos Vajna1-1/+0
Change-Id: Ifa3b50b6b31b4a8e8babf7695339848f6730bf11 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91458 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-31tdf#100751 DOCX VML shape import: fix arrow directionSzabolcs Toth1-13/+6
Flips along both the y- and x-axis weren't imported, resulting wrong direction of arrow and other shapes. Co-Author: Balázs Regényi Change-Id: Iac222ac2a6a6110289969c32b40828b83da0aefd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90646 Tested-by: Jenkins Reviewed-by: Balazs Varga <balazs.varga991@gmail.com>
2020-03-30tdf#131370 chart: implement OOXML import/export of legend overlay featureTünde Tóth7-9/+15
Follow-up of the following commits related to the new UNO property Overlay for legends: commit 9fab1ba8ddc59924c633aa17c65f7330a4762726 (tdf#75330 add a new overlay/no-overlay feature for the legend) commit 65123d41f62597053bc3893ee4fb46868a6b1f2d (tdf#75330 chart: implement ODF import/export of legend overlay feature) Change-Id: Ie3eff9b8a4f99980a7ae28add909a27eb0e9d14b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90655 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-03-25tdf#131553 a null pointer crashes Impressnd1011-5/+8
When constructing a shape object from property EmbeddedObject, it may return null object. Check the returned value first. Change-Id: I9d7a2d9c0c919007ae2a34a0af86dea5639b1bd6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91024 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-03-25Remove unused using declarations in oox...xmlsecurityGabor Kelemen3-7/+0
Found by: run-clang-tidy-10 -checks=-*,misc-unused-using-decls Change-Id: I3e95791e223ef01e140a6217e29a9efae428a784 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90876 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-23Fix spelling of variableJohnny_M1-6/+6
Formular -> Formula (Found when working on variable translation in c212e295c589695c9da0c21914fb30b6af5909d6.) Change-Id: I9409598670eabdd6ebb1ea1cb0ccc4d9d6292f8e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90464 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-03-20tdf#42949 Fix IWYU warnings in oox/source/[e-v]*/*cxxGabor Kelemen59-232/+97
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I6cd335e3055ca1dcebcaf0b26ec843b1937f0bce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90773 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-20tdf#131398 OOXML chart import: fix number format of pie chart labelsBalazs Varga1-7/+0
Remove percentage format detection heuristics, which converted the plain number format with percentage style to percentage format based on the formatted string, resulting bad pie chart labels. Change-Id: I642394d04fd6e6a5439bd53207e08e75de5b3029 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90570 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-03-20tdf#131082 fix missing fill property of grouped shapesnd1013-0/+44
When shapes are grouped together, and fill property is specified at the group level in MSO, it fails to work in IMPRESS. This fix is to set the fill property when it is being imported. Change-Id: I89920e71fc558f54d49ef7b065c549a732bc2b10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89862 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-03-17Missing include (Windows --disable-pch; for std::max)Stephan Bergmann1-0/+4
Change-Id: Ib7ea5f07d1aecb67fdaf2ee5badbca748c961490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90607 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-03-17tdf#131118 VML import: fix size of non-autosize shapes containing textMiklos Vajna3-3/+21
Regression from commit b92293b3943423324064a8513c2e114d18817179 (tdf#103983 VML import: handle <v:textbox style="mso-fit-shape-to-text:t">, 2020-01-20), the problem was that in case we disable autosize too late, then the size will be already set during adding text to the shape. Do it before adding text, this way adding text won't change the shape size, so it'll be correct at the end of the import. Change-Id: I9410fc695c3edfa5089d845864bf237e71c533c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90592 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-16tdf#42949 Fix IWYU warnings in oox/source/[cd]*/*cxxGabor Kelemen64-190/+77
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ie3c59da7b9e0ad06fcd7f247e47bcc17ea35b17a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90503 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-14tdf#130975 replace `rtl::math::isNan` with `std::isnan`.Yukio Siraichi1-1/+1
Change-Id: I5d53e6369d35093445b2efd8936bbf8c6775ff47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90451 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-03-12Revert "loplugin:constfields in oox"Noel Grandin28-62/+67
This reverts commit a84e3df74eecc8778e3d5be5dd80ad4ddb511edf. Now that we know that making fields has negative side effects like disabling assignment operator generation. Change-Id: I7b45b7ead281cf3a9202ca6aabc55ee5033e5331 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90332 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-03-09tdf#42949 Fix IWYU warnings in oox/*/*hxxGabor Kelemen51-66/+33
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I3d34eb4933ad574321c0de6a650fc89dd0aa353f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90144 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-09tdf#131143 OOXML chart: fix missing data points of scatter chartBalazs Varga1-4/+6
If "values-x" property is empty, export X-Y (scatter) chart category labels in c:xVal/c:strRef/c:strCache/c:pt/c:v to avoid missing data points at next import. Change-Id: Ib5ed99bd1186bd1cfa3e2559aff1c8d214547017 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90011 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-03-06tdf#130911: convert some token generation scripts from Perl to Python.Jussi Pakkanen5-159/+137
Change-Id: Id655b6a0cee7bdfe4804941f20fe358af8f3185e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89477 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-03-05tdf#75330 add a new overlay/no-overlay feature for the legendTünde Tóth1-3/+2
Implement "Show the legend without overlapping the chart" option for chart legend. Change-Id: Ifbba4c81136e13995d276434dc17a97b0675428c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89810 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-03-03tdf#101181 Implement glow effect on shapesTamas Bunth6-21/+88
Glow effect is a color-blurred outline outside of the shape. In ooxml document it is specified with the <a:glow> element. The commit contains the following: - Add support for importing and exporting <a:glow> from ooxml documents. - Assign new properties to XShape which stores glow-related attributes. - A new 2D primitive is introduced in module 'drawinglayer' which is responsible for representing the glow primitive which is to be rendered. + A glow primitive is a clone of the original shape which has been scaled up slightly and a new color has been assigned to it. The radius of the glow effect and the color is defined in the <a:glow> element being imported. - A blur algorithm is introduced in module 'vcl', which is called during rendering the primitive. + The blur algorithm works on a bitmap. + Since the algorithm is CPU-intensive, the result is cached in the processor and it is recalculated only if needed. - Add support for importing and exporting glow effect to ODF format. For that, new attributes of element <style:graphic-properties> has been added: + loext:glow, which can have the values "visible" or "hidden" + loext:glow-radius: which holds the radius of the glow effect in cm. + loext:glow-color: holds the color of the glow effect - Tests have been added to assert properties after pptx import and export. Change-Id: I836aeb5e0f24e2c8d5725834c8c0f98083bc82e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89125 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com>
2020-03-03tdf#84399 VML import: map <v:shape o:spt="202"> to TextShapeMiklos Vajna5-1/+48
This partially reverts commit 81f9fe3a14f0fc99afbfa7ce3a26a9c7855d0919 (fdo#74401 VML groupshape import: only handle v:rect as TextShape, 2014-03-19), which wanted to map triangles to custom shapes. It was overlooked that we can have not only explicit rectangles and custom shapes, but also <v:shape> elements which have their shape type explicitly set to TextBox. The later is now again handled similar to rectangles. This keeps the triangle case working, but fixes the <v:shape o:spt="202"> case. We need to make this decision while parsing the XML, so some rework is needed to have earlier access to its container (group shape or draw page) and also to its shape type. Change-Id: I33a4b3cd03b0df5d93cffa19e7ea834113df2bdc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89852 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-02tdf#130986 Chart OOXML export: fix number format of custom labelBalazs Varga1-0/+3
Export correct sourceLinked attribute in c:dLbls/c:dLbl/c:numFmt, as in c:dLbls/c:numFmt. Change-Id: I0e52720b3cb2c99550a779763f01ba12f762050d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89638 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-25loplugin:referencecastingNoel Grandin2-4/+6
getting --enable-pch=normal working with clang means that the plugins now have a better view on some stuff, so trigger more warnings Change-Id: I83ca010c0ef07c8106068362bb50a354e3cf7dae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89312 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-24workaround GCC 9.2.1 -Og -Werror=maybe-uninitializedMichael Stahl1-1/+2
vcl/unx/generic/gdi/salbmp.cxx:727:32: error: ‘pixmapHandle’ may be used uninitialized in this function [-Werror=maybe-uninitialized] vcl/unx/gtk3/gtk3gtkinst.cxx:7336:16: error: ‘eRet’ may be used uninitialized in this function [-Werror=maybe-uninitialized] etc. One looks like it might occur in practice. Change-Id: I09af7d36b134b31cb7bd8047b5c73f4a49c9d9b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89351 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-24tdf130839: Corrects second level left margin in SmartartGülşah Köse1-3/+9
Change-Id: Ifec339759427336fd53012e0a8a906d240be9654 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89085 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-02-21Drop o3tl::optional wrapperStephan Bergmann9-30/+30
...now that macOS builds are guaranteed to have std::optional since 358146bbbd1b9775c12770fb5e497b6ec5adfc51 "Bump macOS build baseline to Xcode 11.3 and macOS 10.14.4". The change is done mostly mechanically with > for i in $(git grep -Fl optional); do > sed -i -e 's:<o3tl/optional\.hxx>\|\"o3tl/optional\.hxx\":<optional>:' \ > -e 's/\<o3tl::optional\>/std::optional/g' \ > -e 's/\<o3tl::make_optional\>/std::make_optional/g' "$i" > done > for i in $(git grep -Flw o3tl::nullopt); do > sed -i -e 's/\<o3tl::nullopt\>/std::nullopt/g' "$i" > done (though that causes some of the resulting #include <optional> to appear at different places relative to other includes than if they had been added manually), plus a few manual modifications: * adapt bin/find-unneeded-includes * adapt desktop/IwyuFilter_desktop.yaml * remove include/o3tl/optional.hxx * quote resulting "<"/">" as "&lt;"/"&gt;" in officecfg/registry/cppheader.xsl * and then solenv/clang-format/reformat-formatted-files Change-Id: I68833d9f7945e57aa2bc703349cbc5a56b342273 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89165 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-21tdf#130657 OOXML chart import: fix charts without CrossBetweenBalazs Varga1-1/+3
by using default values for ShiftedCategoryPosition. Regression from commit 111c260ab2883b7906f1a66e222dbf4dc3c58c4f (tdf#127777 OOXML chart export: fix "CrossBetween" for not imported charts) Change-Id: Idd48a8343e7d6609b487daf7182e9716f2f5e01f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88709 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-20tdf#126076 XLSX export: fix automatic line chart markersTünde Tóth1-1/+1
The default automatic line chart markers in XLSX spreadsheets created with Microsoft Excel 2010 became squares after export. Change-Id: I58a3e10212608a356eef8fbd1e100eda4dbebaca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88461 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-20tdf#90749 chart: add leader lines to custom data label positionsBalazs Varga8-0/+19
also export them as CustomXML extension for MSO interoperability. Note: pie chart is not yet supported. See commit 4223ff2be69f03e571464b0b09ad0d278918631b ( tdf#48436 Chart: add CustomLabelPosition UNO API property) Change-Id: Ia8142408414d4ad8f689d789386db50038ed13f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88531 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-20Remove some unused includesMiklos Vajna4-7/+0
Change-Id: I28b007cff3a99bc40901ecdeaecacf42b4521574 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89058 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-20tdf#130776 Show the bullet on second level in smartart.Gülşah Köse1-0/+3
Change-Id: Ie35867862d30d490a97dc6f245b50c7311dafe50 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88993 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-02-19Related tdf#130681: convert number format if model not deletedJulien Nabet1-2/+1
Opening docx from https://bugs.documentfoundation.org/attachment.cgi?id=157891 I noticed this log: warn:legacy.osl:151346:151346:oox/source/drawingml/chart/objectformatter.cxx:1113: ObjectFormatter::convertNumberFormat - cannot create number format '' bt: 0 0x00007fffdb9129f1 in oox::drawingml::chart::ObjectFormatter::convertNumberFormat(oox::PropertySet&, oox::drawingml::chart::NumberFormat const&, bool, bool) (this=0x55555cb5ef10, rPropSet=..., rNumberFormat=..., bAxis=true, bShowPercent=false) at /home/julien/lo/libreoffice/oox/source/drawingml/chart/objectformatter.cxx:1098 1 0x00007fffdb8ede01 in oox::drawingml::chart::AxisConverter::convertFromModel(com::sun::star::uno::Reference<com::sun::star::chart2::XCoordinateSystem> const&, oox::RefVector<oox::drawingml::chart::TypeGroupConverter>&, oox::drawingml::chart::AxisModel const*, int, int) (this=0x7ffffffedb70, rxCoordSystem= uno::Reference to (chart::PolarCoordinateSystem2d *) 0x55555cb5b590, rTypeGroups=..., pCrossingAxis=0x55555d413560, nAxesSetIdx=0, nAxisIdx=1) at /home/julien/lo/libreoffice/oox/source/drawingml/chart/axisconverter.cxx:344 2 0x00007fffdb92b96e in oox::drawingml::chart::(anonymous namespace)::AxesSetConverter::convertFromModel(com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram> const&, oox::drawingml::chart::View3DModel&, sal_Int32, bool) (this=0x7ffffffedd90, rxDiagram=uno::Reference to (chart::Diagram *) 0x55555d905d38, rView3DModel=..., nAxesSetIdx=0, bSupportsVaryColorsByPoint=true) at /home/julien/lo/libreoffice/oox/source/drawingml/chart/plotareaconverter.cxx:167 3 0x00007fffdb92d32d in oox::drawingml::chart::PlotAreaConverter::convertFromModel(oox::drawingml::chart::View3DModel&) (this=0x7ffffffedfb0, rView3DModel=...) at /home/julien/lo/libreoffice/oox/source/drawingml/chart/plotareaconverter.cxx:425 4 0x00007fffdb8fb4b8 in oox::drawingml::chart::ChartSpaceConverter::convertFromModel(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&, com::sun::star::awt::Point const&) (this=0x7ffffffee090, rxExternalPage=empty uno::Reference, rChartPos=...) at /home/julien/lo/libreoffice/oox/source/drawingml/chart/chartspaceconverter.cxx:163 5 0x00007fffdb8f3af4 in oox::drawingml::chart::ChartConverter::convertFromModel(oox::core::XmlFilterBase&, oox::drawingml::chart::ChartSpaceModel&, com::sun::star::uno::Reference<com::sun::star::chart2::XChartDocument> const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&, com::sun::star::awt::Point const&, com::sun::star::awt::Size const&) (this=0x55555dc08800, rFilter= ..., rChartModel=..., rxChartDoc=uno::Reference to (chart::ChartModel *) 0x55555d4cc190, rxExternalPage=empty uno::Reference, rChartPos=..., rChartSize=...) at /home/julien/lo/libreoffice/oox/source/drawingml/chart/chartconverter.cxx:101 6 0x00007fffdba48a22 in oox::drawingml::Shape::finalizeXShape(oox::core::XmlFilterBase&, com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&) (this=0x55555dbdc450, rFilter=..., rxShapes= uno::Reference to (SwXDrawPage *) 0x55555dbbbfe0) at /home/julien/lo/libreoffice/oox/source/drawingml/shape.cxx:1717 Change-Id: I9196532025eb0b3ff2b73cac2c5bac3726fe0761 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88761 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-02-17tdf#130590 Chart OOXML export: fix custom label positionBalazs Varga1-0/+19
in case of all chart types except pie chart. Follow-up of commit 4223ff2be69f03e571464b0b09ad0d278918631b (tdf#48436 Chart: add CustomLabelPosition UNO API property) Change-Id: I3ff1ca13928315f27988ae27c462a2f05354bc49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88371 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-13tdf#119138 Show custom chart title if autoTitleDeleted is missingGabor Kelemen1-1/+4
autoTitleDeleted might be omitted by generators other than Excel while providing custom title. mbAutoTitleDel is set only based on the attribute value and the default also varies on whether MSO 2007 or newer is the generator, see tdf#78080 ECMA-376 Part 1 at 21.2.2.7 says: A value of 1 or true specifies that the property is applied. This is the default value for this attribute, and is implied when the parent element is present, but this attribute is omitted. Change-Id: If3457fe850e13ae8af207bb9beceecc9e887b797 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88151 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>