Age | Commit message (Collapse) | Author | Files | Lines |
|
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>
|
|
(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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
(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>
|
|
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>
|
|
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>
|
|
(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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
(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>
|
|
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>
|
|
Change-Id: I74a0ecd50ca61a4f5bf7ebdbf12743dc1fd9368a
(cherry picked from commit a22ef599bd3fdcf0bd5c3616aa566a5922624ff3)
|
|
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)
|
|
(cherry picked from commit a9e0ec2b87a99c93b77a210a916b4df44ece454a)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: Iee9909e9c42014ab10ceaa2f8f8e554c25e89157
|
|
(cherry picked from commit 2ade07126971b79c92f729fae5709f2e2e2b495c)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I80a83caebc8fa3f038cf2ff080c6c6ec8e93fb70
|
|
Change-Id: I1ded79d89dcceb3bae5926a2f217cde8bf6aa830
(cherry picked from commit 300ba1a171a37da08d72e278cf38988f1225cc83)
|
|
Change-Id: I4c4c3a84e8d9d048262e6570a8bed0106e8d184f
(cherry picked from commit 8931c8f3c58afe35b5b7c98e136825aff04291e3)
|
|
See wwSectionManager::SetSegmentToPageDesc(), this has to be applied to
every page style.
Change-Id: Iea2707ae665a55eabda3ed7575cf3658f7af5237
(cherry picked from commit 992da0d5cf04497bad55637f6a6ebfcdaec03e16)
|
|
Change-Id: If61739d54cb2572f20b118a2cf56ab2bd0f306e5
(cherry picked from commit ec8e012e980c88c8f24a7de44e44d0319bae2801)
|
|
Change-Id: Ief71ba9a3c60356714e73d08e88d0a3105b17b1a
(cherry picked from commit b40fe8e5a5037d2745cc7b1c9cc408ce6c79b9d9)
|
|
Change-Id: I4a318274f4b4175af1d4108484670eef9af9684c
|
|
Change-Id: Ie36d5881b0ebe8c38526690ca27d02bfb7af7829
|
|
|
|
Change-Id: I37df8d6d5cbc9b37fa03681e8dc32a4926cd42a9
|
|
This always worked, but I almost broke it with
8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de.
Change-Id: I6b7817830da23afea758d1eb90395aeb01e32f67
|
|
Make sure that at least full-page-width multi-page floating tables are
imported on multiple pages.
Change-Id: Ifb974d50c50b1495634ac2652a3ae46235bb5f52
|
|
Change-Id: Ibdb06d50ca79b2882ad7bd984e30beb09e7c7b95
|
|
Change-Id: Ia4d6a4a2b6277fee6f59fa9407f9cf868ad0f1ce
|
|
The motivation is that if -- after fixing a crash -- the document looks
OK, then all the paperwork in the ooxmlimport isn't necessary, just drop
in the file to qa/core/data/ooxml/pass/, and we're done.
Change-Id: I2287189bd3c49c5e53489f9d89a6341685359b33
|
|
Change-Id: I4d8b1b527d5099781a36cc1265318c167205340e
|
|
Regression from 1348288905ffa75d3634eee4392ba4660d28cdb9 (mismerge, I
guess), when header was enabled, actually empty footer was exported,
even in case footer was disabled.
Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a
|
|
Change-Id: Ia888670ad7a5b51c9b6a3d05676b192456311704
|
|
Also factor out the w:sdt-related methods to a helper class to avoid
DomainMapper_Impl become a God object.
Change-Id: Ic1a388940bce89688e8558818f92ce9ac997609c
|
|
Turns out this depends on not doing layout, and so is a real corner-case.
Change-Id: If9d2db6b1a0df94fc809fb353f2dbf2cf9ac1c9a
|
|
|
|
commit f837c4288cdae4921b3fb6747ba2e2cd5ce2dcd2 moved the handling of
w10:wrap tag in oox, but thus no wrapping was imported any more.
The fix consists in letting the w10:wrap element be handled by writerfilter's
dmapper if the shape has already been retrieved from oox (which is the
case for textboxes). In other cases, make sure that we don't set the
Surround property once again in writerfilter as that would override what
has been done in oox.
(cherry picked from commit 51d5e90b7c09cb980bc72a2c6b1a65303ef15ea2)
Conflicts:
oox/inc/oox/vml/vmlshape.hxx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I8ab158641afcf6b9945c52238e7f5adb9e8b3adf
|
|
Change-Id: Id7cb705b2b719cdd3bf16b8aba858c0319686599
|
|
Change-Id: Ie8c3d30cb28afb97d4ded4ac67241ed18ab9e50c
Reviewed-on: https://gerrit.libreoffice.org/3651
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
|
|
Change-Id: I04d9988ab2035ec2d68fac19f506a6b461e4d257
|
|
...which lead to std::unoexpected from sw/PythonTest_sw_python.
Change-Id: I94bdbbe131a7c65c363f7aa66e8d8df7bd531449
|
|
Change-Id: Ia0d3f1d12c53e8d7ce0da55977867d5ab932c92f
|
|
Change-Id: Ib7ef29354f5d43abd9e67745dd6d3fccaec8612e
|
|
Already worked around.
This reverts commit f853a20839ab08244dc1b3b1c881822bd593bc04.
|