/bridges/

6-4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/svx/qa/unit/unodraw.cxx
AgeCommit message (Collapse)Author
2021-02-15svx: fix import of multiple paragraphs into title shapesMiklos Vajna
Title shapes try hard to have a single paragraph only, the Impress UI inserts linebreaks instead of paragraphs breaks in sd::FuText::KeyInput(), ever since commit f47a9d9db3d06927380bb79b04bb6d4721a92d2b (initial import, 2000-09-18). This matches the PowerPoint behavior. This is most visible when the paragraph has a bullet associated with it. Interestingly you can still put multiple paragraphs into title shapes using paste special -> plain text. In that case, it was inconsistent that we exported these multiple paragraphs to ODP, but merged them to a single paragraph on import since commit 0a783c1a041e2b74b7bf238d11ee2c303f6708f4 (#100190# don't allow more then one paragraph on title text objects, 2002-06-25). This results in loosing your bullets on save + open, both in the ODP and PPTX cases, since removeActionLock() on the XShape triggers this tweak. Also, PowerPoint does not do this merging on import. So fix the problem by removing the import-time tweak but leave the UI unchanged. (cherry picked from commit 043690eff82d5798774452a8364e1566b866a320) Conflicts: svx/source/unodraw/unoshtxt.cxx Change-Id: I6796f83c40e83f65cfb0f6c7e66069c3e08c1e2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110935 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-12-11tdf#129961 svx: add rendering for table shadow as direct formatMiklos Vajna
There was already shadow support in ViewContactOfTableObj::createViewIndependentPrimitive2DSequence(), but the UNO API and UI could only set the shadow properties on a shape style, so shadow-as-direct-format is new. One difference between the PowerPoint shadow and our shadow is that we draw shadow for table text as well, while PowerPoint only does it for the borders / cell fill style. This means we're either backwards-compatible or compatible with PowerPoint. Solve this problem by leaving the style case unchanged, but render direct formatting like PowerPoint. (cherry picked from commit a75bf43a8d6c5dec6dcc86908c142ceec541aa8c) Conflicts: svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx svx/source/sdr/primitive2d/sdrdecompositiontools.cxx Change-Id: I2bc64fea8062f9d8162b95d1eaccb49c3466b5c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107594 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-12-11tdf#129961 svx: add UNO API for table shadow as direct formatMiklos Vajna
Adding it via a style was working already. (cherry picked from commit 55d4c6cfe5bd9b737698c6cd1f28ee8234abb5d0) Conflicts: svx/source/unodraw/unoprov.cxx Change-Id: I122c359716a404159d3521d63d44ef8bfe35c214 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107593 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-09-26Remove some unused includesMiklos Vajna
Change-Id: Ic28b4bdd401342d92b33913f7dab0ca875f8aab3 Reviewed-on: https://gerrit.libreoffice.org/79573 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-26tdf#93998 toolkit: restore support for setting dialog background from shapeMiklos Vajna
Regression from commit fb29e6eeeaad5255bb924ff59162a83ed80bfb0a (svx: removing GraphicURL and OWN_ATTR_GRAFURL, fix writerfilter, 2018-03-08), the problem was that an in-document macro tried to assign a bitmap shape to a dialog background, which broke during the image handling rework. Note that in this case the actual type of the "URL" is not interesting, we can just return an XGraphic and then take it on the other side as well, without re-introducing the intentionally removed graphic URLs which point to memory addresses. This also made it necessary to extend UnoDialogControl::ImplModelPropertiesChanged(), so that in case a graphic is assigned to the dialog model, then the dialog model -> dialog sync code doesn't just copy over the empty image URL string. With this, finally clicking on the button of the bugdoc makes the dialog show up with the correct background. Change-Id: Id78269643289efb435b96a6a0b9f8a93fa49ec04 Reviewed-on: https://gerrit.libreoffice.org/78153 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-07-03Remove some unused includesMiklos Vajna
See tdf#42949 for motivation. Change-Id: I89c082d62409b40c8472b865cc60b0d10923c9c1 Reviewed-on: https://gerrit.libreoffice.org/75015 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-03-21CppunitTest_svx_unit: use CPPUNIT_TEST_FIXTURE()Miklos Vajna
Change-Id: Ib2eac7368ebb06702f05101641e8830ea1fff6d5 Reviewed-on: https://gerrit.libreoffice.org/69483 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2018-05-19tdf#117614 svx: make drawing.GraphicExportFilter work with sw imagesMiklos Vajna
A Writer image has an underlying SdrObject, but GetSdrObjectFromXShape() won't work for it, also we can't an sw SdrObject into an XShape because SvxDrawPage::CreateShape() has no idea how to handle sw's SdrInventor::Swg inventor. Fix the problem by just getting the Graphic of the Writer image and improve GraphicExportFilter to be able to work with just a Graphic as well. Change-Id: I3c9b3005366fcc87815597a27df3cb8a99a8876c Reviewed-on: https://gerrit.libreoffice.org/54527 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>