diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-04 15:12:59 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-07-10 05:10:09 +0000 |
| commit | 9e3adc0ee35d9922a12b63d0b36f7790247dec0f (patch) | |
| tree | 98d49630a5c7667547aca966f17f7bf913d7018f /include | |
| parent | 2ced18a6e90e3c9494e48994af39c5d710188c44 (diff) | |
bnc#882383: Do not ignore themeOverride for charts in .pptx
Otherwise wrong colors are displayed.
(cherry picked from commit 08818d8a45e034ad825c7fafbb76766f106f1d1d)
Conflicts:
oox/source/drawingml/shape.cxx
Change-Id: I5d7444100355fdbc5fcd2aaa1c01202ace54312d
Reviewed-on: https://gerrit.libreoffice.org/10134
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/ThemeOverrideFragmentHandler.hxx | 40 | ||||
| -rw-r--r-- | include/oox/ppt/pptimport.hxx | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx b/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx new file mode 100644 index 000000000000..827cf5a52f55 --- /dev/null +++ b/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx @@ -0,0 +1,40 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_OOX_DRAWINGML_THEMEOVERRICEFRAGMENTHANDLER_HXX +#define INCLUDED_OOX_DRAWINGML_THEMEOVERRICEFRAGMENTHANDLER_HXX + +#include <oox/core/fragmenthandler2.hxx> + +namespace oox { +namespace drawingml { + +class Theme; + +class ThemeOverrideFragmentHandler : public ::oox::core::FragmentHandler2 +{ +public: + explicit ThemeOverrideFragmentHandler( + ::oox::core::XmlFilterBase& rFilter, + const OUString& rFragmentPath, + Theme& rTheme ); + virtual ~ThemeOverrideFragmentHandler(); + + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + +private: + Theme& mrTheme; +}; + +} // namespace drawingml +} // namespace oox + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index c393be6411a9..d304792ab884 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -50,6 +50,7 @@ public: virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; + SlidePersistPtr getActualSlidePersist() const { return mpActualSlidePersist; }; void setActualSlidePersist( SlidePersistPtr pActualSlidePersist ){ mpActualSlidePersist = pActualSlidePersist; }; std::map< OUString, oox::drawingml::ThemePtr >& getThemes(){ return maThemes; }; std::vector< SlidePersistPtr >& getDrawPages(){ return maDrawPages; }; |