summaryrefslogtreecommitdiff
path: root/xmloff
AgeCommit message (Collapse)AuthorFilesLines
2021-04-16xmlsecurity: replace XSecParser implementationMichael Stahl3-11/+38
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) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111907 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ad5930e87e788780a255523f106deb1dde5d7b37) Change-Id: I03537b51bb757ecbfa63a826b38de543c70ba032
2021-04-09tdf#135144 xmloff textbox: fix export style name to be consitent with importMiklos Vajna5-12/+127
Regression from commit 28d67b792724a23015dec32fb0278b729f676736 (tdf#107776 sw ODF shape import: make is-textbox check more strict, 2019-08-26), the problem was that in case the import side in SdXMLCustomShapeContext expects a fixed "Frame" parent style name, then the export side should go with that name as well. Fix the problem by simplifying XMLShapeExport::collectShapeAutoStyles(), which initially assumed that the string may be localized, so try to look it up: instead just use the fixed string that the import side will look for. This solves all problem which may stem from a parent style name which is non-empty, but other than Frame. (cherry picked from commit 347d05edd8910907ae185c61c1e56eee139b3c09) Change-Id: I8146440c591d3dd5a904d243d85741d704711e9c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100595 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113787 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2021-03-16Clean up duplicated command dispatch test functionalityMiklos Vajna1-18/+1
Used in both Writer and Calc at few different places, so host it in unotest/. Change-Id: I013e6df471deb8693cf4ae62f0958b12e16fda7b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86972 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112395 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
2021-02-09tdf#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. (cherry picked from commit 11e91719ef362e38b3b92e525763a5a89f4eeecb) Conflicts: schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng Change-Id: I3588d4e76cd713efed168eb93b9456bba96727fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110627 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-01-15tdf#136861 ODT export: fix writing resolved state for non-ranged commentsMiklos Vajna3-12/+78
It was probably not intentional to write the resolved state only in case the annotation has a name. Conflicts: xmloff/qa/unit/text.cxx Change-Id: Ia3a6b2320e2288528c43c832211ebfcde492881e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109364 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-01-07tdf#133501 xmloff: ODF export: export annotation only if extendedMichael Stahl1-2/+4
(regression from 7c20c3c2a9fc85c66dad9d09908b257beeedd78d which forgot to adapt this under the erroneous assumption that the feature did make it into ODF 1.3) Change-Id: Idfe37444b8287edd063fa9576e6d76a332552754 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95355 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07tdf#103602 xmloff: ODF export of page style: don't export draw:fillMichael Stahl2-2/+17
... attributes on page-layout-properties in strict ODF. Change-Id: Id7c440bf86f78f5f8bb95b9463874787372d5ae8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95053 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07tdf#103602 xmloff: ODF export: draw:background-size attributeMichael Stahl3-1/+64
... on drawing-page style; no import because Writer doesn't have the property anyway. It looks like Writer paints color, gradient, hatch and bitmap with "repeat" on the entire page, and bitmap "scaled" or "no-repeat" within the borders. Change-Id: Ia32c800a6cb537bf9df57c6a6a77a5c1dcf52aa8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95040 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07[API CHANGE] officecfg,xmloff: remove SaveBackwardCompatibleODFMichael Stahl4-42/+8
org.openoffice.Office.Common.Save.Document.SaveBackwardCompatibleODF was added in 2007 and apparently enables storing invalid ODF (or OOoXML) to workaround bugs in OOo <= 2.3; nobody should need it in this day and age, and the OOoXML export has been removed anyway. bce5e157785745a6729db62b15fb98bc396cddee 2007 c7a3859693971bf7103bfb0d05d64712e724fa37 2007 7477a65e09b20917adf025550c550f8822b508ee 2007 77baabe992c77018a0467ffec8f9482f8d76b66b 2007 575222083e058a740f5ad69e14e18622c3d4f7af 2007 66b908b45cde78af020b35e817e67bc40b8493f0 2007 Change-Id: Ib3f730c7c9ac6fbbbbae9fb4a42c1bd65f6c93df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94571 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07xmloff: ODF import: Silence "unknown LO version: 7000"Tomoyuki Kubota1-0/+4
Change-Id: I56cf3b03274cc24f66bbfc9d3615fa57521a6cd1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94368 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07tdf#89475 xmloff: ODF import/export: continue fixing draw:angleMichael Stahl2-4/+18
Continue what commit aadda5d17f6e422da143ea774f759bfc5f629c5b started wrt. unit-less draw:angle attributes in ODF >= 1.2: * ODF 1.3 files don't ever have unit-less draw:angle interpreted as 10th of degree * import unit-less draw:angle as degree, except if it's ODF 1.0/1.1 or it's ODF 1.2 written by OOo/LO < 7.0, then 10th of degree * export draw:angle with "deg", which LO 4.4 and newer can read; except if exporting ODF 1.0/1.1 or ODF 1.2 Extended (compatibility mode), then 10th of degree (unit-less) The only problem with this is that if you store a file as ODF 1.2 Extended (compatibility mode) and load it with LO 7.0 it will interpret the angle wrong, but nothing's perfect... Change-Id: I3771e6571afd40e44b6f7890dacf18c28841610f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94443 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07xmloff,filter: Flat ODF import: import BuildId from meta:generatorMichael Stahl1-10/+25
The problem is that SvXMLMetaDocumentContext::endFastElement() works to init BuildId property for ODF packages but not for flat ODF files because the entire content of the document is inside that element. So init BuildId when the office:meta element ends. Also, add the missing "BuildId" property in XmlFilterAdaptor. This allows the CppunitTest_sd_import_tests testGradientAngle to work in the subsequent commit. Change-Id: I916a9288631078c1552cd8673e41fa9a9679f574 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94499 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07tdf#106780 xmloff: ODF export: only write invalid text:style-name...Michael Stahl1-1/+1
... in case of ODF 1.2 Extended (compatibility mode), which is intended for workarounds for old OOo/LO versions. Change-Id: Ib0411c09d795383a481be8b4661dc71b02b0181b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94442 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07tdf#103602 xmloff,sw: ODF 1.3 export: PageStyle with drawing-page styleMichael Stahl1-19/+55
Associate a style of family "drawing-page" with a style:master-page. This fixes the small part of the draw:fill attribute problem that is covered by OFFICE-3937 in ODF 1.3. Exporting the "drawing-page" style is only allowed in ODF 1.3; all property map entries have ODFSVER_ODF013 and this causes no style to be exported for earlier versions. Continue to export the invalid draw:fill attributes on the style:page-layout for now, until the import of this is more widely deployed. This only works with Writer, because Calc doesn't implement FillStyle properties on its page styles. Change-Id: I4b24ae3eaf332723e24671e594eca5e36d48f525 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93671 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07convert XML_STYLE_FAMILY to scoped enumNoel Grandin62-383/+401
Change-Id: I5335b0190a2f5a8111993c0c9c224c8a6a8f0cfb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88723 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-01-07tdf#97630 xmloff: ODF export: fix draw:fit-to-size mess, step 2Michael Stahl1-6/+2
Restrict the export of draw:fit-to-size to only the standard values "true"/"false". Keep the broken export for ODFVER_012_EXT_COMPAT, since it's easy to do. Change-Id: Ieaab3b635a116a1d0b6155115f8f7f74935a125a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93226 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07tdf#91306 xmloff: ODF export: allow style:page-number="0" in ODF 1.3Michael Stahl6-22/+69
See OFFICE-3923. Change-Id: I619d9efe3eb17feaf84f7dd21f5b2197c30bc6aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93225 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07xmloff: ODF export: additional ODF 1.3 chart featuresMichael Stahl6-26/+61
* OFFICE-3662 chart:interpolation additional values * OFFICE-3958 chart regression curve: polynomial * OFFICE-3959 chart regression curve: moving-average None of these are exported in ODF 1.2 extended because they require additional values for standard attributes, which isn't valid. Change-Id: I920cc44dbde46687b570c1296c7d8926f0a1a9c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94064 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07replace hard-coded "1.2" ODF version stringsMichael Stahl2-5/+6
Most of these are calls to DocumentDigitalSignatures::createWithVersion(), where it doesn't make a difference if "1.2" or "1.3" is passed in but maybe it will be different with "1.4". There is another ctor createDefault() which looks appropriate for non-ODF contexts and can also be used when no actual signing or verifying is done. In cases where there's an actual document its Storage has the version. Change-Id: Id636bbf965d9f96c7ed5f50774c509032525b2b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93091 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07xmloff: remove unused SvXMLExport::getDefaultVersion()Michael Stahl1-10/+0
Change-Id: I52e904ca32f46ec50c3045260be7824aa782cc9c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93090 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07xmloff: ODF export: produce office:version="1.3"Michael Stahl2-26/+21
Change-Id: I422743c6eacf112046141e017d42d78165c36cf2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93089 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07xmloff: ODF export: adapt to ODF 1.3Michael Stahl8-29/+83
* OFFICE-3883 legend svg:width/svg:height * OFFICE-3928 chart:coordinate-region * OFFICE-3943 draw:mime-type * OFFICE-3765 number:fill-character, number:text * OFFICE-3860 number:min-decimal-places, number:forced-exponent-sign * OFFICE-1828 number:exponent-interval * OFFICE-3695 number:max-denominator-value * OFFICE-3941 text:index-entry-link-start/text:index-entry-link-end * OFFICE-3776 meta:creator-initials * OFFICE-3789 style:header-first/style:footer-first Change-Id: I78c79231c0708c3ae9943097d162898fab71988f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92873 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-07xmloff: ODF export: adapt all checks of ODFSVER_012 etc.Michael Stahl7-29/+29
Most of these actually want to check ODFSVER_EXTENDED because the extension didn't get into ODF 1.3. Change-Id: I1b625a329f7a3d146c616c62c15b56e2c314c2c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92872 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2021-01-07sc,xmloff: ODF 1.3: adapt XMLPropertyMapEntryMichael Stahl2-12/+12
Map the following property attributes to ODFSVER_013: * OFFICE-2173 table:tab-color * OFFICE-3767 text:contextual-spacing * OFFICE-3857 table:scale-to-X/table:scale-to-Y Change-Id: I3585560a3654c71353bbcaf66da20eacba8ebd1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92861 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2021-01-07xmloff: ODF export: rework version checks in SvXMLExportPropertyMapperMichael Stahl5-26/+77
There's some issues with the version checks here: * The requirement is to retain support for ODF 1.2 extended, but some attributes are in ODF 1.3, while others require ODF 1.3 extended, so a single version number can't be used to compare * A recurring problem is that new extension attributes are erroneously exported to standard namespaces; there is the pre-existing buggy case of style:hyperlink to consider... * Currently it's possible to distinguish multiple extended version but the only minimum version that's actually used is the minimum one ODFSVER_012_EXT_COMPAT Rework this to use a different check, by: * distinguishing extension attributes from standard attributes via their namespace, to avoid such bugs by construction * interpreting the version number always as a standard ODF version number: if the attribute is in extension namespace: if the minimum standard version is met, ignore else: if the minimum standard version is met, export * adapting all XMLPropertyMapEntry to use ODFSVER_FUTURE_EXTENDED for extension attributes (TODO: check which of these should be ODFSVER_013) This should have an effect on the drawext:fontwork* attributes, which need ODFSVER_FUTURE_EXTENDED to be exported now. Change-Id: I986c8064e578a61d69ed5fdb261f23e7582a7d75 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92856 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2021-01-07tdf#114400 Export drawoo:fontwork-xyz attributesIlhan Yesil1-26/+26
The attributes can be read in the old and the new namespace, but will be exported only in the new namespace. Change-Id: Ia79aad425105d94d460a819eaa3e4a35ac4c73e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/59411 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2021-01-07xmloff: ODF export: fix style:hidden nonsense, step 1Michael Stahl4-6/+25
a0dcf961879ab644a52f801f65466756cb144b72 introduced style:hidden attribute, fix the obvious problems with this: * as a non-ODF attribute it should use LO_EXT namespace * import LO_EXT namespace too * comparing == ODFVER_LATEST is wrong; it already prevents exporting in ODFVER_012_EXT_COMPAT case. Don't remove export to STYLE namespace yet even though it's invalid, because existing LO releases expect that. Change-Id: I258202cc572a7c50f3b2620da3b9970d34fbf80b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92730 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2021-01-07xmloff: GetEarliestODFVersionForExport(-1) is impossibleMichael Stahl2-8/+5
Remove defensive programming nonsense to deal with situation that has apparently never been possible in git history. Change-Id: I3788cdcec5e1b4afa27e294ed91825bb33e8e633 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92729 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2021-01-07replace ODFDefaultVersion usage with ODFSaneDefaultVersion...Michael Stahl8-71/+76
... in SvXMLExportPropertyMapper. The condition nCurrentVersion == SvtSaveOptions::ODFVER_UNKNOWN is impossible since d571a509aa324db9a425110a67ea142d157256b2. ODFVER_UNKNOWN isn't a value of ODFSaneDefaultVersion so use std::optional to handle the remaining usage. Change-Id: I1e33cb707c289224664a385b4e4425e6788b2943 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92728 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2021-01-07rename XML_OLD_NAMESPACE_ constantsNoel Grandin2-13/+13
so I can use them with the XML_ELEMENT macro, which expects them to start with "XML_NAMESPACE" Change-Id: If8098448f451675aaff8ca2dcf9544e765cda965 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88928 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-01-06tdf#133555 xmloff: ODF export: don't produce text:drop-down in ODF 1.2Michael Stahl1-0/+5
This was added in ODF 1.3 as OFFICE-3881, but it's actually ancient and was written by OOo 2 already, just somehow forgotten to add it to ODF. Change-Id: I322fac471c940334f886a7c61769922ae03ee89b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95359 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108791 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-01-06xmloff: ODF import: wrong Storage in SvXMLImport::IsODFVersionConsistent()Michael Stahl1-3/+2
The XModel's storage is a temporary one created in SfxObjectShell::GetStorage(), with the latest ODF version; the check must use the source Storage that is being imported. Change-Id: I3d2ce92d6193deefac852edb7078fb5bf41bb957 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93173 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108740 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-12-21replace ODFDefaultVersion usage with ODFSaneDefaultVersionMichael Stahl17-111/+111
Compare with ODFSVER_012 mostly works the same, except for places where namespaces are defined where the ODFSVER_EXTENDED bit should be checked. Conflicts: sc/source/filter/xml/XMLExportDataPilot.cxx xmloff/source/chart/SchXMLExport.cxx Change-Id: I86469b763bc2f903632976bc9d6ec04d543d705e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108107 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-09-15tdf#135942: avoid collecting autostyles during writing themMike Kaganski1-0/+2
This modifies the container over which iteration is performed. Additionally, make sure that all nested table autostyles are collected on the first phase. Change-Id: I74c0bb1aaacad095226c21e6bf51cc8668133bb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101096 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit f0286ad82465152b29bba01ab2edeb97291397fa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101069 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0273675e7dde577077ccca17571846a0942f2630) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102700 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-09-15tdf#124470: Split export of table autostyles out from collection phaseMike Kaganski1-0/+4
This allows to call collectAutoStyles where required (e.g. when enumerating used fonts), without side effect of writing table styles XML inside the call, out of place. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100153 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 35021cd56b3b4e38035804087f215c80085564be) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100221 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100274 Change-Id: Ida05e373eb8502590c43e2b0e85c3b0c1107c551 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102699 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-08-06tdf#130707 xmloff: survive <text:database-display> in editeng textMiklos Vajna5-16/+130
Regression from commit 28d67b792724a23015dec32fb0278b729f676736 (tdf#107776 sw ODF shape import: make is-textbox check more strict, 2019-08-26), now that we correctly identify what shape text to import as "textbox" (Writer TextFrame) and what to import as editeng text, there are documents out there that try to import mailmerge fields into editeng-based shape text. Fix missing error handling there. Note that the error is not just silently ignored, we do insert the field result into the shape text, existing code provides this already. (cherry picked from commit 790ab54d7232d232ba84f17f285d4639ddba80d5) Change-Id: Ibe631ac5d94c1c7795dd00bad05fdcca0e6741a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100198 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-07-15tdf#131175 oox chart import: fix char color of <dLbl>, inherited from <dLbls>Miklos Vajna1-0/+20
There were two problems here: 1) Our chart model expects the char formatting of a data label as direct formatting, so in case <c:dLbl> has no such formatting, but <c:dLbls> has, oox has to explicitly inherit. 2) The data label char formatting is represented using chart::FormattedString, but the char format of it is not (yet) exported to ODF. Given that the char format of the series and the individual data labels is the same, restore the same formatting on import to please rendering. With these, finally the chart labels in the bugdoc are white, not black (and have a dark background, so they are readable). (cherry picked from commit 8a43bfeffab9009c9f373e883fef87af1a7b3843) Change-Id: Iebac5ce0be31a59bafb0f9fe7636330585e33822 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98810 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-07-15Related: tdf#131175 OOXML chart: import data label fill patternGülşah Köse2-1/+4
(cherry picked from commit 6f752061d5153da50d6f536d506358c8f512a397) Conflicts: oox/source/drawingml/chart/seriesconverter.cxx Change-Id: I2db64489c86e4381167eb13af4ab5118113960d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98808 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-07-15tdf#131175 Import data label solid fill and color.Gülşah Köse4-0/+18
(cherry picked from commit 603df08a1e0211099ce2cf258cfe64a74ed6ded9) Conflicts: oox/source/drawingml/chart/seriesconverter.cxx Change-Id: I8a3ef6e60d4f2a13310bb9a8fc4eb873df3f9b4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98807 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-06-16disable spurious SAL_WARNNoel Grandin1-6/+9
in the FastParser case, those name/prefix fields in context are not initialised, so don't warn for that case Change-Id: I485dd1b86d81ea2b6f03fa6a8ecf5fb23d46a8e1 Reviewed-on: https://gerrit.libreoffice.org/83153 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96433 Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-06-15tdf#133459 Fix import of fields with user defined number formatsMaxim Monastirsky2-4/+17
commit 59ace23c367f83491a37e844d16f7d716eff6346 ("tdf#101710 Fix invalid style:data-style-name attribute") had a side effect of exporting user defined number formats under <office:styles> instead of under <office:automatic-styles> (which is valid, and what Calc does since forever). As it turned out, this didn't work well for fields: - For fields inside headers or footers, their number format wasn't imported at all. The reason here is that fields use the XMLTextImportHelper::GetDataStyleKey method to resolve data styles, and that method checks only automatic styles. Actually it resolves also styles from <office:styles>, because SvXMLImport::SetAutoStyles has a special code that merges styles from <office:styles> into automatic styles during content.xml reading. The problem is that headers and footers have their contents stored inside styles.xml, and no merging happens at this stage (unless it's a flat odf file). One way to solve this could be to explicitly check for styles from <office:styles> in XMLTextImportHelper::GetDataStyleKey (e.g. see previous gerrit patchsets, or XMLTableStyleContext::GetNumberFormat) I chose to simply modify the condition in SvXMLImport::SetAutoStyles, so that merging happens anyway. - Fields whose format resolution depends on the merging of SvXMLImport::SetAutoStyles, did import the number format itself, but not its language setting. This can be in one of three ways: (a) Fields in the document and the header, when both use the same format. In this case the format is stored once in styles.xml, so at least the consumer from content.xml depends on merging. (b) Field in the document with a user defined format - a regression of the above commit. Now stored in styles.xml under <office:styles> instead of in content.xml under <office:automatic-styles>. (c) Field in a header with a user defined format - depends on merging as a result of the above fix. The reason here is that the merging isn't done with the original SvXMLNumFormatContext objects, but with a newly created fake ones, which only have the format id correct (with the assumption that those formats already imported, and calling code could just find them by the id). The problem is that the fields code uses XMLTextImportHelper::GetDataStyleKey to get the language setting from style objects, and set the IsFixedLanguage property according to it, while we know that those fake objects don't have the language correctly set. Try to fix that problem by setting the correct language on those fake objects. Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: Ibb362df019921e040708d3bda83bf155535ec7af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95612 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> (cherry picked from commit cd0dc1bc592d7952c36659da33d99ab964fe2e93) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96267 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-06-15Add more debug to try to catch a slew of unhelpful messages.Michael Meeks1-1/+2
Change-Id: I905d54ade7fdce992b0ff6e81d51915b43acd2ed
2020-05-24tdf#103602 xmloff,sw: ODF 1.3 import: PageStyle with drawing-page styleMichael Stahl13-60/+182
Associate a style of family "drawing-page" with a style:master-page. This fixes the small part of the draw:fill attribute problem that is covered by OFFICE-3937 in ODF 1.3. This is the import part. Change-Id: I4c86fa24c36407b64ce33f0890e5da8c26c5292a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93670 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 4e98ba4ba5c17ab8ae1170662af645b9d2bfde84) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94587 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-24tdf#130479 FODG import: fix handling of <draw:fill-image> in stylesMiklos Vajna5-0/+362
Regression from the image handling rework, the problem was that the old, URL-based code had explicit handling of mxBase64Stream, while the new, XGraphic-based code assumed that by the time we reach the end of of the bitmap style element, maAny already contains the graphic. Fix the problem by improving XMLBitmapStyleContext::EndElement(), so it loads the graphic from the base64 stream if we don't have a graphic already. (cherry picked from commit 96baf8c69330d50af7d31ab9838bcd0ec7c8c50b) Change-Id: I6d90f1470a5b797fb51789901081ccd7a6fd29e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94459 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-23meta:non-whitespace-character-count attribute is knownhimajin1000002-2/+4
also, fixed a typo and re-positioned the item to the correct index. Change-Id: Ibac232a9e6851a0c59884bc82ead5de36ac2e391 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94454 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit acfd959f0b4069b74e76213e4118af9827005fff) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94460
2020-05-17Remove some redundantly user-declared copy ctors and assignment opsStephan Bergmann2-23/+0
...that trigger -Werror,-Wdeprecated-copy ("definition of implicit copy {constructor, assignment operator} for ... is deprecated beause it has a user-declared copy {assignment operator, constructor}") new in recent Clang 10 trunk (and which apparently warns about more cases then its GCC counterpart, for which we already adapted the code in the past, see e.g. the various "-Werror=deprecated-copy (GCC trunk towards GCC 9)" commits) Change-Id: Ie37bd820e6c0c05c74e1a862bb1d4ead5fb7cc9c Reviewed-on: https://gerrit.libreoffice.org/83698 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93694 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-05-08xmloff: add ODF import/export for semi-transparent shape textMiklos Vajna1-0/+4
Test this from sd, so that SdModelTestBase::saveAndReload() calls BootstrapFixture::validate() for us. Change-Id: I6c90a3a71a5603604e69f9b45137bc8e4388dc0f Reviewed-on: https://gerrit.libreoffice.org/83371 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit 4dbb33a1c21948bebcf890c2f8ceb56b15a87936)
2020-05-06sw from-bottom relative orientation: add ODF filterMiklos Vajna5-2/+22
Map between RelOrientation::PAGE_PRINT_AREA_BOTTOM and loext:vertical-rel="page-content-bottom". Conflicts: sw/qa/extras/odfexport/odfexport.cxx Change-Id: I1d614bf7c82a76285f4268b8008e08c25ef9b7f0
2020-04-28tdf#131979 Chart ODF import-export of Link to source formatBalazs Varga2-0/+24
setting also into data point styles, fixing lost numbering style of custom data points. (Only export into the data series style was supported previously.) Also fix tdf#131115 - FILEOPEN: Incorrect format of single data label Regression from commit: e57d90cd4e51a1353eafc87bb29cfe6076704a7c (tdf#129173 tdf#129175 Fix number format of data labels) Data point styles in older ODF files do not contain the 'link-data-style-to-source' property, so they used the data series style property during the import previously. Now we set the default false value, if the data point style contains a 'data-style-name' (number format). Change-Id: I4786e62ca75770ed632463bcf1275ece7ea793f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91967 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92653 Tested-by: Jenkins
2020-04-10tdf#131966: chart legend attribs width and height unknown for ODF 1.2 (strict)Julien Nabet1-1/+3
Change-Id: Ie4cb7d2c9e5fb7bca88287fcaff03d5c9ca04b8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91899 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-22 04:23:57 +0000