diff options
| author | gulsahkose <gulsah.kose@collabora.com> | 2021-12-01 10:46:41 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-12-03 09:30:18 +0100 |
| commit | 2be6b90cfa201b894cc893c51ca8e29577e33aa1 (patch) | |
| tree | 82bad6dbcb0d76a950b2c9863d2e2dca63167e1c /sd | |
| parent | 4cf9eaac667d0070e48e52df2a6d58299a728ce0 (diff) | |
tdf#140912 Better handling of the picture placeholders.
To see icon and placeholder text at the center of picture
placeholder shape, we set the TextContourFrame and GraphicCrop
properties.
Change-Id: I49e3d08c9020e593232c60c97af3f45fb620075e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126165
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 7b3be7f6f3d800e2ad86f5a043e6e9b21ed4409f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126138
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/pptx/tdfpictureplaceholder.pptx | bin | 0 -> 28072 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml3.cxx | 20 |
2 files changed, 20 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/tdfpictureplaceholder.pptx b/sd/qa/unit/data/pptx/tdfpictureplaceholder.pptx Binary files differnew file mode 100644 index 000000000000..d681c749cab0 --- /dev/null +++ b/sd/qa/unit/data/pptx/tdfpictureplaceholder.pptx diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx index f842e4b97717..623761f25786 100644 --- a/sd/qa/unit/export-tests-ooxml3.cxx +++ b/sd/qa/unit/export-tests-ooxml3.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> #include <com/sun/star/frame/XLoadable.hpp> +#include <com/sun/star/text/GraphicCrop.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> @@ -118,6 +119,7 @@ public: void testTdf96061_textHighlight(); void testTdf142235_TestPlaceholderTextAlignment(); void testTdf143315(); + void testTdf140912_PicturePlaceholder(); CPPUNIT_TEST_SUITE(SdOOXMLExportTest3); @@ -188,6 +190,7 @@ public: CPPUNIT_TEST(testTdf96061_textHighlight); CPPUNIT_TEST(testTdf142235_TestPlaceholderTextAlignment); CPPUNIT_TEST(testTdf143315); + CPPUNIT_TEST(testTdf140912_PicturePlaceholder); CPPUNIT_TEST_SUITE_END(); virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override @@ -1770,6 +1773,23 @@ void SdOOXMLExportTest3::testTdf143315() assertXPath(pXml, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:pPr/a:buChar", 0); } +void SdOOXMLExportTest3::testTdf140912_PicturePlaceholder() +{ + ::sd::DrawDocShellRef xDocShRef = loadURL( + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdfpictureplaceholder.pptx"), PPTX); + + uno::Reference<beans::XPropertySet> xShapeProps(getShapeFromPage(0, 0, xDocShRef)); + bool bTextContourFrame = true; + xShapeProps->getPropertyValue("TextContourFrame") >>= bTextContourFrame; + CPPUNIT_ASSERT_EQUAL(false, bTextContourFrame); + + text::GraphicCrop aGraphicCrop; + xShapeProps->getPropertyValue("GraphicCrop") >>= aGraphicCrop; + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(-8490), aGraphicCrop.Top); + + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest3); CPPUNIT_PLUGIN_IMPLEMENT(); |