summaryrefslogtreecommitdiff
path: root/sw/qa/extras
AgeCommit message (Collapse)AuthorFilesLines
2013-12-03Related bnc#837302: Don't introduce a redlined delete and the end of doc.Jan Holesovsky1-0/+11
Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I5c3903a40b69867684707d33acbc92b1f80a93ec Reviewed-on: https://gerrit.libreoffice.org/6898 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-12-03bnc#837302: Allow insertion of redlines with an empty author.Jan Holesovsky2-0/+13
No idea why that was not allowed (since the initial import in 2000), we need it for interoperability. Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx sw/source/core/doc/docredln.cxx Change-Id: I475fa63f9a4a3219a2b898b6f7d81e0603d32c18 Reviewed-on: https://gerrit.libreoffice.org/6897 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-11-11fdo#70812 writerfilter: check for nullptr after dynamic_castMiklos Vajna2-0/+8
Happens when we set "no number" in the default para style, which is already the case for Writer anyway. (cherry picked from commit 660d761bfeea81c0b76cf08b4c961a2ad8d09a06) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I3b262e633e52e4aae039c55d6edb744e36f0f354 Reviewed-on: https://gerrit.libreoffice.org/6636 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2013-11-08cp#1000015 DOCX export: fix not-well-formed XML on redline end + hyperlinkMiklos Vajna2-0/+9
(cherry picked from commit 7813bd3113beb2b2860f9eb213c5c67ef54f5bf0) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I3a87a0277952ba0a422df8988151f8b14e166e06 Reviewed-on: https://gerrit.libreoffice.org/6606 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-21fdo#70221 fix RTF import of multi-group picturesMiklos Vajna2-0/+10
Pictures typically have a single RTF group, so we imported them at the end of that group. Though multiple inner groups are also allowed, so make sure we only do the import at the very end, instead of at the end of all inner groups as well, resulting in multiple (fake) pictures. Regression from 13c00ce322e78eb4e0f50ab84ded19cd6aae1ded (Enable the writerfilter-based RTF import in non-experimental mode, 2011-08-18). Change-Id: Id895b2c6d3b824d09d89bfa01ce59aba76c55d42 (cherry picked from commit a35fa8d8b127cb23ebff3952291742bf28477c74) Reviewed-on: https://gerrit.libreoffice.org/6361 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-09bnc#779620 DOCX import: try harder to convert floating tables to text framesMiklos Vajna2-0/+10
Since 78d1f1c2835b9fae0f91ed771fc1d594c7817502, we convert floating tables to text frames only in case it's possible that there will be wrapping, to give better results for multi-page tables, which are multi-page, and technically floating ones, but that has no effect on the layout. The problem was that we try to do this decision too early, effectively the page width and margins were counted from the default letter size, instead of the actual values, which did not arrive at the time of the decision. Fix this by moving this logic at the section end. (cherry picked from commit bbef85c157169efa958ea1014d91d467cb243e6f) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx Change-Id: Ic1fbceb54c8ec223ed01836fafe6220bb3b2410a Reviewed-on: https://gerrit.libreoffice.org/6104 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-04fdo#69384 fix impress -> writer copy&pasteMiklos Vajna2-0/+31
Regression from 2ade07126971b79c92f729fae5709f2e2e2b495c (fdo#62044 RTF import: don't overwrite existing styles when pasting, 2013-06-04), during paste, if existing style was found, then the intention was to skip that style, but instead we tried to create one. (cherry picked from commit 5ebe826caf75e8d00656b3333385bf0bbc05cb27) Conflicts: writerfilter/source/dmapper/StyleSheetTable.cxx Change-Id: I83adaf9fe6b8a578fa60c21b9463fabde7707d7e Reviewed-on: https://gerrit.libreoffice.org/6126 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-09-30fdo#66743 fix import of some RTF_CLSHDNG valuesMiklos Vajna2-0/+15
This should be in sync with model.xml, got broken when the somewhat random values got fixed to be the same as the ones which are in the ww8 spec. (Regression from 26d40686128e70916a636e20f5ccc5763bbb6cc8.) (cherry picked from commit 21e07d473d1ce995ca0f1d0ac0edb03e75a7dfc1) Conflicts: sw/qa/extras/rtfexport/rtfexport.cxx Change-Id: Id62047e0b2d5d8402a7c8bce95de487afe627e32 Reviewed-on: https://gerrit.libreoffice.org/6091 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-09fdo#68291 RTF paste: don't set PageDescName during pasteMiklos Vajna3-0/+30
In general, paste should not deal with page styles. In this case, it even caused an additional page break. (cherry picked from commit b226dcb50d6728b62f39c9fa2e016724324944e3) Change-Id: Ia7c5a9ad844821b6622babfbd94469ec3c04cf0a Reviewed-on: https://gerrit.libreoffice.org/5883 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-09bnc#779642 VML import: groupshape-related fixesMiklos Vajna4-0/+36
1) fix TextHorizontalAdjust when layout-flow is vertical The shape had no special properties about hori/vert text adjustment, so it should be hori left / vert top. Then it has vertical layout-flow, so vert should be top and hori should be right (vert was center). 2) import result of sdt fields We can't have e.g. placeholder fields on drawinglayer rectangles, but at least the result of the field is now imported. 3) handle drawinglayer rectangle inset 4) handle drawinglayer rectangle char spacing (cherry picked from commits b10afb26296e33c77e94a6eda3f2c36c4d34c2aa, 3847de4b724f4f435bb68bceef9a5e187c3f363c, 870a2394a87c77740daf41e1aa81b130113f8e00 and 4cbc41bc4eaa822829e68c1ee11eafe834bb7da7) Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a Reviewed-on: https://gerrit.libreoffice.org/5847 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-06fdo#68607 bnc#816593 DomainMapperTableHandler: don't always start a frameMiklos Vajna2-0/+10
This is a port of commit 8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de "Related: fdo#61594 SwWW8ImplReader::StartApo: don't always start a frame" from the WW8 filter to the DOCX one. (regression from edc4861a68e0269b83b17e0ec57912a1ce4220ad) (cherry picked from commit 78d1f1c2835b9fae0f91ed771fc1d594c7817502) Change-Id: If1bb4a8a3786aacd618585cf859b57ce9be85c51 Reviewed-on: https://gerrit.libreoffice.org/5788 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-06bnc#816593 DOCX import: ignore page breaks in tablesMiklos Vajna2-0/+11
(cherry picked from commit 7d3778e0ef9f54f3c8988f1b84d58e7002d6c625) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx Change-Id: Ibb250148d41d1929fa17dd993bb71c93c0e09dcf Reviewed-on: https://gerrit.libreoffice.org/5787 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-06bnc#816593 DOCX filter: import paragraph spacing from table styleMiklos Vajna2-0/+11
(cherry picked from commit 17e904ed66c3caf87e658b9d3a18d7b13f4a0b52) Change-Id: I9dce59ecd8a2d2bfadb8c7273cd46c6c0cf17774 Reviewed-on: https://gerrit.libreoffice.org/5786 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-06bnc#816593 DOCX import: fix auto table width wrt nested tablesMiklos Vajna4-0/+44
This is a backport of the fix + 3 other commits from master, which were needed to make the testcase pass on -4-1 as well. (cherry picked from commits 74c5ed19f430327988194cdcd6bdff09591a93fa, 824cc4bf4ae9035d4108e8da8e81eb57284f0b54, 53d27a30ce5f2c9f7d37a4089286116854c16215 and 76d1ca523ddcf89cc269fe51c70e66066943ef5a) Change-Id: I62a1f526cf1d4e4056daa1495d61f1b9f5c0b1b2 Reviewed-on: https://gerrit.libreoffice.org/5785 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-03n#816593: docx consecutive tables with different tblpPr needs to be splitCédric Bosdonnat2-0/+11
When importing docx with 2 <w:tbl> following each other, we have 2 possible behaviors: either merge them as one table as we did before or split them into two tables. The tables need to be split if they have different floating position properties. This required the ooxml tokenizer to repeat the table properties for each row of the table: or how would we know we don't need to split the table? The basic idea behind this hack is to temporarily store the table position and table properties before saving them. Thus we can compare them at the end of the row and decide to split the table or not. (cherry picked from commit 173d24a7316fccf0e838f71b92c10a772b19298d) Signed-off-by: Miklos Vajna <vmiklos@suse.cz> Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I2e3e70dfe7386090fe356575ee9d0e81aa031dc4
2013-09-03n#816593: Floating table width import fix: adjust the frame widthCédric Bosdonnat2-0/+4
(cherry picked from commit 9f4c8a8bca06b4c2a916a51909367b453fc41a8b) Change-Id: I8212bc5981418f6cbd514bf5002e6a5dbdf53152 Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-26bnc#834035 DOCX export: fix hyperlinks of illustration indexMiklos Vajna2-0/+63
We used to export raw Writer bookmarks, but that's not valid in OOXML. Instead, it has normal bookmarks around the sequence fields, so use them if they are available. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx sw/source/filter/ww8/docxattributeoutput.cxx (cherry picked from commits 750f0ebf97d19d1cf305dabe72d52ad6e90adf70, e9275c08acc2f4f1c925f78b56a1089515cd9a37 and 8f146a8042dd8f3c88f39f8317372cd9c02ce4ad) Change-Id: I0ef2ff7967c2802b53752c9505ef6db4cc2b8265 Reviewed-on: https://gerrit.libreoffice.org/5635 Reviewed-by: Jan Holesovsky <kendy@suse.cz> Tested-by: Jan Holesovsky <kendy@suse.cz>
2013-08-22fdo#68076 RTF import: default font had priority over the specified oneMiklos Vajna2-0/+27
Regression from 60c17b2873506ed8b068b34840aecda0c1d9bd65. (cherry picked from commit f1e5e271f9aadc2c5e5af3ffae410b6c598e5398) Change-Id: Ie16d611622e6a814d5cbea00c3f992cd9ecba027 Reviewed-on: https://gerrit.libreoffice.org/5579 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-18fdo#44715 RTF import: reset styles in tables on RTF_PARDMiklos Vajna2-0/+52
Commit 4a507f732d82c188ad81b022cbe3037951e58ac3 added an exception to RTF_PARD (reset paragraph properties) handling: when we're inside a table, it should not reset the fact that we're inside a table (which is a paragraph property). However, instead of just re-adding that property, it disabled resetting for all properties, and we had a growing list of exceptions since then. The next thing to add there would be the paragraph attributes, which contains the style information. Instead of growing that ad-hoc list, reset everything again and just re-add the "in table" SPRM. This makes the second and later paragraphs in the A1 cell of the bugdoc have proper font size. (cherry picked from commit b9c1a9b9aa41dbbb6bed0c77f4370ab6105c7fb1) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I2de80894fcd5da3bf45d221af9a04a307c70a29b Reviewed-on: https://gerrit.libreoffice.org/5471 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-12fdo#63428 writerfilter: fix paste of commented text rangesMiklos Vajna2-0/+23
There were multiple problems here: - xFoo->createTextCursorByRange() got a text range argument, where the text range wasn't from the xFoo text - it was assumed that all XText implements text::XParagraphCursor as well, but this is not true for e.g. comment text - commented text ranges were pasted as normal comments (once again, the insert position wasn't passed around) (cherry picked from commit c73b8072a1732f829d3d6ba6c1172d96d55b1c4f) Change-Id: I9a975a08b08a7f32b1ee71e42f58736cc0dbb09d Reviewed-on: https://gerrit.libreoffice.org/5368 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-08-11fdo#53556 RTF import: fix visibility and text wrapping issuesMiklos Vajna3-0/+101
This is a backport of 6 commits from master: - the first 3 are earlier fixes on master, without them the test doc has only 1 shape imported out of 3 (on master, this was already fine) - the next 2 are the real fixes - the last one is the testcase (cherry picked from commits 9d640dc6ad0f0b58fa62b70f78478e2bc8796e69, 2fc088afdf6dcb2defbd462a9e64ba7e53ba5caf, 4ab658b56f5c6ff0082d38d8ace1924d11e30e96, 03f0cbd354646733977e4dec754c0113a5cbc3c9, 9f1f7199736e2ae07b34849ba66f61a1ef5782e8 and aa6959ba2c4ef1b718d8249fd47faaf677b16111) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx writerfilter/source/rtftok/rtfdocumentimpl.hxx writerfilter/source/rtftok/rtfsdrimport.cxx Change-Id: If58376aec31ab00cab19221beed73e8275a834d2 Reviewed-on: https://gerrit.libreoffice.org/5328 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-09bnc#823651 WW8 import: fix paragraph style in empty first page headerMiklos Vajna2-0/+10
The problem was that the first page SwFmtHeader / SwFmtFooter wasn't created in case the header/footer text was empty, even if fTitlePage was set. (cherry picked from commit 4bc063090c06f0c34980a3852f684b42ab25c501) Change-Id: I5e58419161bcc663e2beb0338b95877469e0fd3c Reviewed-on: https://gerrit.libreoffice.org/5314 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-08-08fdo#47440 import RTF_SHPBX/YPAGE for Writer pictures, tooMiklos Vajna2-0/+38
Previously this was only handled for drawinglayer shapes. (cherry picked from commit b755df14a431543f1b70246a5e58830a0a480602) Change-Id: I7ce440a27ebe44fc867b8a7f4ee62217076677f0 Reviewed-on: https://gerrit.libreoffice.org/5303 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-08-07fdo#67498 RTF import: fix missing margins vs continuous section breaksMiklos Vajna2-0/+13
The document had 3 sections, separated by continuous section breaks. Previously only margins from the last section were imported, this way the first page had default margins. Now margins are also applied when we hit continuous section breaks. This way margin values from the last section break affecting the page wins. A later commit could improve this further by setting the minimum of these and setting a section margin for each non-minimal sections. (cherry picked from commit c7884509a84d46a9d99b2950159d949589862f3a) Conflicts: writerfilter/source/dmapper/PropertyMap.cxx Change-Id: I4d9a4585e795220533909bd1d467d933caaa0d71 Reviewed-on: https://gerrit.libreoffice.org/5286 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-07-28fdo#67365 fix RTF import of inherited row props wrt unusual group stackMiklos Vajna2-0/+52
Inheriting row properties (in particular, the number of cells) should be independent from the RTF parser stack, but they were not. Also fix two more problems once the lost rows reappeared: - unequal cell widths were equal - some cells were aligned to center instead of to left (cherry picked from commits 494937776956370eda868f91922c4cff34656050, 986ebb668d45a42bc1e8b744980619857e891ef5, 165cd8332a0844314e698cf59936799676257ea1 and 83e0489217fd4b0fcf3ab62d002257b47e7a6459) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I273d89a0708601a38dd8bda734a72b4c92da2cc4 Reviewed-on: https://gerrit.libreoffice.org/5137 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-25fdo#60990 VML export: handle paragraph/run properties of shape textMiklos Vajna2-0/+15
(cherry picked from commits 1753c4f9f1713ca4a9a1ac3a145269c850eef6fb, 0ffed545adbb8a27a024d4d6a74dcaa8a87ba66a and 94b3ec0597ee21b933d02496402ff0f3a416e6a3) Change-Id: Iaeb7f9826308ea94a036cb4bfa87bf65f0cfe22f Reviewed-on: https://gerrit.libreoffice.org/5094 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-23fdo#64637 RTF import: handle multiple RTF_COMPANYMiklos Vajna2-0/+23
Instead of unconditionally calling addProperty(), first check the existence with hasPropertyByName() and call setPropertyValue() instead, if necessary. (cherry picked from commit bb67e709b70919efb41ec41e93dd92953dc6a003) Change-Id: Ie0a075bbfe6eaa1f66726c456105dcdef9001d30 Reviewed-on: https://gerrit.libreoffice.org/5049 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-22fdo#65632 RTF import: send NS_ooxml::LN_trackchange only once for one rangeMiklos Vajna2-0/+13
The problem was that in case we had {\deleted foo\b bar} then both "foo" and "bar" triggered a trackchange, but "}" only ended one, resulting in overlapping redline ranges. This was cought by core, but caused a performance problem. For the first bugdoc, before: real 3m57.803s after: real 0m3.072s (cherry picked from commits 7c0a1557406ffffbb8145f8035ce86d31e927667, ed187fcbd457d01be6ac382d61b493039a5af7d5 and 54518a209d0ffe00f8e391472da92e398c474392 and 9f7676033585ab3bf352d5dc2ef43a3a9d8d5c46) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx writerfilter/source/rtftok/rtfdocumentimpl.hxx Change-Id: Ibf6f2db30109f0b9a2571d2e4fb3cc76294f68d1 Reviewed-on: https://gerrit.libreoffice.org/4964 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-15fdo#54900 RTF import: support setting para align after textMiklos Vajna2-0/+30
Both Word and Writer typically write all paragraph properties before the first text in each paragraph, but at least for paragraph alignment, it's valid to write them at the end. (cherry picked from commit 431853bfae7dccd139804caf7ac2505a7c283e63) Change-Id: I0337e63678ad45c662a204ab2fc59378607abe74 Reviewed-on: https://gerrit.libreoffice.org/4913 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-11fdo#58577 DOCX export: handle multiple textframes anchored to the same paraMiklos Vajna2-0/+10
Also fixes ~SwIndexReg assertion on closing the document. (cherry picked from commit e5b145a46cd29c9428e6e1894f7b0bb8248a412f) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I7c1a9d3d646f2dacdbced2af355c076c1a1063ec Reviewed-on: https://gerrit.libreoffice.org/4826 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-10fdo#66682 RTF export: fix level text of SVX_NUM_ARABICMiklos Vajna2-0/+46
Even if level text is not ASCII, we should just write the placeholder values (0x00, 0x01, etc.) in a hex encoded form, without Unicode. Regression from 07d01742c69f1c0335bc7e1b57abd8341ce255e7. Also, fix the import side, so the previous bad output now looks bad in Writer as well. (cherry picked from commit 8422d1f5042de08e8b090a907889b41e133bda40) Conflicts: sw/qa/extras/rtfexport/rtfexport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I2f93892006c07eec243ec7dfcb23372d243a2db4 Reviewed-on: https://gerrit.libreoffice.org/4809 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-09fdo#66565 RTF import: don't produce cell widths smaller than MINLAYMiklos Vajna2-0/+47
In case we have a table of a given width and the second (or later) row has fewer cells, we have to add a fake cell to such a row. However, it doesn't make sense to do this when the difference is only a few twips: we can't create such a small frame inside the cell later anyway. Regression from c3b0f13546b30e5db3aecd311c7178e4e0933208. (cherry picked from commit f6a00c88482ec30b61855cb6a95a5ad240b7a517) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Ibc0f02d4184b58bd423c3405e786e1ec25b9dd13 Reviewed-on: https://gerrit.libreoffice.org/4785 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-09bnc#822175 DOCX filter: export wrapping of text framesMiklos Vajna2-0/+12
(cherry picked from commits 3a87ba9725ef7e1e9a15c5b7abda87d36c9dc614 and 00d8a4071628a88465f13d2e860ccd87c3a85b9e) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I5c5128686e96a97570b8cdf109dd75976a071ca8 Reviewed-on: https://gerrit.libreoffice.org/4772 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-08fdo#39001 RTF import: fix fake empty page at the end of the docMiklos Vajna2-0/+30
In case we have a \sect, there was no \sbknone (so it counts as a page break as well) and there is nothing after it, we should not make extra efforts to make that have some effect, but adding at least one empty paragraph to that new page. (cherry picked from commit 4108f285207ed4a60c8876a8206bc5f2d7f05620) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Ibcbecabcb590ed34ef96a97698e4ab8f638d3483 Reviewed-on: https://gerrit.libreoffice.org/4737 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-04bnc#820504 VML import: don't anchor shapes TO_PAGEMiklos Vajna2-1/+7
In theory, this is a problem because Word formats only support AT_CHAR and AS_CHAR, so importing something as AT_PAGE is buggy. In practice, this also leads to unvisible shapes, since f0d001a378c64ea457e722266e60c96522c72e9b. Change-Id: Ie730d67a789ef12734cede1f9b6c27764a66f237 (cherry picked from commit f5b7acac624f07fa95835b6054b8d295901bb1dd) Reviewed-on: https://gerrit.libreoffice.org/4716 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-02fdo#46361 oox: fixes for the VML import of groupshape textboxesMiklos Vajna2-1/+24
(cherry picked from commits b1f78c44c1acc246f06a963383232c9bf649a06b, f24e4c74d7d6a7d95090c6fa6a584fed7787706c, 6bf79576aeca243db553ed3b5eade492dc35337b, 5a737fca37cd5a5f90aa03a30688d447677d3b8a, ef53d4aec2a3d690de2c7cdaf73ca95bbe29a433 and 2a2105b002c482e6536d5c3046c9e7783c0cdca3) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Ie7ce4fb5c32ff4b3c1f3d7ee92d8358ae67fc6c1 Reviewed-on: https://gerrit.libreoffice.org/4675 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28bnc#823655 fix RTF import of freeform shape coordinatesMiklos Vajna2-0/+74
E.g. 0,1 was imported as 1,0, as we did not differentiate between not having the coordinate yet and having it as zero. Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4 (cherry picked from commit ddddfe8d6ffa05c467bddb3480e43d7043a3d3c9) Reviewed-on: https://gerrit.libreoffice.org/4483 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28bnc#823655 RTF import: ignore styles without a typeMiklos Vajna2-0/+22
Regression from 29dcdf6b56f8dbc1b7de0478afb04122f8dbf0f9. Change-Id: I970c0e7b3652d7e6f093815b90e04e0c45904b28 (cherry picked from commit c6a941b51b68eb097d4d43323b39ff1aba4c753e) Reviewed-on: https://gerrit.libreoffice.org/4482 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28SwModelTestBase: fix for leaking temporary filesMiklos Vajna1-0/+2
This alone pushes down the number of created /tmp/lu* from 527 to 2 after a single run. Regression from 9b53538a076a2370df975655c8579dfe09cff09b. Change-Id: I5ea2e3da0b89223fb32469af3d59a2a3b246d00f Helped-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2013-06-23fdo#43641 testcaseMiklos Vajna2-0/+13
Change-Id: I3426c7c23eb23fa7f91320ac036b0eb565bbc330 (cherry picked from commit abfcf7b958afb16a0e68525cefca5813ce7135eb) Reviewed-on: https://gerrit.libreoffice.org/4424 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-18bnc#825305 RTF import of fFilled shape propertyMiklos Vajna2-0/+90
(cherry picked from commit b08743d3c4381a77eee6e123230fb423acfbc116) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfsdrimport.cxx Change-Id: Iaa2ff9d5d1a28aec046f885acecbd1a44c734ec0 Reviewed-on: https://gerrit.libreoffice.org/4345 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-06-18added unit test for n#820504Cédric Bosdonnat2-0/+12
Change-Id: I804e081a564d24d3896160f817051b19da884c34 (cherry picked from commit f9610ed634318c27382d79089d022fb8175eb90a) Reviewed-on: https://gerrit.libreoffice.org/4330 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-06-07bnc#820788 VML import of v:textbox's mso-fit-shape-to-text style propertyMiklos Vajna2-0/+12
Change-Id: I74a0ecd50ca61a4f5bf7ebdbf12743dc1fd9368a (cherry picked from commit a22ef599bd3fdcf0bd5c3616aa566a5922624ff3)
2013-06-06wwSectionManager: fix import of page bordersMiklos Vajna2-0/+11
Regression from 1e113cb7604e1509e7d598a9be329f1f7b6e9322. According to the spec (see 2.9.181), the first bit disables border of "all but first" pages, the second bit disables the border of first pages. Change-Id: Ie49c9b7b76d34c2a93350481965790976f49d7df (cherry picked from commit f06cc552a0699f7c2c34db981e77d4c8efe5e9e7)
2013-06-05bnc#820509 testcaseMiklos Vajna2-0/+19
(cherry picked from commit a9e0ec2b87a99c93b77a210a916b4df44ece454a) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Iee9909e9c42014ab10ceaa2f8f8e554c25e89157
2013-06-04fdo#62044 RTF import: don't overwrite existing styles when pastingMiklos Vajna3-0/+28
(cherry picked from commit 2ade07126971b79c92f729fae5709f2e2e2b495c) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I80a83caebc8fa3f038cf2ff080c6c6ec8e93fb70
2013-05-30bnc#817956 page border shadow testcaseMiklos Vajna2-0/+12
Change-Id: I1ded79d89dcceb3bae5926a2f217cde8bf6aa830 (cherry picked from commit 300ba1a171a37da08d72e278cf38988f1225cc83)
2013-05-30bnc#817956 v:textpath VML import testcaseMiklos Vajna2-0/+26
Change-Id: I4c4c3a84e8d9d048262e6570a8bed0106e8d184f (cherry picked from commit 8931c8f3c58afe35b5b7c98e136825aff04291e3)
2013-05-27bnc#817956 DOCX import of document background colorMiklos Vajna2-0/+9
See wwSectionManager::SetSegmentToPageDesc(), this has to be applied to every page style. Change-Id: Iea2707ae665a55eabda3ed7575cf3658f7af5237 (cherry picked from commit 992da0d5cf04497bad55637f6a6ebfcdaec03e16)
2013-05-27testcase for bfb93ffc6d72d22a833acf9d8c9d166153dad7c0Miklos Vajna2-0/+11
Change-Id: If61739d54cb2572f20b118a2cf56ab2bd0f306e5 (cherry picked from commit ec8e012e980c88c8f24a7de44e44d0319bae2801)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 19:33:47 +0000