summaryrefslogtreecommitdiff
path: root/xmloff
AgeCommit message (Collapse)AuthorFilesLines
2021-08-30tdf#143942: oox: import/export labels from <c15:datalabelsRange>Dennis Francis7-23/+92
When <c15:showDataLabelsRange> boolean flag is present, the imported label texts are added as the first text field in oox data label model. The cell-range associated is also preserved. The export part preserves the how labels were store originally in <c15:datalabelsRange>. However in order to make the custom labels reflect the contents of the cells in the associated cell-range, more work needs to be done. For this the labels present in <c15:datalabelsRange> needs to be made available as a data-sequence with a new "role" like "point-labels" in XInternalDataProvider implementation and and make the label renderer read this data source rather than consulting the custom label fields property which is static after import. Change-Id: Ibc7045fa5ea209d463680c96efb49a06662d2500
2021-07-11WaE: Wodr type 'ActionMapTypesOOo' violates the C++ ODRCaolán McNamara1-1/+1
Change-Id: If0b83e62e6c9905b1ae391fbed7c43b379dce5db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118506 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-06-14dtd files are not xml files and shouldn't have xml headersCaolán McNamara1-1/+0
so rpminspect is correct in complaining that they are not valid xml on inspecting files claiming to be xml Change-Id: I70379989326c2ea63e6a54b3658ebea4684fa5df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116892 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-06-10editengine-columns: ODF support [API CHANGE]Mike Kaganski4-0/+14
This uses existing ODF markup, as used by Writer's text frame: style::columns child element of style:graphic-properties, its fo:column-count and fo:column-gap attributes. No ODF extension is required. Since currently only columns with same width and spacing are implemented, without additional settings, style:column child elements are exported, but ignored on import. This adds new property to css::drawing::TextProperties service: TextColumns (of type css::text::XTextColumns). Change-Id: I7e63293e5814b281ceec8a9632e696322d3629e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116035 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116871 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-06-04tdf#142546 broken formulas in .FODT filesNoel Grandin1-0/+5
regression from commit 81fe31d2c8977791f9b90ab1da4fbb1a778f87fb Date: Tue Nov 3 18:25:10 2020 +0200 use fastparser in XMLEmbeddedObjectImportContext Change-Id: Ib5bae81001ae97c574c078c979484f016c7d4323 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116664 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 06a983b213b8fb71fdac1004868d7b4fdd6a9833) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116470 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-05-30tdf#137199: sw: convert list format string to prefix/suffix for ODFVasily Melenchuk1-1/+18
Since internally LO is able right now to use list level format strings and prefixes/suffixes only for backward compatibility, there is a need for conversion from format string (like "%1.") to prefix ("") and suffix (".") still used by ODT. Change-Id: If4b459e1b25b7f0ce511e6ac2de0824bb2c43d05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116288 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116316
2021-05-21tdf#138209 ODF export: work around forms problem in LO < 7.0Michael Stahl16-81/+156
LO without commit 519d96fd8b83ef4c61576d87b58f97b7e6e6e3c6 makes a mess when storing form documents it has loaded from ODF 1.3 documents: the XML parts are stored as ODF 1.2, but the storage (and therefore manifest entry) keeps version 1.3. To avoid this, store form documents as ODF 1.2 extended by default. Unfortunately a bunch of ODF export code accesses the global SvtSaveOptions variable; with this version override, only SvXMLExport::getSaneDefaultVersion() must be used. Change-Id: I5fa8e286f5103c578ed0d93da07a8a6cbe2f0ddd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115357 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 16de54a5c47fbc4691ee099c1f7bb559a8fe11ac) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115390 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-04-06Revert "tdf#141127 Use ODF default values for draw:extrusion-skew"Regina Henschel1-9/+0
This reverts commit 2bf8c1e0e211601a70b6b28fdb92f636c7969513. Reason for revert: tdf#141268 LibreOffice uses -135deg skew angle as internal default. If a user does not touch the direction, the value is not written to file, although that would be necessary because it is not ODF default. With the patch applied the missing value will be interpreted as 45deg on opening. So the first step is, to write -135deg to file. And then after some time, when wrong files are unlikely, the patch can be applied. A suggestion for writing -135deg is from Julien Nabet in https://gerrit.libreoffice.org/c/core/+/113257. From code it looks good to me, but I have not tested it yet. I would only add some comments to explain the situation. Change-Id: I71673ad2e5376c2a78fa74900e95117b8543e268 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113538 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> (cherry picked from commit f1b55d3f8e963069fc798bcf559ae9af2bf18b64) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113636 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-04-01tdf#91920 sw page gutter margin: add ODF filterMiklos Vajna3-0/+5
Note that the context filter is not set, since fo:margin affects left margin, but should not affect the gutter margin. Also put the new entry at the end, but before the header and footer sections, so the attribute is written to the correct XML element. Change-Id: I3588d4e76cd713efed168eb93b9456bba96727fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110375 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-03-23tdf#141127 Use ODF default values for draw:extrusion-skewRegina Henschel1-0/+9
The default value for extrusion skew angle is 45 in ODF and -135 in binary MS Office. LO had used -135 in case the draw:extrusion-skew attribute was missing on import. This could be fixed in GetSkew() in EnhancedCustomShape3d.cxx#92. But that would break import of ppt files. So I have decided not to search, were the binary import would need to be tweaked, but I set the default values directly in file open in case the attribute is missing. Change-Id: Ieeffa64099fdbdbe0ba9d4dab7ed2f19d397a6e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112819 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> (cherry picked from commit 2bf8c1e0e211601a70b6b28fdb92f636c7969513) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112809 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-03-04xmlsecurity: replace XSecParser implementationMichael Stahl3-10/+36
Implement Namespaces in XML and follow xmldsig-core and XAdES schemas. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110833 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 12b15be8f4f930a04d8056b9219ac969b42a9784) xmlsecurity: move XSecParser state into contexts Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111158 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 59df9e70ce1a7ec797b836bda7f9642912febc53) xmlsecurity: move XSecParser Reference state into contexts Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111159 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit cfeb89a758b5f0ec406f0d72444e52ed2f47b85e) Change-Id: I03537b51bb757ecbfa63a826b38de543c70ba032 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111898 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-04restore namespace unwinding in SvXMLImportNoel2-3/+11
accidentally lost during the fastparser conversion Change-Id: I7d53e9f32dd8cff650b9ffb6dae493419ce8461f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110813 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit e5f436bc53e0d07654901ef7cc8ff56d04f0686e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111897
2021-02-23tdf#140437 ODF import: fix for broken documents with field code as typeMichael Stahl2-1/+11
Not sure how old the bug that caused this and which filter it was originally but currently the Word import filters don't do that any more. This causes an exception since commit dd24e21bb4f183048a738314934fc3f02ec093f1 so try to fix it up. Change-Id: I087586054ebd5698ed8e8a4054869df202226e92 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111345 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit d62c93a831080ef332e416dc78f5600c2c5b9850) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111318 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-02-19tdf#140486 forms "empty string is null" setting not loadedNoel Grandin1-2/+2
regression from commit 3de38e95561ab7ca114d9f3307702ba89c4e3e9a Date: Tue Nov 10 19:20:06 2020 +0200 use fastparser in forms Change-Id: I1e679bdca17185f20c1f755da16f02aa5661e22f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111123 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 67db5b7c8df4aa0fab08ac2d11b732dbc28c4c62) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111174
2021-02-12tdf#136011 convert numbers in categories to string during chart exportOuyang Leyan1-1/+5
When converting a Calc chart to a chart with an internal data source, multi-level categories consisting only in numbers are exported as double and not string. However, labels could only be generated from string values so the labels were lost in the converted chart. This commit allows labels to be generated from double values. Change-Id: I1cc1059f5157b782beb3eefccda5257b1bc2ca29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107858 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 4a9d257bec7964c0b611b2d422b7842fc5ee38e0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110775 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-01-16tdf#136861 ODT export: fix writing resolved state for non-ranged commentsMiklos Vajna3-12/+60
It was probably not intentional to write the resolved state only in case the annotation has a name. (cherry picked from commit f3b5356bdc51b03f9910ed544b8c17d6f919bc12) Change-Id: Ia3a6b2320e2288528c43c832211ebfcde492881e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109379 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-01-12xmloff: "form:datasource" vs. "db:data-source"Michael Stahl2-1/+3
Recently xmloff started to use XML_DATASOURCE for "form:datasource" but it actually means "data-source". Add XML_DATA_SOURCE and use it for "db:data-source". (regression from 3de38e95561ab7ca114d9f3307702ba89c4e3e9a) Change-Id: I893efd3fb0fb7c19ae998442459bf36cb1da0b20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109019 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit db283d2e3f5cd8be412c5204f358cd06af761b13) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109000 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Michael Stahl <michael.stahl@allotropia.de>
2020-11-27tdf#138507 error in loading formNoel Grandin1-1/+1
regression from commit 3de38e95561ab7ca114d9f3307702ba89c4e3e9a Author: Noel Grandin <noelgrandin@gmail.com> Date: Tue Nov 10 19:20:06 2020 +0200 use fastparser in forms Change-Id: I995677d4e381e8229e7f052cf54a134bdf49d378 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106708 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 3faf503b1a389affcff1bcbd63630963f634e486) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106734 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-26save properly fadecolor also for fadeovercolor (tdf#138353)Luboš Luňák1-1/+3
As far as I can tell .odp spec doesn't recognize 'fadeovercolor' as a subtype of 'fade' (it's an LO extension?). But it's already saved by LO if used, so save the color properly as well. Reading it already works too. Change-Id: I30e464123f17d513fd0eaa32797f06e76a91d532 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106505 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 21d36af1fd3037f1f425dd8303b50b8848d729ce) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106528
2020-11-23tdf#134059 Always include hidden cells in chart series labelOuyang Leyan1-0/+8
Change-Id: I92ff60b26af713a49fefd8b2ce8042f4e8e4d179 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106317 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit fd5f3b212a38ec6ef35d2686ce5a7cc39cb7d377) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106240 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-22fastparser in XMLStringBufferImportContextNoel Grandin3-26/+4
Change-Id: I1474bcd98c87ab4a3bfe3cc0e9b8e434e7ce4144 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106280 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-21remove some prefix and local params from constructorsNoel Grandin11-173/+93
Change-Id: Iaffbefe98ced97610b99a00b1b3011c6a79a7859 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106300 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-21fastparser in XMLChangeInfoContextNoel Grandin2-23/+21
Change-Id: I8e3e2bfc94f59b19b99299a7696b435f8d39b290 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106279 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-21fastparser in XMLAutoTextContainerEventImportNoel Grandin2-10/+10
Change-Id: I1f4003166185fca67bc6ce8abe967e7c99d2237a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106278 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-21fastparser in XMLEventsImportContextNoel Grandin10-118/+21
Change-Id: Ifeeb2220ec6dfe6ec91f238137796d7d9e517465 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106261 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-20fastparser in XMLEnhancedCustomShapeContextNoel Grandin4-46/+45
Change-Id: Id5f6466fd62e15b354b2dc11a0dc610cbfb75c27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106250 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-20fastparser in SdXMLLayerContextNoel Grandin1-6/+12
Change-Id: I1912d8d5a5f3ea6865d7425be8edb4f24b27e61f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106229 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-20fastparser in SdXMLLayerContextNoel Grandin3-40/+23
Change-Id: I807c9028fa197079da79270f8d7ad9339d7bedf4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106228 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-20fastparser in SdXMLEventsContextNoel Grandin2-51/+40
Change-Id: I7c9a43c0323c1f278f329c51f14d9c273d334741 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106227 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-20fastparser in SdXMLEventContextNoel Grandin1-26/+23
Change-Id: I52eb0ef77c54386a9774f746caba4b05785937aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106214 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-20simplify CreateTableContextNoel2-6/+6
Change-Id: I1700d17d6f3aa29fcc4a1ea33d8d797e67c301d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106168 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in SchXMLSeries2ContextNoel Grandin8-42/+27
Change-Id: I609333f732cb8c428f1c9e3fca24e2df3146de12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106075 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in XMLChangedRegionImportContextNoel4-25/+13
Change-Id: Id5da48e4c47acbc0052799e8be6b88edd6dce099 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106167 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in dropdownfieldNoel2-44/+31
Change-Id: I4b09f78b0f4d2ad40a7aec8e2d5d722b7a1ee18b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106166 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in formsNoel2-25/+25
Change-Id: Ia5274bf6c200a5077bc9b7fdf16b7723337d353d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106165 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in TokenContextNoel16-171/+65
Change-Id: I3e3bdc30f0313288201a77741e55aa89fea2be6b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106164 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in TokenContextNoel17-227/+76
Change-Id: I12c2af505d4bf19d94fb127cda2403f0b6618b07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106159 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19tdf#123936 Formatting files in module xmloff with clang-formatPhilipp Hofer22-167/+139
Change-Id: I4d9016a0e646da5d9f0044762f6ecce86ce1242b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105732 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-11-19fastparser in DomBuilderContextNoel2-20/+22
Change-Id: I126db3987f491c1753ec6c169e42503137e4fa86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106152 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in SchXMLTextListContextNoel Grandin2-21/+25
Change-Id: I27c4bcdc9c2e6131b651332301e01ead3393025d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106077 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in SchXMLTableContextNoel Grandin4-105/+80
Change-Id: I6cccd109218a9f3adea311df86408ee1d1fe332f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106076 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in DomBuilderContextNoel4-40/+28
Change-Id: I77a41dbb16b34601e559a56d58af14404ac8cbbf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106126 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in SchXMLRegressionCurveObjectContextNoel Grandin2-21/+14
Change-Id: If630576d7583031a56960d2ddc87c2d0e37aa8ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106074 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19Fix SAL_WARN_IF in elementimport (xmloff)Julien Nabet1-2/+2
Wrong from: 2012-05-17 5e0b52c1893ffe04a68333026afa7a557c48d534 - (0 == _rPropValue.Name.compareToAscii(PROPERTY_EFFECTIVE_VALUE)) - || (0 == _rPropValue.Name.compareToAscii(PROPERTY_EFFECTIVE_DEFAULT)), + (0 == _rPropValue.Name.equalsAsciiL(PROPERTY_EFFECTIVE_VALUE.ascii, PROPERTY_EFFECTIVE_VALUE.length)) + || (0 == _rPropValue.Name.equalsAsciiL(PROPERTY_EFFECTIVE_DEFAULT.ascii, PROPERTY_EFFECTIVE_DEFAULT.length)), since '"compareToAscii" returned 0 if both strings are equal' whereas "equalsAsciiL" returned sal_Bool (so sal_True if both strings equal) there have been different changes during some years. But c2d808a5ddf89ce40939d166e67dd0271852104f (2019-02-01) did also wrongly this: - OSL_ENSURE( - _rPropValue.Name != PROPERTY_EFFECTIVE_VALUE - && _rPropValue.Name != PROPERTY_EFFECTIVE_DEFAULT, - "OControlImport::implTranslateValueProperty: invalid property type/name combination!"); + SAL_WARN_IF( + _rPropValue.Name == PROPERTY_EFFECTIVE_VALUE + || _rPropValue.Name == PROPERTY_EFFECTIVE_DEFAULT, "xmloff", + "OControlImport::implTranslateValueProperty: invalid property type/name combination, Any and " + _rPropValue.Name); Indeed the comment (which has never changed since 2001) above indicates: "we have exactly 2 properties where this type class is allowed" In brief, we want to warn if "_rPropValue.Name" different from "PROPERTY_EFFECTIVE_VALUE" and "PROPERTY_EFFECTIVE_DEFAULT" Change-Id: I576b2af2eaf96c53ae7950b352239ce1510ff03c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106080 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
2020-11-19fastparser in SchXMLDataPointContextNoel Grandin3-55/+47
Change-Id: I086f3b8abc9abae88ef2a6afcd032eb088f20008 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106073 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19Avoid wrong warning in OElementImport::implApplyGenericProperties (xmloff)Julien Nabet1-5/+10
When empty sequence, there's nothing to convert so no need to spend time here and to indicate the following warning: Avoid warn:legacy.osl:93722:93722:xmloff/source/forms/elementimport.cxx:364: OElementImport::implApplyGenericProperties: conversion to sequences other than 'sequence< short >' not implemented, yet! + avoid these in the same time: warn:xmloff.forms:88800:88800:xmloff/source/forms/elementimport.cxx:428: DBG_UNHANDLED_EXCEPTION in implApplyGenericProperties exception: com.sun.star.lang.IllegalArgumentException message: /home/julien/lo/libreoffice/include/cppuhelper/proptypehlp.hxx:35 ArgumentPosition: 0 In addition, convert 2 OSL_ENSURE of this block in SAL_WARN_IF Change-Id: I047eb5afba6fd22249010791aa61ebd1f83f3c67 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106082 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in SchXMLParagraphContextNoel Grandin2-17/+14
Change-Id: I612e888d364e31457aea8e66accdf1a2230ed870 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106071 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in SchXMLPlotAreaContextNoel Grandin8-75/+77
Change-Id: I77eab3ebacaca4c3327f60fac0970330fc9fe10b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106072 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-19fastparser in SchXMLLegendContextNoel Grandin2-70/+24
Change-Id: I9fe41436f4a5dd15867e172d4a43775ca49d29df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106070 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-18Remove unused XMLTableImportContext::ImportColumn nPrefix, rLocalName paramsStephan Bergmann1-3/+3
unused since f3797630be6ab21179e2496cc56a6d41f0ee8144 "return nullptr from CreateChildContext methods in subclasses" Change-Id: I5c4c820500b98444c9f24641d6e45ea9b830ec3b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106052 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins