diff options
author | Tibor Nagy <tibor.nagy.extern@allotropia.de> | 2024-06-06 19:47:45 +0200 |
---|---|---|
committer | Nagy Tibor <tibor.nagy.extern@allotropia.de> | 2024-06-07 14:38:52 +0200 |
commit | 805fd61f8efaaac119bbe28ab51617c07f0d7058 (patch) | |
tree | 34441c4d69c1720234fa6aca4a21f4e76430440a /include | |
parent | 82640810efd1636e358c047a1a5b3e4e3fc9d28a (diff) |
tdf#160591 PPTX export: fix colormap mapping in slide master
Change-Id: I154f0ff1769fbda361ec62f1dd589ca0d7686bd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168506
Tested-by: Jenkins
Reviewed-by: Nagy Tibor <tibor.nagy.extern@allotropia.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/oox/drawingml/color.hxx | 2 | ||||
-rw-r--r-- | include/oox/helper/graphichelper.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/pptimport.hxx | 1 | ||||
-rw-r--r-- | include/oox/ppt/presentationfragmenthandler.hxx | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index ea02ef8a03e4..dc8be778f665 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -122,6 +122,8 @@ public: static OUString getColorTransformationName( sal_Int32 nElement ); /** Translates between color transformation token names and the corresponding token */ static sal_Int32 getColorTransformationToken( std::u16string_view sName ); + /** Translates between ColorMap token names and the corresponding token */ + static sal_Int32 getColorMapToken(std::u16string_view sName); /// Compares this color with rOther. bool equals(const Color& rOther, const GraphicHelper& rGraphicHelper, ::Color nPhClr) const; diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index 0d0b69216617..906d7330dff3 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/include/oox/helper/graphichelper.hxx @@ -77,6 +77,8 @@ public: ::Color getSystemColor( sal_Int32 nToken, ::Color nDefaultRgb = API_RGB_TRANSPARENT ) const; /** Derived classes may implement to resolve a scheme color from the passed XML token identifier. */ virtual ::Color getSchemeColor( sal_Int32 nToken ) const; + /** Derived classes may implement to resolve a ColorMap token from the passed XML token identifier. */ + virtual void getSchemeColorToken(sal_Int32& nToken) const; /** Derived classes may implement to resolve a palette index to an RGB color. */ virtual ::Color getPaletteColor( sal_Int32 nPaletteIdx ) const; diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index fb718ddc70af..d4212f8140e2 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -74,6 +74,7 @@ public: virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) override; + void getSchemeColorToken(sal_Int32& nToken) const; ::Color getSchemeColor( sal_Int32 nToken ) const; virtual std::shared_ptr<::oox::drawingml::Theme> getCurrentThemePtr() const override; diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index 20fc521ae8c5..29e7bcf12bfc 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -57,6 +57,7 @@ private: ::oox::ppt::PowerPointImport& rFilter, const OUString& rMasterFragmentPath); void saveThemeToGrabBag(const oox::drawingml::ThemePtr& pThemePtr, sal_Int32 nThemeIdx); + void saveColorMapToGrabBag(const oox::drawingml::ClrMapPtr& pClrMapPtr); void importCustomSlideShow(std::vector<CustomShow>& rCustomShowList); static void importSlideNames(::oox::core::XmlFilterBase& rFilter, const std::vector<SlidePersistPtr>& rSlidePersist); |