summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* tdf#140292: (related: tdf#133487) sw: fix ordering of virtual SdrObjects for ↵Michael Stahl2021-03-115-10/+31
| | | | | | | | | | | | | | | | | | | | | | | textboxes Calling XShapes3::sort() on export of the testTdf130314 fails because of 2 consecutive textboxes; the function requires a textbox to immediately follow its shape in the list (i.e. textbox has OrdNum of shape + 1). This is because for shapes in header/footer, one virtual SdrVirtObj is created per page where the header/footer is shown, and the SwFlyDrawContact::GetOrdNumForNewRef() does not take textbox ordering into account. It's not clear if the assumption that the shape's SdrVirtObj is created before the textbox's always holds, but let's try this for now. Change-Id: I860896471211bf6c142ab825f298f4d4c0eec148 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112029 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112272
* forgotten ComputeScanlineSize() (tdf#140917)Luboš Luňák2021-03-111-0/+1
| | | | | | | | | | | Change-Id: Id139cea52832b7973dfac47d309d5bba8299b4e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112263 Reviewed-by: Mark Hung <marklh9@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Tested-by: Jenkins (cherry picked from commit 7ba7a1170a46ad340d06822a03f7196ccef29d84) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112227 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#140865 roundtrip pptx wordart 3D, add sp3dRegina Henschel2021-03-114-0/+64
| | | | | | | | | | Change-Id: I446ae4e8c9dd5f2fbf3efe289681339f967c515a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112185 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> (cherry picked from commit dbbb8cafcb801638bde3b21796eaebfc807acbdc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112229 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* bump product version to 7.1.3.0.0+Christian Lohmaier2021-03-101-1/+1
Change-Id: I5aea53cd7428ea7751076ffcda38270fda4f0767