Age | Commit message (Collapse) | Author | Files | Lines |
|
This reverts commit 9099e21b89184bd4e39def497e483cac4a77ec5a.
It causes the problem that frames anchored to the same node where
redlines start or end get duplicated during Hide.
Jan-Marek said that the original mail-merge related problem this change
was fixing is now most likely fixed differently, and the test in
testMultiPageAnchoredDraws() still passes.
(equivalent master commit e84f0a9b3223f49b0829f2f55dacbf11ae201c1e)
sw: add unit test for the redline frame duplication regression
(cherry picked from commit d5ffcba07acb4dd5bd68373d40f07af825f07fba)
Change-Id: I4c2b425b0dc8d2706cc74ad93a485a501d44c072
Reviewed-on: https://gerrit.libreoffice.org/18510
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Regression from commit 0761f81643a6890457e9ef7d913ab5c88c2593a4 (123792:
complete annotations on text ranges feature, 2013-12-19), the problem
was that in case a comment had a reply, then both comments produced its
range overlay, and this repeated semi-transparent overlay resulted in
dark color.
Go back to the old behavior of just painting the overlay for the
non-reply comment; for real, partly overlapping comments showing the
exact boundaries of the overlapping overlays still makes sense.
(cherry picked from commit 780dd8c1cf5302ca503cf7b55357dace4d69beb9)
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
Change-Id: Ic2673a1a41146ff547262ba681b34a63f41aa8ff
Reviewed-on: https://gerrit.libreoffice.org/17851
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
The problem was that the bugdoc had a table, and inside the table there
was a long paragraph that flows to the next page, but only the paragraph
mark of it does so. We first split the frame to have space for the
paragraph mark, but later decided that all the content would fit the
first frame, and this way the last hard line break and the paragraph
mark was painted on each other.
This is normally not a problem without tables, because
SwTxtFrm::FormatAdjust() just calls SplitFrm(), sets its nNew flag to
non-zero make sure that later SwTxtFrm::_AdjustFollow() doesn't try to
join it, and we're ready. However, when the paragraph is inside a table,
then the paragraph was formatted multiple times, and next time when we
already had a follow nNew was not set, so even if there was a correct
split first, the new frame was joined later.
Fix the problem by explicitly setting nNew for the "in a table and
paragraph ends with a hard line break" case, that way we don't blindly
join the frame, only in case there is enough space for the follow in the
master.
(cherry picked from commit 7e33cce05b2df3f1761bcc66606c4d3b2b2671e9)
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
Change-Id: Iede654740dcb0d8aa768d742ee330208291a383a
Reviewed-on: https://gerrit.libreoffice.org/14476
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I9b6b83f0f6d627bb14a880a19769ee70564cf52b
|
|
Turns out that for normal TextFrames and rectangular drawinglayer
shapes, the engine is written in ODF implicitly. Use the same trick to
describe if the shape content should be rendered by SW or editeng.
This reverts 9d310ecfce3c2fc481b125e1493a534e2107a68e (sw textboxes:
implement ODF import/export, 2014-06-02).
Change-Id: Id8afa6368bedcd293e578244abb58e18949bec8d
|
|
In case the user double-clicks on a word and exactly that word is
commented, then we used to select only the word, but not its comment
anchor character. So when the user deleted the selection, the comment
left there.
It is still possible to manually select only the word, but on
double-click let's just select the comment anchor as well, so a simple
double-click on the commented word will remove the comment as well.
Change-Id: I7322af61c31e8aba108eef5596849d17d55fc7eb
|
|
The SwFmtCntnt, i.e. the content of the draw format was already copied,
but that's only a pointer to the real content: instead duplicate the
real contents on copy&paste, that's how we copy fly frames as well.
Change-Id: I42475e356aaa1c54c08fb23a6a395d1726e5f33e
|
|
Without this, in case TextAutoGrowHeight is set before TextBox, the
textbox of the shape won't have automatic height.
Change-Id: I2ebf77eacbe1f1d10ccf64ef833c39ee965245d3
|
|
So that vertical text adjustment of the shape is reflected in the
textbox layout.
Change-Id: I887d51928fe4d37db08864374e0cea54f80953b5
|
|
It builds a textbox -> shape map, so methods interested to pick the
shape instead of a shape's textbox can call it and act accordingly if
their textbox is in the map.
Change-Id: I0f30d64a284eb461f462ed6c0a36c88271153f04
|
|
Changing a document with redlines to two columns and then using undo
set some redlines to point to the end of the document (done by
the call to RemoveIdxFromSection() in SwUndoInsSection::UndoImpl()).
Change-Id: I88b563b88beebcd1c3cb21fe61bb56cdb12cdc41
|
|
If we delete a shape that had a textbox, then delete that textbox as
well. Without that, the doc model would be still consistent, but most
probably would not be what the user expects.
Change-Id: Id5075233ce66d7a398c88ff3e63b05a6b2133571
|
|
Change-Id: Iaf59db6a55c3f81d11d0196d5d3e52056e31c4b1
|
|
Change-Id: I3e8ce585b29619061b18ab1ab8f0cf6c7d421074
|
|
As the bug talks about issues in custom styles, now they're tested too.
Change-Id: I5f727718ec3591e29c44c49750a7c7a0841a8c61
Reviewed-on: https://gerrit.libreoffice.org/7373
Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com>
Tested-by: Marcos Souza <marcos.souza.org@gmail.com>
|
|
Change-Id: Ief2eef638bc3f9e44358addf0d1c655a790834a2
Reviewed-on: https://gerrit.libreoffice.org/7351
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
In theory, it was a problem to have the table cursor around when having
the selection outside the table; but it didn't cause a problem so far.
However, when the table has one or more empty cells, we really need to
leave table mode, otherwise only the table gets selected.
Change-Id: I766903ed624b9338f0612697b4c03f44de1d2e41
|
|
Change-Id: I5ee33965a511c7730610377a2e41f4728a0fe4d2
Reviewed-on: https://gerrit.libreoffice.org/6184
Tested-by: Arnaud Versini <arnaud.versini@libreoffice.org>
Reviewed-by: Arnaud Versini <arnaud.versini@libreoffice.org>
|