| Age | Commit message (Collapse) | Author |
|---|
|
We're not consuming hints in that loop, so we want to end when the
iteration ended, not when the list of hints is empty.
Conflicts:
sw/qa/uibase/dochdl/dochdl.cxx
Change-Id: I2cb735c03c3551f7b0be8b314183780eedff9ecf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111558
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
|
... when we also have an SwUserField.
The problem is that a DocVariable gets imported as an SwUserField, but
then SwDocUpdateField::InsertFieldType() marks the field as dirty.
This causes IsFieldsDirty() to return true, so then
DocumentTimerManager::GetNextIdleJob() decides to recalc all fields.
This leads to loosing the cached result of conditional fields.
(cherry picked from commit 1abf4e6d07ca0ac31bc54f812df84efc82d2af1b)
Conflicts:
sw/qa/uibase/uno/uno.cxx
Change-Id: I4f5c032648f8fc2aff98e4f8c883492375c7752d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105923
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
|
Regression from commit e9e6d4b058e13165f3dde1ca7822eec97dfe8aa7
(tdf#116685: Make the RICHTEXT take precedence over EMBED_SOURCE.,
2019-09-26), the problem was that now we always prefer RTF over ODF when
pasting into Writer. The commit made sense for Calc->Writer paste, but
it causes formatting loss for Writer -> Writer paste.
The exact use-case was copy&paste of numberings where the pasted content
got paragraph indent as direct formatting, so shift-tab at the paragraph
start changed only the bullet type, not the indentation -- but it's easy
to imagine several other cases where a roundtrip via ODF provides better
results than RTF.
Fix the problem by leaving the above commit in place, but extending
SwTransferable::Paste() so that it prefers ODF over RTF in case of a
Writer->Writer paste (and leaves the non-Writer -> Writer paste behavior
unchanged to avoid the unwanted OLE objects).
(cherry picked from commit 8ad0c29f56e5069a3679560d404b603332dcf38a)
Conflicts:
sw/Module_sw.mk
Change-Id: Ida745bba65c5a210021cea0d267c02900fc6398a
|
|
Effects have an extent, and unhandled effects (like this blurred shadow)
need to take space in the margin of the shape to make sure they use the
correct amount of space in the layout.
This was working in general, but not in case the importer decided to
import the shape as Draw shape + the shape was inline.
(And also disable a new CppunitTest_sw_uibase_shells test on Windows,
which is only stable on Linux, it seems.)
(cherry picked from commit bf25e69f8f657d5e3bcdd0bd54c5fa0d66ec85fe)
Conflicts:
writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
Change-Id: I9d0531d9393d8c2cd274e6f54bbbfe8024bf270f
|
|
Regression from commit a3c7a8282ddd08c7ed4a15d23089d09e418f8fae
(jsdialogs: apply .uno:Color and CharBackColor to floating text frames,
2019-11-08), the problem was that the original code populated aNewAttr, while
SetAttrToMarked() was only invoked in case there were arguments.
Fix this by making pNewAttrs a copy, so lcl_convertStringArguments() can
work on it in place, and then restore the old code that copied from
pNewAttrs to aNewAttr. This fixes the no-arguments case and keeps the
lcl_convertStringArguments() case working.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88227
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
(cherry picked from commit b03504bf054bd4094b985ef8ebb9ac55fa69a487)
Change-Id: If7bf2d7b21e48d513a512ec6127b61ee74635ef5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88296
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
|
|
... as-char anchor types
SwWrtShell::InsertPostIt() only sets the comment anchor for those types,
and we would crash without an anchor.
(cherry picked from commit d05a65bec5dc498f66f9331189124d539bc0d505)
Conflicts:
sw/Module_sw.mk
Change-Id: I7d2f5d3d8f8e11c46db060c17587e97ecb786ad2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87586
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
|
