summaryrefslogtreecommitdiff
path: root/sw/qa/extras/rtfexport
AgeCommit message (Collapse)AuthorFilesLines
2020-07-15tdf#133437: sw: set generated shape name if it is missingVasily Melenchuk2-0/+606
Shape names are required for seting format name and undo/redo and correct displaying of objects in Navigator pane Change-Id: I43caf6a4d5f054283d48c46b081d43b743bd4433 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98312 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 0c53a58b2dd9bee3d4de6843966486428fdaa78f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98752 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-05-21use for-range on Sequence in sfx2..swNoel Grandin2-19/+11
Change-Id: I09806869f2fdbae61f4c5d5c9db6859202bb63b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94609 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-16CppUnittest: assert shapes in odf filesXisco Fauli4-0/+10
found by bin/check-missing-export-asserts.py Change-Id: I270b5dce748039427aaf5507006a8c145ef1419b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94331 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-05-15CppUnittest: sw: simplify code. use getShapes and getShapeXisco Fauli2-47/+24
Change-Id: I494349b99a122f67ed1f2881faf1a37e4358c55b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94214 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-14CppUnittest: rtfexport: assert pages in odf filesXisco Fauli4-0/+24
Change-Id: Iab360691cd23f663b7f6bf00227e8749d4c9e48e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94114 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-05-08improve loplugin:referencecastingNoel Grandin2-8/+6
to catch a few more cases Change-Id: I0323fba51bb2b4ba255e1db5aa0d890c5c6a2e1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93726 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-27tdf#116883: sw: support for lists level format stringVasily Melenchuk1-4/+4
Multilevel lists are more flexible in case of DOCX. There is supported custom format for any level in DOCX unlike in LO and ODT where we are limited only with prefix and suffix for hardcoded list levels separated by dot. At the same time DOCX can have lists not only "1.2.3.4", but "1/2/3/4" or even "1!2>3)4" and such format can vary on each list level. Here is basic implementation for list format as a core feature for all documents and old way (prefix-suffix + ".") is left as fallback. Practically its usage is currently implemented only in DOCX import/export. Some RTF/OOXML unittests were redesigned: since we are not creating prefix/suffix for these formats conditions should be checked in a different way. Change-Id: I1ec58bcc5874d4fa19aee6a1f42bf1671d853b14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92106 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-06loplugin:unusedvariableplus in swNoel Grandin1-1/+1
Change-Id: I0ec780ebe3b347a19a5aa809fe05723a2906cb49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91738 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-03-06sw chicago numbering: add RTF footnote exportMiklos Vajna1-0/+32
Chicago numbering is not supported for paragraph numbering (same as DOC), so focus on footnote/endnote export only. There is markup in RTF to store doc-global footnote/endnote numbering type and the same for per-section. DOC writes both, then Writer only reads the global setting and Word only reads the per-section setting. This means only export is needed here, import already handled the doc-global markup, and that's enough. Change-Id: I3590560ca913e04078988fe4784e50fa5cbf17bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90112 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-03-06SwModelTestBase: speed up export testsMiklos Vajna2-9/+18
Export tests used to do the following steps: 1) Import 2) Verify 3) Discard state 4) Import 5) Export 6) Import 7) Verify Assuming that the cost of 2), 3) and 7) is almost zero, that leaves us with 4 filter() invocations for every such "export" test. But it seems to me, we can save one filter() call if we do it this way: 1) Import 2) Verify 3) Export 4) Import 5) Verify The only trick is that verify should perform its verification by only reading the document model. So adapt tests which mutated the doc model: paste tests should be import tests, the rest only did mutation by accident. A 'make check' is 88 seconds faster for me with this, using -j8. (~12 minutes of CPU time saved.) Change-Id: I40db8a9b9adaa99020acd718ba4ec3fd9bee3fb8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90077 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-03-04sw padded numbering: add RTF exportMiklos Vajna2-0/+27
RTF import was working already. Change-Id: Ifa71035645d4738138790e72c3f9dee640833d0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89963 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-03-02speedup sw build a littleNoel Grandin1-0/+1
from 11m46 to 11m21 Used ClangBuildAnalyzer to find headers that took a long time to parse (in total, across all modules). (*) moved the boost stuff out of sw/inc/docary into a new header. (*) make sw/inc/ndtxt no longer include doc.hxx Change-Id: Ia1d4ebddb4ddd4ec4ffbc011f4a5e24a42b46d3f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89808 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-24tdf#130817: Add unittestXisco Fauli2-0/+102
Change-Id: Icb7db08dc7884074f980ab101eac8a1998482ada Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89367 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-15tdf#129574 sw: fix RTF export of table of contentsMichael Stahl2-0/+14
The problem is that the hyperlink that starts at the start of the first paragraph of the ToX content is written to RTF before the TOC field itself, so the hyperlink contains the entire ToX: {{\field{\*\fldinst HYPERLINK "#__RefHeading___Toc250984071" }{\fldrslt {\rtlch\langfe1024 \ltrch\lang1024\loch {\field{\*\fldinst { TOC \\o "1-3" \\h \\z }}{\fldrslt {1.India\tab 1}}}} This is because the HYPERLINK is written into m_aRun but the TOC into m_aRunText. Interestingly StartRun() asserts that m_aRunText should be empty, so we don't try to change StartURL() to write the HYPERLINK into m_aRunText. The only function that moves text from m_aRunText to m_aRun is EndRun(), so wrap the TOC field in StartRun()/EndRun(). This breaks the export of the ToX to DOCX because a mysterious SDT is no longer written around the field but only the field result, so only do this for RTF. Change-Id: I22e45c4a9c9ce6edb2b9114b4a29b2a373ec3284 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86860 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-02tdf#129605 rtfimport: deduplicating borders loses informationJustin Luth3-0/+92
Because at least ONE direct attribute still existes, that SPRM overrides the style SPRM, and therefore the style contents are ignored. But deduplicating has removed the matching parts from the paragraph, so any children properties that match the style revert to default values. In this unit test, only the green border-color was kept, and so a default none-border was created. The UI in writer also directly applies all border properties during a color change, so further style changes in the border-style or thickness no longer have any effect. So there is no reason to try to deduplicate border stuff. UNRESOLVED PROBLEM NOTE: If deduplication is going to happen, then there needs to be a merging of character style child attributes and the directly applied properties - which in practice is the same as not deduplicating at all. (The problem will still come when the paragraph ONLY redefines the border color - then there is nothing to deduplicate and still the style contents are ignored.) This patch affects paragraph-style borders (in a good way), since it fixes tdf#129631 as well. Probably every SPRM that expects children should just avoid deduplication... UNRESOLVED PROBLEM NOTE: Another problem is that the direct properties themselves do not seem to be deduplicated. In addition, deduplication happens against the FIRST instance of the property, not on the LAST instance (which ultimately is the winner). Change-Id: I97333fba66db5cfb5238de426821fe458def329b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85868 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-12-20tdf#129513: drop incorrect and redundant erasure of paragraph sprmMike Kaganski2-0/+15
It was introduced in commit 2499397cb39330dabeb8b7b3e0d7eb6213a0d8f4 "avoid sending duplicated paragraph flags", and supposedly was meant to avoid having duplicating sprms in the collected properties, when new properties were pushed back at that time. Using specific sprm id was likely a mistake (nParam should have been used instead). Now the new sprm is added using RTFSprms::set with eOverwrite having default value of RTFOverwrite::YES, which takes care to avoid dupes, so the call to erase is redundant. This reverts commit 2499397cb39330dabeb8b7b3e0d7eb6213a0d8f4. Change-Id: Ied19f6feb41bd17ef317812d4d295ca0542a5843 Reviewed-on: https://gerrit.libreoffice.org/85602 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-12-17Fix typosAndrea Gelmini1-2/+2
Change-Id: I54554165cc0df1b1f7902e467f0ba6480f4882e3 Reviewed-on: https://gerrit.libreoffice.org/85313 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-12-17tdf#128320: RTF export: do not write shape attrs for postponed shapeVasily Melenchuk2-0/+25
If graphical object is postponed (here stored in m_aRunText for later writing) it is wrong to write shape attributes right now. Anyway they wll be written during shape output in a correct destination. Change-Id: I1835485870648d4f1e363d34a3f58e390672442f Reviewed-on: https://gerrit.libreoffice.org/85227 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-12-04tdf#128428 RTF: switch off longer space at \dntblnsbdbLászló Németh2-0/+37
The Word 6.0 (Japanese) compatibility option \dntblnsbdb switches off the balancing of SBCS/DBCS characters, including the longer space sequences. Note: using \dntblnsbdb, it will be possible to set normal (short) space sequences in RTF export, too, to avoid broken document layout during RTF round-trip. Fix regression from commit 24b04db5a63b57a74e58a7616091437ad68548ac (tdf#123703 RTF import: fix length of space character sequence). Change-Id: I5ade9e0a2db0bde204d1debe831058045fd8f586 Reviewed-on: https://gerrit.libreoffice.org/84397 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
2019-12-03Adapt CPPUNIT_ASSERT to C++20 deleted ostream << for sal_Unicode (aka char16_t)Stephan Bergmann1-1/+1
<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1423r3.html> "char8_t backward compatibility remediation", as implemented now by <https://gcc.gnu.org/ git/?p=gcc.git;a=commit;h=0c5b35933e5b150df0ab487efb2f11ef5685f713> "libstdc++: P1423R3 char8_t remediation (2/4)" for -std=c++2a, deletes operator << overloads that would print an integer rather than a (presumably expected) character. But for simplicity (and to avoid issues with non-printing characters), keep printing an integer here. Change-Id: I751b99ee32d418eb488131ffa130d6f7d6d38dc7 Reviewed-on: https://gerrit.libreoffice.org/84348 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-19sw: RTF export: fix invalid RTF for shapes and text frames againMichael Stahl2-0/+134
It turns out that commit 4652b911c4376048a452709c953197e1a879a921 wasn't quite right: writing out the m_aRunText doesn't necessarily put it in the right place, it just happened to work on that bugdoc but in other cases the shape may be written before the paragraph properties of the paragraph it's in... So instead change the text frame case to save and restore the run related buffers and members, so that the text frame itself can do whatever it wants, and the result is appended to m_aRunText. The members saved are a superset of those saved in WriteHeaderFooter_Impl(), writeTextFrame(), TextFootnote_Impl(). Also another thing was missing is that OLE objects would trigger the assert because they are also buffered into m_aRunText, e.g. ooo46760-1.odt. Change-Id: Icc6988f8ed19724c593760df46e0254792cd1735 Reviewed-on: https://gerrit.libreoffice.org/83105 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-11-11tdf#128428 RTF: clean-up for longer space sequence modeLászló Németh5-0/+168
Fix regressions from commit 24b04db5a63b57a74e58a7616091437ad68548ac (tdf#123703 RTF import: fix length of space character sequence). It seems, longer space sequence is an obsolete RTF-only feature, eg. new RTF documents created in MSO don't use it, but old RTF documents still keep their layout (only in RTF). - Only old-style (without \stshfdbch) or compatible (\stshfdbch31505) RTF documents get longer space sequences using a one-time conversion; - because Writer always exports old-style RTF documents, to avoid of enlargement of space sequences of new-style RTF documents later, RTF import doesn't modify the RTF documents saved in Writer (checking \generator); - text in monospaced font "Courier New" doesn't get longer space sequence (despite its \prq2 (not monospaced) font setting). Change-Id: I308ab06db57a2db5deec1d4c4573da3317cad8e9 Reviewed-on: https://gerrit.libreoffice.org/82145 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-11-09tdf124367 DOCX import: fix rounding error in table cell widthsBakos Attila1-1/+1
Follow-up of commit 29cbbad64088354425c606f9eb6c267bdf7731dc (DOCX import: fix rounding error in table cell widths), its revert in commit e502463fa9a601963aa9f5a8783eb1318de36c13 (tdf#123104 DOCX import: fix lack of vertical merge due to rounding) and commit 44e44239de35c1548809c96e13bfa9d64c7ca441 (tdf#120315 DOCX import: fix cells merged vertically). Change-Id: Id85e8fd25dba26af77fe2fd3024db2ae834b5052 Reviewed-on: https://gerrit.libreoffice.org/82072 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> Tested-by: Jenkins
2019-11-07sw: convert remaining uses of DECLARE_RTFIMPORT_TEST()Miklos Vajna2-4/+8
See commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd (CppunitTest_sw_rtfimport: convert one testcase to use CPPUNIT_TEST_FIXTURE(), 2019-11-05) for motivation. Change-Id: Icef8d75ac759480e841363142c474b95544bcf0e Reviewed-on: https://gerrit.libreoffice.org/82176 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-10-28loplugin:stringadd improve detectionNoel Grandin1-2/+1
if one side of the expression is a compile-time-constant, we don't need to worry about side-effects on the other side Change-Id: Iee71ea51b327ef244bf39f128f921ac325d74e2b Reviewed-on: https://gerrit.libreoffice.org/81589 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-08-24tdf#123703 RTF import: fix length of space character sequenceLászló Németh2-0/+42
A default RTF space character is longer by an extra six-per-em space in a space sequence. To get the same layout of documents formatted with consecutive spaces, insert six-per-em space before every space in a space sequence. Extra spaces are removed during the RTF export. Note: This is a workaround to get the same layout in documents based on RTF templates, often used for example by bussiness applications. Instead of adding a new RTF specific core/text layout feature, with this workaround the layout will be compatible with ODT and DOCX documents, too. (In contrast, MSO's DOCX export messes up the document layout silently, shortening the length of the space sequence.) Change-Id: I620807e1d4497e86c18732e5aa3131cf817ed94a Reviewed-on: https://gerrit.libreoffice.org/77172 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
2019-08-23RTF filter: handle tbrl section text directionMiklos Vajna2-0/+15
Makes no sense to support btlr, Word can't handle it. (UI is disabled.) Change-Id: I036a1e98e8b1ac07e688eedf45b4a2c21c4a8859 Reviewed-on: https://gerrit.libreoffice.org/77986 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-08-15sw btlr writing mode: RTF filter of Writer textframesMiklos Vajna2-0/+11
Both import and export needed fixing. Change-Id: Ie1728c3e67d8637e3720748d7f61a69c058eafe3 Reviewed-on: https://gerrit.libreoffice.org/77474 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-13RTF filter: add redline insert/delete testcaseMiklos Vajna2-0/+44
lcov points out these were not covered previously. Change-Id: I469fab797b2935b36c06eb8854061b81faf2dbcf Reviewed-on: https://gerrit.libreoffice.org/77372 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-09sw qa: fix typos in rtfimport/export testsMiklos Vajna1-1/+1
This doesn't matter in practice, since both tests inherit from the local "Test" class, which has the correct filter name; it was just misleading. Change-Id: Ie5f2e0a89a31b56abc200a1270b4b65e870fb459 Reviewed-on: https://gerrit.libreoffice.org/77198 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-08-06tdf#126309 RTF import: fix not needed para adjust swap for bidi textMiklos Vajna2-0/+17
Regression from commit 4ee2a882dddb395a816cd54004b634d57cfb2446 (tdf#86182 RTF import: fix handling of \rtlpar, 2015-04-17), now that we don't ignore \rtlpar, it turned out that dmapper should not do paragraph alignment left/right swapping for RTF. It seems this is needed for DOCX, but not for legacy DOC/RTF. See how SwWW8ImplReader::Read_Justify() doesn't do this, either, so this is one of those rare cases when dmapper has to know if the token stream is generated by the DOCX or the RTF tokenizers. Change-Id: Ibd52e3dc9e782e1d985418085b82b2e2628bc1dd Reviewed-on: https://gerrit.libreoffice.org/76995 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-02Fix typosAndrea Gelmini1-1/+1
Change-Id: Ie183c445bf8a545f59aac7b0e29f72ab679a6cf3 Reviewed-on: https://gerrit.libreoffice.org/76852 Tested-by: Jenkins Reviewed-by: Andrea Gelmini <andrea.gelmini@gelma.net>
2019-08-02sw btlr writing mode: RTF filter of Writer tbrl textframesMiklos Vajna2-0/+11
Fix both import and export. Values 1 and 3 seems to be the same. Accept both on import, but write 3, as DOCX only has a single value and Word uses 3 when doing DOCX->RTF conversion. Change-Id: Ic5420091ffee9eb20c6aaac61a127e93289aa9fe Reviewed-on: https://gerrit.libreoffice.org/76823 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-01Fix typosAndrea Gelmini1-1/+1
Change-Id: I2238961a7b124652e90e948e27a6ca9d98dc54ac Reviewed-on: https://gerrit.libreoffice.org/76826 Tested-by: Jenkins Reviewed-by: Andrea Gelmini <andrea.gelmini@gelma.net>
2019-07-23RTF import: add tests for RTF_TLMDOT/HYPH/TH/EQMiklos Vajna2-0/+37
lcov points out these were not covered previously. Also, Word maps TH to underline and EQ to nothing, so do the same. Change-Id: I994f78cbe1c6c2edec73edc8944f739e2a7cb8d8 Reviewed-on: https://gerrit.libreoffice.org/76144 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-07-20loplugin:referencecasting in swNoel Grandin4-51/+37
Change-Id: Ib5de4377b22815ba718559ff6fcfd6ab5a0547a6 Reviewed-on: https://gerrit.libreoffice.org/75999 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-07-16RTF import: add tests for RTF_PGBRDRT/L/B/RMiklos Vajna2-0/+21
lcov points out these were not covered previously. Change-Id: I0211cc35be99bf2487c73b4e63889a2af56d02c2 Reviewed-on: https://gerrit.libreoffice.org/75661 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-07-05Enable many more unit tests on all archsJan-Marek Glogowski1-4/+0
This depends on commit "Make font-based unit test depend on instdir fonts, not that it's sure that this really fixes the problem, as its origin is really unknown. It especially enables all the font-based tests I could find on all archs. Same for many more test where I couldn't see any reason they don't work generally. To get rid of even more ifdefs, it moves these from the class to the functions, so there is actually just one needed for any test. As a result some few tests run but do nothing. There is still some problem with embedded fonts on MacOS and with delayed graphics loading on Windows, so these ifdefs are kept. Change-Id: I63f8424e9debda6cbf3e5777c93245e09f8eb0f2 Reviewed-on: https://gerrit.libreoffice.org/74719 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2019-06-25improve loplugin:simplifyconstructNoel Grandin1-1/+1
Change-Id: If863d28c6db470faa0d22273020888d4219e069e Reviewed-on: https://gerrit.libreoffice.org/74559 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-06-06tdf#125719 sw: rtf: refactor associated character propertiesSerge Krot3-0/+266
1. \rtlch, \ltrch should be placed before their properties. 2. Do not mix associated and normal character properties in output. 3. Do not output empty "\rtlch \ltrch", "\ltrch \rtlch" pairs. 4. Handle associated character properties runs instead of handling separately their parts without order of them. Change-Id: Ibbf7365d04708682a5f1eb664a579c60a47465d2 Reviewed-on: https://gerrit.libreoffice.org/72578 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-04-21Fix typosAndrea Gelmini1-1/+1
Change-Id: I926fa0c4345ff0acb9b9bc870243f4f007aac660 Reviewed-on: https://gerrit.libreoffice.org/71032 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
2019-04-18tdf#42949 Fix IWYU warnings in sw/qa/*Gabor Kelemen4-49/+0
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ia0c79c2455a3b40384332c8c35215671e257a07f Reviewed-on: https://gerrit.libreoffice.org/70847 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-04-15improve loplugin simplifyconstructNoel Grandin1-1/+1
to find stuff like OUString s = OUString("xxx") Change-Id: Ie7ed074c1ae012734c67a2a89c564c1900a4ab04 Reviewed-on: https://gerrit.libreoffice.org/70697 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-04-14loplugin:sequentialassign in swNoel Grandin1-2/+2
Change-Id: Iec56b41dba502e438dfdc7a99385545b3efdf8c7 Reviewed-on: https://gerrit.libreoffice.org/70720 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-04-10writerfilter: implement RTF derived styles defaultingMichael Stahl2-0/+39
It turns out that the situation fixed in commit 1be0a3fa9ebb22b607c54b47739d4467acfed259 also applies to the definition of the styles themselves. To implement the same style import as Word, the style definitions need to be stored twice: once as read from the file, and another time with attributes defaulted and deduplicated vs. the parent style; the second representation is then sent to the domain mapper. To make this easier, add a bool parameter to cloneAndDeduplicate() to disable the implicit pPr dereferencing that happens when creating the hard formatted paragraph properties (this could potentially be cleaned up further if those paragraph properties would use pPr wrapper themselves). Also implement defaulting of line spacing in getDefaultSPRM(). Change-Id: I4810e917697b3af244e5dbdd7f5a45b4767c93fc Reviewed-on: https://gerrit.libreoffice.org/70320 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-04-05sw btlr writing mode: implement RTF exportMiklos Vajna2-0/+27
Note that we can't work with the table box (and frame format) of pTableTextNodeInfoInner in RtfAttributeOutput::TableVerticalCell(). This is because cell definitions are written in RtfAttributeOutput::TableDefinition(), and the loop only calls setCell(), i.e. the cell index is updated in the node info, but the table box is not. Import was already working as-is. Change-Id: Ia089c42b3a49f1a8f012a8cadaa8bcad16128c3e Reviewed-on: https://gerrit.libreoffice.org/70269 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-03-25new loplugin:unoqueryNoel Grandin3-13/+16
look for places we are doing code like: Reference<XProperty>(model, css::uno::UNO_QUERY)->getAsProperty() which might result in a SIGSEGV is the query fails Change-Id: I5cbdbc9e64bd0bed588297c512bf60cbacb9442e Reviewed-on: https://gerrit.libreoffice.org/69044 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-03-12tdf#123104 DOCX import: fix lack of vertical merge due to roundingMiklos Vajna3-4/+4
Regression from commit 29cbbad64088354425c606f9eb6c267bdf7731dc (DOCX import: fix rounding error in table cell widths, 2014-11-07), which changed truncation to rounding for the twips -> 1/10000th of relative width conversion during import, but left export unchanged. But adapting the export is not that easy: one part would be the std::unique() call in WW8TableNodeInfoInner::getColumnWidthsBasedOnAllRows() to not require exact comparison, but doing so has it own side effects (multiple failing tests). So just revert the mentioned commit, as a minor rounding error is much better than a broken vertical merge. And once it's clear how to adapt export at the same time, this rounding on the import side can be re-introduced. Change-Id: I9e01ea5cc2c2f8aabe1e21cb8118c9c0e2c45494 Reviewed-on: https://gerrit.libreoffice.org/69065 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-02-26tdf#123393 RTF import: fix too big font size in table cellMiklos Vajna2-0/+27
The reason was that A2 had an explicit paragraph style reference, but A1 did not, so table buffering caused A2 style to affect A1 style as well. Combine this with style deduplication, and then A2 style considered the direct formatting (font size) in A1 to be redundant, so it was lost on import. Fix the problem by moving the copy&pasted properties buffering to a single function, and there buffering not only the properties, but also the active style index. Change-Id: I99f2020b8bef237849fd622b25ac5ef0516d69e4 Reviewed-on: https://gerrit.libreoffice.org/68361 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-02-21tdf#123434 FILEOPEN: RTF: missing content in cellsLászló Németh2-32/+0
Revert "tdf#122424 RTF import: ignore table row text outside the cells" This reverts commit dc8fa612054363e1a871b0e413a59889fbdb156a. Change-Id: Id68dc7ae55df013de64fb2d4955a412e4c046781 Reviewed-on: https://gerrit.libreoffice.org/68086 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 13:01:12 +0000