diff options
| author | Armin Le Grand (Allotropia) <Armin.Le.Grand@me.com> | 2022-02-22 19:39:04 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2022-02-25 09:48:14 +0100 |
| commit | ec635b62af9424eddb32cc4646bc425559f4a622 (patch) | |
| tree | d67108b25234233cb5fa7893c09bbcd3f8d32def /include/oox/ppt | |
| parent | 56c871c247b84d7c2cddf685c13e8355db50da46 (diff) | |
Advanced Diagram support: cleanup/consolidate with existing code
Reorganized and streamlined, use IDiagramHelper as main interface
now also for existing code.
Had to adapt oox::Shape && Diagram handling since there the
import gets handled very different. This ensures that a Diagram
is detected at export and that the same happens for now as before
Had to add a detection that resetting the GrabBag is meant to
disable the Diagam functionality. That is very indirect, but
has to stay for compaibility reasons for now
Change-Id: I620b7d61cd84b5f9dd8ae4dc890ebf70ce779cdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130389
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'include/oox/ppt')
| -rw-r--r-- | include/oox/ppt/pptimport.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index b7b9e059e828..2d7367c4c63e 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -75,7 +75,7 @@ public: virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) override; ::Color getSchemeColor( sal_Int32 nToken ) const; - std::shared_ptr<::oox::drawingml::Theme> getCurrentThemePtr() const; + virtual std::shared_ptr<::oox::drawingml::Theme> getCurrentThemePtr() const override; #if OSL_DEBUG_LEVEL > 0 static XmlFilterBase* mpDebugFilterBase; |