summaryrefslogtreecommitdiff
path: root/sw/source/filter
AgeCommit message (Collapse)AuthorFilesLines
2021-06-09-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann1-2/+0
...since the (only) read of sXmlId got removed with c50357ff625972464d1a591afe4198d3f6f42a39 "loplugin:unusedfields in sw" Change-Id: I609eae60eb0e1d440a47f97b6387c833c1404518 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116855 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-09NFC compat cleanup: no need to specify default TabOverflowJustin Luth1-1/+0
This really confused me because it lead me to think that this was something done for MS compatibility. Well, that is only true in an off-handed way. LibreOffice itself was changed to work similarly to MS Word. So there is nothing special about how DOC or DOCX/RTF are handled. Since the compat settings are not saved or loaded into MS Formats (i.e. it just takes the default value), and since on an ODT save it also will just save with the proper default value, there is no need to specify "TabOverflow = true" in non-ODT import filters. Only ooxmlexport16 has a unit test that reacts if tabOverflow is false. That one is mine and it indicates that the document would be better if tabOverflow was off, so there are no examples of how tabOverflow improves a doc. Change-Id: I97c25154108bc1ca0fcd3dfcff66fea0ea2bca7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116741 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2021-06-09tdf#137469 Implement and test excluding hidden text in text filterOleg Shchelykalnov1-1/+2
Uses filter options to manage whether hidden text output to file. Fixes filter options usage in test. Change-Id: I12a234438730795df6dd11bd6707dfa1fbfa4740 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105631 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-06-07sw: WriteLong/Short -> SvStream::Write[U]Int[16|32]Vasily Melenchuk1-15/+17
Change-Id: I1c09a3bbf301166ccab16ecf0b57f22a335e0791 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116778 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Tested-by: Jenkins
2021-06-07sw: prefix members of CSS1Selector, HTMLStartEndPos, SvxCSS1MapEntry and ...Miklos Vajna7-58/+57
... SwHTMLPosFlyFrame See tdf#94879 for motivation. Change-Id: I4d1a427653aea5c6414f79c8eaea71336150bab7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116773 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-06-06tdf#142669 Consider BOM on text encoding detectiontobias2-2/+11
Return a flag if the auto detected text has a BOM. Save the flag in SwAsciiOptions so that BOM gets set correctly when file is written. Change-Id: I358c3ba243bc326a552c2dc24773c94f8319c700 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116759 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-04tdf#120574 Store Ascii Options for Later Savingtobias3-0/+32
store auto detected/configured ascii options in medium. use stored ascii settings for saving and text encoding settings dialog. Change-Id: I88e2d54923bfcf5d7c460ef3b89c36fc002c5097 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116678 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-06-04sw HTML export: allow custom DPI for the bitmaps of shapesMiklos Vajna4-1/+59
But leave the CSS pixel size of them unchanged in the HTML markup. Also add some documentation on the various options, so one doesn't have to dig them out from testcases. Change-Id: I6c6ee4e9c98d674f44e7c5835f2e6a6737e13f34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116722 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-06-04sw HTML export: fix pixel size of shapesMiklos Vajna1-3/+19
- the twips logic size was set, but it was consumed as mm100 logic size, so the pixel size was about half of the correct one - the HTML export didn't write a logic size ("CSS pixels size") for shapes Change-Id: I37f6b4acde9d1298fae81f9975e9db95485631ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116691 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-06-03indexing: start of Indexing Export impl. based on (X)HTML exportTomaž Vajngerl2-3/+33
This adds a indexing output/export to HTML code, which will output a xml document that will be used for indexing of the document. It is based on HTML to reuse the traversal through the doc. model. It is enabled by setting the "IndexingOutput" export parameter. This commit only adds in the groundwork, but the output is still more or less the same as html and the follow up commits will add more indexing specific changes. The only change is to use "indexing" as the top level element and the document is a valid xml (has the xml header). Also add basic test that the indexing output/export works and can be parsed as an xml with "indexing" top level element. Change-Id: I153b1a70da7cbcf0d33b8610d962e6b7ae23ad23 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116631 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-06-03tdf#79069 DOCX: support tracked table (row) deletionLászló Németh1-1/+58
Only DOCX round-trip was supported for tracked table and table row deletions. Now change tracking of newly deleted tables and table rows is exported in DOCX. Also the DOCX import is handled by Manage Changes now: accepting the deleted ranges of a deleted row removes also the table row, not only its text content. Follow-up to commit 05366b8e6683363688de8708a3d88cf144c7a2bf "tdf#60382 sw offapi: add change tracking of table/row deletion". Change-Id: Ic02e0adbda11032acb9616c262c2fce134f6b07c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116652 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2021-06-03sw XHTML / reqif export: fix PNG export of shapesMiklos Vajna1-0/+5
image/x-vclgraphic is not something anybody else will understand. Change-Id: I5a5b37b7f769de351bd3dfc38ccd57381bc43319 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116673 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-06-03sw XHTML / reqif export: implement OLE wrapper support for shapesMiklos Vajna1-30/+51
ExportImagesAsOLE=true was only handled for Writer images, not for Draw shapes, fix this. Change-Id: If5018ff4b7c8b303d63a862f7428aa4e8b77d498 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116641 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-06-03sw: rename some variable/method names in html import/exportTomaž Vajngerl6-97/+97
Rename to "default" instead of "dflt", "start" instead of "stt", "content" instead of "cnt",.... The shorter names are a product of utter laziness. Change-Id: I5f5c8f6504e788395db495c000c098401767f8a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116628 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-06-02sw XHTML / reqif export: export non-PNG graphic shapes directlyMiklos Vajna1-4/+30
But non-PNG needs a PNG fallback, add logic similar to how we already handle this in the Writer image case. Change-Id: Id853a7072878cada4a6e1e9367443f869028aa1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116581 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-06-02SAL_WARN -> SAL_INFONoel Grandin1-1/+2
Change-Id: Id3402c4413589b5e82f5754810716a2a171ef6f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116570 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-02sw XHTML / reqif export: export PNG shapes directlyMiklos Vajna1-4/+18
The old markup was: <object data="draw-png_xhtml_89305eb5d44b6428.gif"> The new markup is: <object data="draw-png_xhtml_89305eb5d44b6428.png" type="image/png"> Which now passes the validator. Change-Id: Ibcdac7aeef0e39c926176bf8852cffe17a137fa2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116565 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-06-01sw XHTML / reqif export: write PNG fallback for non-PNG imagesMiklos Vajna3-30/+54
- split up OutHTML_Image, so it's possible to write <object type="image/jpeg"> <object type="image/png"/> </object> - write PNG inside the original image - disable this when the original format is PNG already Change-Id: I3ad40089ee2b02b8850823dd536c58ac59af37f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116544 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-31sw XHTML / reqif export: export PNG images directly, without an OLE wrapperMiklos Vajna3-5/+12
Do this by default and add a ExportImagesAsOLE=true option for those who want the old behavior. Adapt existing tests to ask for the old behavior and add a new one that depends on the new default. Change-Id: If863215ce267d6accc85b5c8f7bdbd3f2b1e9187 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116486 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-31no need to allocate this separatelyNoel Grandin1-1/+1
std: :vector is only 3 words big in it's empty state Change-Id: I5d7630f0ded1ace284c0a4441230bf672f4639be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116398 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-31sw: prefix members of HTMLEndPosLst, SwFltStackEntry, SwFltTOX and ...Miklos Vajna11-226/+222
... SwHTMLNumRuleInfo See tdf#94879 for motivation. Change-Id: Ie091511f7b2fff3949295c310045631676879655 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116421 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-31tdf#138302 partial revert tdf#108496: DOCX: redesign of override in listsJustin Luth3-0/+19
LO 6.4.5 commit cf13fe3e6f6a40f6db064d65d4514d13a23a31f0 was only concerned about DOCX, but just elinated shared code. So restore the shared code and just don't execute it for DOCX. It doesn't look like RTF was working before this, but this does fix DOC format. I looked for existing unit tests in rtf and doc, but none were found that hit this code. Change-Id: Id624f73181384f38e1ef9f27575e0fb82eea19c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116349 Tested-by: Jenkins Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
2021-05-30sw : missing std::optional includeArnaud Versini1-0/+1
Change-Id: Ia5973a0ffd43962ef2391f431d3d6b544fe19879 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116414 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-05-30frequent recent CppunitTest_sw_uiwriter failureCaolán McNamara1-1/+1
since... commit 66438a0ad5a3c6d2792f4c6c04c2d2405b5679cb Date: Fri May 28 15:35:25 2021 +0200 std::unique_ptr->std::optional Change-Id: I8feefa8787ebf82c1afd8109c6e4fa30f726d6da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116417 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-05-30std::unique_ptr->std::optionalNoel Grandin6-23/+23
Change-Id: I674ef2bccaa56d1435b821e3e161f7c47340202f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116380 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-29std::unique_ptr->std::optionalNoel Grandin5-45/+45
Change-Id: Ie09ede2ce21c206ca158a5a89d50143cdde45e3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116381 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-29no need to allocate these on the heapNoel Grandin2-34/+34
Change-Id: Id82625ec95720d92353804d1b503b8f71e1db91e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116365 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-28sw XHTML / reqif export, RTF markup of images: write OLE1 presentation dataMiklos Vajna1-11/+37
With this, images are exported as PBrush OLE objects, to please some consumers (e.g. IBM Doors). Change-Id: I89805cd66709d96cbe71853d65671f76a3fc871f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116348 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-28no need to allocate these SfxItemSet on the heapNoel Grandin1-2/+3
use std::optional where the code needs to control the lifetime of the object explicitly Change-Id: Ia550ce051360f68911abc68c945a97d62a637b06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116291 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-27sw XHTML / reqif export, RTF markup of images: write objdataMiklos Vajna3-7/+66
The native data is BMP, presentation data is not yet done. Change-Id: I30ef9f0c3b4dc7801e600ac751c32179372d5e4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116266 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-27tdf#60382 sw xmloff: import/export tracked table/row deletionLászló Németh5-2/+84
to OpenDocument format using <style:table-row-properties loext:text-changes-only="false"/> Rename also com::sun::star::text::TextTableRow::IsNotTracked to com::sun::star::text::TextTableRow::HasTextChangesOnly. Follow-up to commit 05366b8e6683363688de8708a3d88cf144c7a2bf "tdf#60382 sw offapi: add change tracking of table/row deletion". Change-Id: Iefb0d4095af0983fdd15697d5b80073d18d21bd7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116212 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2021-05-27Fix typosAndrea Gelmini1-1/+1
Change-Id: I9a4ba6b6369da0bac489718230880b04912bd1d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116214 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-05-26sw XHTML / reqif export, RTF markup of images: write WMF in \pictMiklos Vajna1-38/+27
Some consumers (e.g. IBM Doors) can only consume the RTF snippet if it's an OLE object and can't deal with plain images. Wrap \pict inside \object and unconditionally use WMF as the RTF-level preview format. The actual \objdata is not yet written. Change-Id: I203fcd8709b25a4dd543047bd804af8181df9940 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116207 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-25sw: prefix members of SwApplet_Impl, SwFltAnchor, SwFltControlStack and ...Miklos Vajna6-89/+89
... SwFltRedline See tdf#94879 for motivation. Change-Id: Ib70ed34b46f68650fbb3f1fa01cb2232a1909fa8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116080 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-21sw: replace most static_cast<sal_uInt16>() calls with o3tl::narrowing()Miklos Vajna40-198/+200
o3tl::narrowing() is a better way to handle this, as that way the integer conversion is still implicit, which allows detecting integer truncation at runtime (with suitable compiler flags). Change-Id: I499abda3be6943e8c111c56df390e72939586221 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115948 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-21fix leak in SwHTMLPosFlyFrameNoel Grandin1-1/+2
affects html export Change-Id: I10b33a27e18eabf36a1a8566c3b90f2f7c760f0d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115922 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-21tdf#137469 Add option to disable hidden text in text filterOleg Shchelykalnov1-1/+16
Adds sixth filter option to text filter. If true (default) filter save hidden text to output file. Change-Id: I71202653b3cc4e50ddd06a665f5a718f875f6d79 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105579 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-20simplify some XMLPropertyState memory managementNoel Grandin1-48/+19
which fixes a leak if some of the code throws an exception Change-Id: Ic89060e7951060458ffe7ee5b6fe51cd076ef19b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115830 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-20tdf#60382 sw offapi: add change tracking of table/row deletionLászló Németh1-16/+1
This is a minimal extension of the text range based change tracking to record and apply table row and table deletions with full Undo/Redo support. Add property IsNotTracked to com::sun::star::text::TextTableRow. During recording of track changes, deletion of table rows wasn't recorded: the rows removed completely with their text content. Now the deletion deletes the cell content with change tracking, setting also IsNotTracked property of table rows to FALSE. If all tracked deletions were accepted in a row, and the result is an empty row, the row will be removed, if its IsNotTracked property is FALSE. Note: Deletion of empty lines isn't recorded (they are simply deleted). Hiding deleted rows hasn't been supported yet in the Hide Changes mode. OpenDocument supports only track changes of text ranges, but not changes of the table structure, e.g. deletion of table rows. For the native export it needs to extend ODF, and depending on this future extension, can be based also on SwExtraRedlineTable (which lacks of recording and Undo/Redo, but supports OOXML round-trip of tracked table changes). See also commit d688069023959ab97d14eb1dbfd5bf6ad3c1b160 "Add support for 'Table Row Redlines' in SW core" and its follow-up commits. Change-Id: I2e3807cf8ae8212bd51c210ef1c20c85878d0da8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115804 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-05-19fix leak in SwWW8ImplReader::Read_GrafLayerNoel Grandin1-1/+1
Change-Id: I898c2380f1b7505c608ef0a865e1b7ca6c6dce25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115778 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-18tdf#76817 tdf#141966 ooxmlexport: write OutlineRule if not inheritedJustin Luth1-11/+20
The previous LO 6.1 version of this patch was fine in practice, but in theory the special "Outline" numbering style COULD be applied directly to a paragraph - especially during import since "Chapter Numbering" is a LO invention, not a DOCX spec. So, ensure that both the listLevel and the numId match what is inherited from the style before deciding that writing out the numbering is not needed. This patch will be needed for tdf#141966. Change-Id: I9ec4477ed18f84c22a0b5941d0d218186ab6875b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115612 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-05-18Don't remove section at the end of inserted text tdf#142157Georgy Litvinov1-5/+6
Change-Id: Ie52721a480e0bbc76d00f0cc5c9182be6476d939 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115643 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-05-17split OutputDevice from WindowNoel Grandin2-2/+2
as part of a longer-term goal of doing our widget rendering only inside a top-level render- context. I moved all of the OutputDevice-related code that existed in vcl::Window into a new subclass of OutputDevice called WindowOutputDevice. Notes for further work (*) not sure why we are getting an 1x1 surface in SvpSalGraphics::releaseCairoContext, but to fix it I clamp the size there (*) might have to dump VCLXDevice, and move it's code down into VCLXWindow and VCLXVirtualDevice (*) can we remove use of VCLXDevice in other places, in favour of just talking to the VCL code? Change-Id: I105946377f5322677d6f7d0c1c23847178a720b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113204 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-17sw: prefix members of SwASCIIParser, SwASC_AttrIter, ...Miklos Vajna2-141/+134
... SwTableProperties_Impl and SwViewShell See tdf#94879 for motivation. Change-Id: I7c8fe1f95d9ff1dbd7b9980845ff7fdfb36d1e26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115691 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-14Improve loplugin:stringviewStephan Bergmann4-6/+6
Issue the "instead of O[U]String, pass [u16]string_view" diagnostic also for operator call arguments. (The "rather than copy, pass subView()" diagnostic is already part of handleSubExprThatCouldBeView, so no need to repeat it explicitly for operator call arguments.) (And many call sites don't even require an explicit [u16]string_view, esp. with the recent ad48b2b02f83eed41fb1eb8d16de7e804156fcf1 "Optimized OString operator += overloads". Just some test code in sal/qa/ that explicitly tests the O[U]String functionality had to be excluded.) Change-Id: I8d55ba5a7fa16a563f5ffe43d245125c88c793bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115589 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-05-14sw XHTML export: fix <blockquote> with no-margin to not have character childrenMiklos Vajna1-2/+4
This is building on top of commit f2eae41e9a85cd1df4190160b7453d3e12b8ccbd (sw XHTML export: <blockquote> can't have character children, 2019-11-07), which handled this in general, but only worked in case the Quotation style had a non-zero bottom margin. Change-Id: I4008ee964d9a87a6cf409a63affce8e44d63b602 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115580 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-13inline some typedefsNoel Grandin2-4/+2
Change-Id: I1608e03ff9f6fbc55987010e88897e034b690b3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115552 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-13sw XHTML export: fix handling of list labelsMiklos Vajna1-1/+67
This is building on top of commit 119b6876c92e4cdae44583c4b1b1419d3533e3ee (sw XHTML export: properly write <li>...</li> around multiple paragraphs, 2020-05-21), but the use-case here is a numbering with list labels only. The first problem was that the list label had its <li> suppressed, but not its </li>. The other problem is that <ul> can only have <li> child elements, so at least fix the case where the list only has list labels, in which case even <ul> and </ul> should be omitted. Change-Id: Id38978a40d8618f483e3e9d499f75838d5b2adb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115543 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-11fix leak in RtfExportNoel Grandin2-3/+2
Change-Id: I6e1059cef9032de36cf8e1ac56eefecc4e417337 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115384 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-10tdf#138209 ODF export: work around forms problem in LO < 7.0Michael Stahl2-2/+4
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>