diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2022-01-10 14:36:02 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-01-10 17:38:56 +0100 |
| commit | 952b3b227e02ae4eedce3138fcb39613bf12486d (patch) | |
| tree | 9c02c068a0007b77821ed8f9cb6d7eb2d2d65153 /svx/qa | |
| parent | 56ded398c9c72810f20b9da0aa98097739423180 (diff) | |
sd theme: fix applying new colors after theme change for group shapes
UpdateSdrObject() is called for both group and non-group shapes, so
don't assume that they always have text, otherwise we would crash.
Change-Id: I3672673176f0cb462a8b8d61a68466f541e9ce06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128248
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'svx/qa')
| -rw-r--r-- | svx/qa/unit/data/theme.pptx | bin | 27231 -> 28788 bytes | |||
| -rw-r--r-- | svx/qa/unit/styles.cxx | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/svx/qa/unit/data/theme.pptx b/svx/qa/unit/data/theme.pptx Binary files differindex 652a9fc29e06..74397b3ea67a 100644 --- a/svx/qa/unit/data/theme.pptx +++ b/svx/qa/unit/data/theme.pptx diff --git a/svx/qa/unit/styles.cxx b/svx/qa/unit/styles.cxx index 1e7151edf359..565d981e6e2e 100644 --- a/svx/qa/unit/styles.cxx +++ b/svx/qa/unit/styles.cxx @@ -68,6 +68,7 @@ CPPUNIT_TEST_FIXTURE(Test, testThemeChange) OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "theme.pptx"; getComponent() = loadFromDesktop(aURL); uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(getComponent(), uno::UNO_QUERY); + // The draw page also contains a group shape to make sure we don't crash on group shapes. uno::Reference<drawing::XMasterPageTarget> xDrawPage( xDrawPagesSupplier->getDrawPages()->getByIndex(0), uno::UNO_QUERY); uno::Reference<drawing::XShapes> xDrawPageShapes(xDrawPage, uno::UNO_QUERY); |