Age | Commit message (Collapse) | Author | Files | Lines |
|
Regression from commit 2b78f2cd7b9e4bab0f3b3b9119238f36a1bbc7b2 (rhbz#988516:
DOCX import: fix context stack when importing header/footer, 2014-03-05),
though that just made an existing Writer layout problem visible.
RTF/WW8/newer (drawingML) DOCX import doesn't have this problem, as those
import pictures as sw graphics, not draw ones.
<w10:wrap type="through"/> is normally mapped to our page wrap (as it uses
"through" in the "not only wrap around, but also in the holes of the shape, if
it has any" context, not in our "text should go through it, so no wrapping"
one), but for some reason in this case (most probably due to the extreme large
negative margins) Word handles the situation as our through, i.e. the text
should not go to the second page, as it would normally happen with a "Word
through" wrapping.
Work around the strange situation by ignoring the wrapping request for extreme
top margin values.
(cherry picked from commit 37b5f1ed3139b8569bfec0fcb5077f6b66b79acd)
Conflicts:
oox/source/vml/vmlshape.cxx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I20555b1fa7a769e20c40a3a5ff3873807403e937
Reviewed-on: https://gerrit.libreoffice.org/20212
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Unknown names make the formula fail
PythonTest_sw_python, especially set_expression is ok
Variables are taken into account
Thanks to Mike Kaganski for his help on this patch.
Change-Id: Ia6f9c54d90ce88138fd9c9df9422b34ce8223ca2
Reviewed-on: https://gerrit.libreoffice.org/20122
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com>
(cherry picked from commit d667e3210b12c7ce3b3727e2a0e369a520fbaaa4)
Reviewed-on: https://gerrit.libreoffice.org/20159
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
On one hand, neither our binary DOC import, nor Word maps the "TOC
Heading" style to something special, and that's how the DOCX import
added that property to some paragraphs in the document, moving the
as-char picture from the first to the second page.
OTOH, the DOCX export filter has a lcl_guessQFormat() function that
explicitly assumes that such a style name exists in Writer document
models, so again it doesn't make sense to handle this style name with
special care.
Change-Id: I3af548930f9683695fc3ad56b486e013f107d61a
(cherry picked from commit 70f3c595cae858e97616bf1f23adea8a75e42d4b)
Reviewed-on: https://gerrit.libreoffice.org/20037
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
It seems that number recognition in tables are not working properly
enter 10-10-10 and it should be converted to a date but it is not.
I tracked it down to the fix of bug fdo#32082. It looks like bSetNumFmt
was changed to false by mistake. Since then it has changed name to
bSetNumFormat. From what I can tell fdo#32082 still works after this
patch, but I might have missed some nuance of that bug report.
Added two tests, one for the bug mentioned above and one to check
that number recognition is working. At least with a simple date.
Reviewed-on: https://gerrit.libreoffice.org/19563
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit aa334d55ee34c125f6f4fdfaadbc1ed8fa33f5bc)
Change-Id: Id58849a223eb602054c66c7379cd56a68a93dea2
Reviewed-on: https://gerrit.libreoffice.org/20082
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I937ed893dfd9919bf48b8fd38a1b83c524200532
(cherry picked from commit 6128c10f550924c2b75f18b6c6220cc1770adba4)
Reviewed-on: https://gerrit.libreoffice.org/19911
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
The missing convertMm100ToTwip() calls mispositioned the line shapes
inside the groupshape in case of using drawingML inside DOCX files.
(cherry picked from commit 11129d89b152db54c86bb2bda58c24b8abb6c5a8)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I0c9d652de43d779f9073a8bfe22866ce4f31d0fa
Reviewed-on: https://gerrit.libreoffice.org/19946
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
With commit ebf767eeb2a169ba533e1b2ffccf16f41d95df35, some previously
hidden bugs manifested themselves, this is one of them.
The margin size calculated incorrectly when border offset was from
page. The border is drawn from the margin inwards, so the margin
should be equal to OOXML w:space attribute, and border distance
should be OOXML page margin - border distance - border width.
Incorrect calculation gave negative margin, with IllegalArgumentException
thrown in SfxItemPropertySet::setPropertyValue.
Reviewed-on: https://gerrit.libreoffice.org/19586
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Cherry-picked from 061d98ccc7fc95234514d5dee3d9e80e49b10dc7
Change-Id: Ifcf4a348e975df53410933aab3684d17f68b688c
Reviewed-on: https://gerrit.libreoffice.org/19940
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
Regression from commit 866a4436d3cfac1ff42d7996250bf96fb703aeaa (oox:
handle textboxes in ShapeContextHandler::endFastElement(), 2014-06-04),
the problem was that code in ShapeContextHandler::endFastElement()
assumed that all the XShape implementation it may see provides a TextBox
UNO property (which is specific to Writer) of type bool, but this is not
true.
Fix the problem by assuming false in case it has an other type.
Testcase can be a simple "does it load" one, as in the meantime
exceptions such as trying to read a bool from an uno::Any make the DOCX
XFilter::filter() implementation return false, unlike in the originally
reported LibreOffice 4.4 version that just silently discarded the
remaining content of the document.
Change-Id: I81781a7ec28d085ceee50d386b8eda023f83c29f
(cherry picked from commit 4cae3689d4d78fabe6529c9df03c438b1e9d1611)
Reviewed-on: https://gerrit.libreoffice.org/19905
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
Ideographic fullstop and comma in most Chinese fonts are centered,
while those in Japanese fonts align closer to the left. Original
compression algorithm trimed right side of the punctuation, making
fullwidth fullstop or comma in Chinese font visually unbalanced.
In worst case, it crowds together with the followed compressed
punctuation.
This patch fix the situation in the folowing way
1) make compression less stronger.
2) Trim space according to glyph bearing to font height ratio.
3) fix a memory access violation issue
Reviewed-on: https://gerrit.libreoffice.org/19517
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Conflicts:
sw/source/core/txtnode/fntcache.cxx
Change-Id: Icff215064e6c442fd36eac8e01b01fb6acb27594
Reviewed-on: https://gerrit.libreoffice.org/19764
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
DOCX import could handle this situation, as commit
2e8aad6d45c53d554ccaf26de998ede708cfc289 (fdo#39056 fdo#75431 Section
Properties if section starts with table, 2014-04-18) added support for
this situation, in case NS_ooxml::LN_tblStart/End is emitted by the
tokenizer.
Fix the problem by sending these tokens in the RTF tokenizer as well, at
least for non-nested tables.
Change-Id: Ifedb121754634529c27820dd5175e7f9e24019e1
(cherry picked from commit e57752170e604c85a6fe8aeaa38784796e00bab1)
Reviewed-on: https://gerrit.libreoffice.org/19878
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
caused by the fix for tdf#91260
(cherry picked from commit 16331514fd10d444bec89f892a106cbbba9e16c0)
Change-Id: I4a5a27b51c4cb1304647b5432c06ca9c5a96590d
Reviewed-on: https://gerrit.libreoffice.org/19877
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
cell values are added in parentheses to make sure negative values are handled
correctly
Change-Id: I7366493e3cd6c25607e311d4b610ef8aa704a8bb
Reviewed-on: https://gerrit.libreoffice.org/19821
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
(cherry picked from commit 0bd2a5eedd91466f97806e198b125546d256d1f8)
Reviewed-on: https://gerrit.libreoffice.org/19826
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
instead of bittwiddling which ends up trying to resolve the
system language
(cherry picked from commit a1ff0745cc4f78777e8dba1e7bb52d18386d7394)
more tdf#76964 fall back to primary language via getLanguage
(cherry picked from commit 97893e56e61a466e56d12ee46d11f6e4c32a737b)
sw: fix SwUiWriterTest pointlessly loading an "empty.odt" ...
... instead of just creating a new document.
(cherry picked from commit 98ddd7a32fd0d5fa080fac368b9dc53a06659285)
Change-Id: I545bd5e39f99003ddedf3c90031e8b818edc1de2
Reviewed-on: https://gerrit.libreoffice.org/19545
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
(cherry picked from commit 50d48709af3406eb270e5357f5d2cc6a218337a9)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I977930d59ef1ae9ae8bd2dfa9a7f3816c46d982c
Reviewed-on: https://gerrit.libreoffice.org/19758
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I305163b691a8fa51ef5da0c940c59c3a3440a2dc
(cherry picked from commit 96d03636a5f932151c7842ae34631258891fe807)
Reviewed-on: https://gerrit.libreoffice.org/19738
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
FormatObjsAtFrm() returns false, indicating that the result is not
perfect, and the caller hopes that formatting all children of the frame
again will help. Make sure that in case that assumption turns out to be false, we at
least do not loop.
The loop limit is enough to make the original i#43771 bugdoc still laid
out properly.
(cherry picked from commit 51438e87d0e17a4cc3c991165d22c740b3ac1fc2)
Change-Id: Ife9bd99a628a72edb922d04e05081971b6adf340
Reviewed-on: https://gerrit.libreoffice.org/19407
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Current implementation does not support interactive frame insertion
that moves the table into the frame
Change-Id: I57a69f680f1218bd3014da494d41542ad0b72dd1
Reviewed-on: https://gerrit.libreoffice.org/19157
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/19675
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
when the change is made, not during exit (as did
4aab13f77e5dc218d067ca7efe3622f4ea780bf9 "tdf#93509: crash on storing auto
correction config fixed," which caused PythonTest_sw_python to crash during
exit)
(cherry picked from commit fc7df6f9a6caf975867f4fcb87b5b0c86ed1ee84)
Conflicts:
sw/source/uibase/app/swdll.cxx
Change-Id: I0e9c264ae3fee7fdb732d36f42ebbb477557a644
Reviewed-on: https://gerrit.libreoffice.org/19673
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
|
|
The early return must also be taken if the anchor is neither AT_CHAR nor
AT_PARA.
(regression from a219bbb62f974020fac0799143fbc51c385bb460)
Change-Id: I4eccb1f80401ba620ef87342f40c1a896918f3d3
(cherry picked from commit 9092f96c63c05833ee5319935da1078afe216b55)
Reviewed-on: https://gerrit.libreoffice.org/19649
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
dynamic atexit destructor and const static variables reportedly
cause crash, let's avoid this.
Change-Id: I24234084f810854606dde9914bee1c98ebc2e3dd
Reviewed-on: https://gerrit.libreoffice.org/19657
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Ic3330817809727bfa2293ba74dcd7f5a25683dae
(cherry picked from commit 2d2d5d1a704aa6827657a73b395620009b04b3ea)
Reviewed-on: https://gerrit.libreoffice.org/19378
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
when editing is enabled also delete and backspace should be possible
this applies e.g. to input fields within protected sections
Change-Id: Iee5ef133971a3f2967e6c92e685a16afa003cfe8
Reviewed-on: https://gerrit.libreoffice.org/19399
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
(cherry picked from commit ac427caf1069ff66b4893bb2e937c2408d7c37b3)
Reviewed-on: https://gerrit.libreoffice.org/19453
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
Change-Id: I3c9a5f89df721618bb60b8932b69a371bb6f3ff1
(cherry picked from commit 0d79e4c07a7a7328cc0bed1d7998317b634543d8)
Reviewed-on: https://gerrit.libreoffice.org/19366
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
SwTextInputFieldPortion::Format has previously tried to erase the
input field special chars, which caused the words not breaking as
expected or in the same way as normal text. It appears that it is
actually not necessary to do this at all so just calling the super
class method SwTextPortion::Format does the job and fixes the
problem. After testing I could not find anything that is obviously
wrong.
Change-Id: Ie763f55ad55863dd224425dc481b7100deb639fa
(cherry picked from commit 5e1714fd7fcb45fa5f1220d892dba597da40b500)
Reviewed-on: https://gerrit.libreoffice.org/19349
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: Ia1c904b16d040714c8d5a0b4946bc42e6b8ac3bb
(cherry picked from commit 959ac511dbebeb3983da92052ced837b39b74ed9)
Reviewed-on: https://gerrit.libreoffice.org/19342
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
... in ODF import, so that reference fields do not break that reference
numbering cross reference bookmarks that were corrupted by commit
679faffc68bb854af0f55d0f218698e2f372f00b.
This used to work by accident before commit
9d0c51daea67104349cac26de9839afa8baeb099 fixed it to actually check for
duplicates properly.
(cherry picked from commit 7c3c3006deaaaf1bb3f2f4eeeaf11da3bcebe53c)
Change-Id: I5ed58eda7f3f2ce470a778852f6dda7a14356860
Reviewed-on: https://gerrit.libreoffice.org/19337
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
(cherry picked from commit 3080e4c09b7c4894d4f0f52c9beed4298f3fd23f)
(cherry picked from commit fedf965c51a9f57e5cde203a3d15a6c244558002)
(cherry picked from commit 4c2339d8177d610cc23619e787c1517ce8e8afd7)
(cherry picked from commit 1bc911eca173131fdc6e7e3889d128fa03adbf72)
Conflicts:
framework/source/uielement/menubarmanager.cxx
sc/uiconfig/scalc/menubar/menubar.xml
sd/uiconfig/simpress/menubar/menubar.xml
sw/uiconfig/swriter/menubar/menubar.xml
Change-Id: Ib6578ddd7897d9c5d63b5dc8d8465f6107cc24a6
Reviewed-on: https://gerrit.libreoffice.org/19345
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
bookmarks as references to numbered paragraphs are now saved
using the prefix '__RefNumPara__' as the import already expects
Change-Id: I6f7c41e95fa9f936a7eb21d4cb7461d4575c492a
Reviewed-on: https://gerrit.libreoffice.org/19229
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 85eb4d9514858c71fb22c5ed93d651ea24bc6c05)
Reviewed-on: https://gerrit.libreoffice.org/19336
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: If47170b323cb0b48b7cf2182ecbecfac575a6118
(cherry picked from commit 2445de28ad8cc1aed1302e14a2da3372a9f23c10)
Reviewed-on: https://gerrit.libreoffice.org/19319
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
|
|
Push/Pop-ing the cursor led to selection loss.
SelectHiddenRange() immediately returns false if the current cursor
hasMark(), so avoid all of the bugs and expensive push/pop routines
when there is a mark already.
Change-Id: I4624a3e0b2267942812d0429d527ad97962ec7fc
Reviewed-on: https://gerrit.libreoffice.org/19108
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit fb62052d5ac069d700a5410db35d6949a4c4008b)
Reviewed-on: https://gerrit.libreoffice.org/19277
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Change-Id: I342191cd8cf8b3998089236aea5743ea7cdd26f1
(cherry picked from commit 92fd894ea18672cba4cf961bdc4c0bc98f168102)
Reviewed-on: https://gerrit.libreoffice.org/19274
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
In case we set the paragraph left/right/first margin just to mimic the
list vs paragraph style interaction as Word wants it, never overwrite
properties, as they are always meant to be just callbacks in case there
is no real hard formatting.
Change-Id: Ibdb2834c693d43cf4114453e42628e8f64c0a856
(cherry picked from commit b669d85de9c933553ae57a9f51902bce7f9da9b5)
Reviewed-on: https://gerrit.libreoffice.org/19250
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
original tdf#66141 continues to not fail with this modification, but original
reporter of the follow up problem has verified that relaxing this more fixes
the continued misplacement of caption text in a private RH document
(cherry picked from commit a6e6eb8b37ba431df575be4799114bb821f54b0d)
Change-Id: Ic1a339619912127009e760aa2ade9f29a545f7ec
Reviewed-on: https://gerrit.libreoffice.org/19173
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
The AnchorType of the shape was at-paragraph, which does not allow
line-level VertOrientRelation (which is correct, it would be undefined,
what line of the paragraph should be the used).
Fix this by changing the AnchorType to at-character in the line-level
case, which brings the filter in sync with the DOC one.
With this, import of a DOCX file that was created by inserting a
TextFrame into an empty document is roundtripped without shifting the
shape up considerably.
(cherry-picked from commit 358666e4204364ce915ee95372dc6f2fca545253)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I6d85c38be859d6e730584f2349c857b87496a1d4
Reviewed-on: https://gerrit.libreoffice.org/19099
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
If the copied range starts with a not fully selected paragraph, the
bookmarks that are copied will be created on the wrong paragraphs,
on the node after the correct one.
This also happens when hinding the redlines, and causes asserts from
attempting to create CrossRefBookmarks on table nodes on WW8 export of
fdo66302-1.odt and fdo66312-1.odt.
Change-Id: Id576be3e38a89527d967f02b39d9aabbf6368354
(cherry picked from commit c95ba3ef2613e9d5abd2f19ab2432c7bc1a40fe7)
Reviewed-on: https://gerrit.libreoffice.org/19104
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: Ifc1f226a38328e6ce02d3181917dd0530f320914
(cherry picked from commit 1e468ed58994f4eb75519cb52111ed942fbc7377)
Reviewed-on: https://gerrit.libreoffice.org/19021
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
regression from...
commit 8a08f68669f9acfe98dadcca4af6519164a17000
Author: Mike <mikekaganski@hotmail.com>
Date: Mon Apr 27 01:27:05 2015 +1000
tdf#66141: SwTxtFrm::FormatQuick(bool) endless loop
If a line happens to be invisible (e.g. in too thin cell of a table)
then aLine.FormatLine(nStart) returns nStart, and
aLine.Insert( new SwLineLayout() ) is executed until OOM.
keep the zero advance loop detection attempt, but allow the first
insertion and disallow subsequent inserts
Change-Id: I16380588220149cfd0ed0f835f08d2849180fece
(cherry picked from commit f06508e2cfa7e833862b7e9ff3b2f79181672275)
Reviewed-on: https://gerrit.libreoffice.org/18908
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
characters do not take account of hanging punctuation. Note that
placing a cursor next to the hanging puncuation is still not possible,
but the selection and the non-printing characters works fine now.
Change-Id: I22c8c2c5044b46c325236caffec67d9f68c23eed
Reviewed-on: https://gerrit.libreoffice.org/17591
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/19031
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
(cherry picked from commit 3e27df1035677c7cca5200858d5d8e8283bf7aa9)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/NumberingManager.cxx
Change-Id: I0c4366ad0a2f81a198860869f670767343a392be
Reviewed-on: https://gerrit.libreoffice.org/19032
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Word has a feature like this: a paragraph style can refer to a numbering
style, and both can specify paragraph margins. If that's the case, then
the ones from the paragraph style has priority.
In Writer, the numbering style has priority, so the only chance for
correct import result is to set the margin directly on the paragraph in
this case.
(cherry picked from commit f4badd9a485f32f787d78431ed673e2932973887)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: Iff3b03bcc56e0db3a48452c293acf41c91b8f159
Reviewed-on: https://gerrit.libreoffice.org/18794
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
With this, <w:ind w:hanging="..."/> as direct paragraph formatting and
<w:ind w:left="..." w:hanging="..."/> as a numbering level formatting is
properly merged, i.e. w:left is not lost, defaulting to 0.
(cherry picked from commit 56341e5d496f576dc45fe8e6c44831d780fecb73)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: If5534fbd9ee6d41139b0ed3a3df9d0cc5aad3239
Reviewed-on: https://gerrit.libreoffice.org/18906
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
Language poolitem will be inserted after user completes editing
with IME, making it refer to valid range when undo.
Change-Id: Id2876aa74dba6f7d134b8e2df4d9b36a8f429bb1
Reviewed-on: https://gerrit.libreoffice.org/18392
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/18877
Tested-by: Jenkins <ci@libreoffice.org>
|
|
this partially changes behaviour introduced with commit bb00a0097900ae054401f7758a915047cfde4065
but without the performace problems from the old code
thanks to kendy for helping
(cherry picked from commit 2fcf8923d2c520a5a16b1b3a45877adaadd7eab4)
Change-Id: I5dab81b58262f67db1c70223c612636a8b8c90ee
Reviewed-on: https://gerrit.libreoffice.org/18816
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
DocxAttributeOutput::SectionBreaks() previously only handled the
text-text and text-table node transitions; implement support for
table-text to avoid loosing a page break on export for the bugdoc.
(View this commit with whitespace ignored to filter out the noise about
SectionBreaks() now accepting non-text nodes, too.)
Change-Id: Ie8a1575374a207399351635bda8c0c076ce7268d
(cherry picked from commit c916152d8562cab868d4c522748ac30029fad179)
Reviewed-on: https://gerrit.libreoffice.org/18759
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I5d1d18f864496ec98894703f0a22e211a9dd14a5
(cherry picked from commit a2b90cd04733c2ec3b9cb3bb56d95f3298571ecc)
Reviewed-on: https://gerrit.libreoffice.org/18747
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
InetURLObject class does not work correctly with internal document
links, containing not full url, but just a fragment. This case added
as an exception for HTML link export.
Change-Id: I44496a1cf186836d4194fc65ce7bf9aeb2f79b65
Reviewed-on: https://gerrit.libreoffice.org/17993
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit fd3468024e1ac199f4a2f4108321ef8100d58414)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
The bug document has:
<style:page-layout-properties ... style:repeat="no-repeat">
<style:background-image ... style:repeat="stretch"/>
</style:page-layout-properties>
When a stretched background image is set on a page style using the Writer UI,
then these two style:repeat attributes always match, but not in the bugdoc.
The later used to have priority, till commit
7d9bb549d498d6beed2c4050c402d09643febdfa (Related: #i124638# Second step of
DrawingLayer FillAttributes..., 2014-06-02).
Fix the problem by extending XMLBackgroundImageContext::EndElement(): if we
know that the <style:page-layout-properties> sets the FillBitmapMode property,
then don't blindly set BackGraphicLocation, but try to overwrite the exiting
FillBitmapMode one.
Change-Id: I64ab4363b20cc95003d35acd63ea421472b1c071
(cherry picked from commit 6621da38b3cd217314c2d2295fd1e71be7e1875e)
Reviewed-on: https://gerrit.libreoffice.org/18582
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
5 ms timers cause SwTextFrm::CollectAutoCmplWrds() to return
early, and unlike the auto-spelling stuff there is nothing to store the
already-checked range of the paragraph, so on the next iteration it will
start from the beginning and time-out again.
Prevent that by excluding TIMER events here, as is already done for the
ONLINE_SPELLING case.
Change-Id: Iac781f10ce0aef902fa921030e61b4cff65d0cb3
(cherry picked from commit b4f35a7450830979b937ec6ae3b6d638302093d2)
Reviewed-on: https://gerrit.libreoffice.org/18590
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
So the auto-spell-checking is hyper-optimized to add the words to the
auto-complete list as well, and call SetAutoCompleteWordDirty().
But if you disable the auto-spell-checking, then a separate function
SwTextFrm::CollectAutoCmplWrds() will be called, which is buggy because
it only resets the dirty flag if at least one word of sufficient length
was found in the paragraph, which is never the case for an empty
paragraph.
Change-Id: Idec64fc3c379301426a44e06a1114c474de36014
(cherry picked from commit 97c6dac69ac2ad9cb20ba4d3c167d22a19922700)
Reviewed-on: https://gerrit.libreoffice.org/18589
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
There is a sort of intentional infinite loop in the idle spell checking
handler: while the user is typing a word, it should not be marked as
invalid yet, in order not to annoy them with red underlines.
So the word where the cursor is positioned always remained dirty, unless
you happen to have a grammar checker enabled, which clears the
paragraph's dirty flag from a separate thread.
To avoid the infinite loop, add another spell checking state "PENDING"
which is the same as dirty except that it should cancel the idle spell
checking.
The idle spell checking will run again when the user does the next
editing operation. Notably this means if the user just moves the cursor
out of the wrongly spelled word, it won't be underlined yet, but that
appears a minor issue, and checking when the cursor leaves the word
appears too hard to implement.
(cherry picked from commit 4c91e94e892943ef5e031d65f6f42864233cb4cd)
Change-Id: Ifb3d6d17f94f9f1cfad82e70dfa79f1594c38647
Reviewed-on: https://gerrit.libreoffice.org/18511
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|