diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-12-02 08:45:26 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-06-27 08:59:16 +0200 |
| commit | 05f8da6afc3c83eefd06f91cd7a2bc91a84ef8ea (patch) | |
| tree | 54fe2d6bddb8648c8e7b32467951b025e429b95f /include | |
| parent | 7fdbc18afc6f1d34907b872d405b10b602ebdf16 (diff) | |
PPTX export: handle theme colors from the doc model for shape text
As a start, do this only in case there are no effects used. If there is
no theme color or there are effects, fall back to the old code.
Also move parseExportStream() from SdModelTestBaseXML up to MacrosTest,
so oox/ test code can use it as well.
(cherry picked from commit f36767fde87191258ea21f3faac0be6ad79328e0)
Conflicts:
oox/qa/unit/export.cxx
Change-Id: Ia76581dcef110341f6c3e60f22c34818ed0dcabc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136394
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/export/drawingml.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index dc01e20f9199..b15bf9d81aba 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -229,6 +229,8 @@ public: void WriteLineArrow( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, bool bLineStart ); void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry, sal_Int32 nStartID, sal_Int32 nEndID ); + bool WriteCharColor(const css::uno::Reference<css::beans::XPropertySet>& xPropertySet); + void WriteSolidFill( ::Color nColor, sal_Int32 nAlpha = MAX_PERCENT ); void WriteSolidFill( const OUString& sSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT ); void WriteSolidFill( const ::Color nColor, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT ); |