diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2015-02-18 21:19:08 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-02-19 10:34:34 +0100 |
| commit | 1141870c3c8f8e89370e3866045ffbd351fbba6a (patch) | |
| tree | bdd2757c7c6548650c5b1012b6383cb19c9b25d6 /oox/source/ppt/pptimport.cxx | |
| parent | 5b5ea27cfdf614caca14af2b973063eef2cc77c3 (diff) | |
better way to set default for chart area fill style, related tdf#89451
(cherry picked from commit 32fe0c6adcff25a0df536127ca980413e1cabefd)
Conflicts:
oox/source/ppt/pptimport.cxx
Change-Id: Iee7fea0f55cf54d43a349b6cc0ffa25995069e40
Diffstat (limited to 'oox/source/ppt/pptimport.cxx')
| -rw-r--r-- | oox/source/ppt/pptimport.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 259e716393b4..aad4cc5bfcef 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -187,7 +187,7 @@ class PptGraphicHelper : public GraphicHelper public: explicit PptGraphicHelper( const PowerPointImport& rFilter ); virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const; - virtual drawing::FillStyle getDefaultChartAreaFillStyle() const; + virtual sal_Int32 getDefaultChartAreaFillStyle() const; private: const PowerPointImport& mrFilter; }; @@ -203,9 +203,9 @@ sal_Int32 PptGraphicHelper::getSchemeColor( sal_Int32 nToken ) const return mrFilter.getSchemeColor( nToken ); } -drawing::FillStyle PptGraphicHelper::getDefaultChartAreaFillStyle() const +sal_Int32 PptGraphicHelper::getDefaultChartAreaFillStyle() const { - return drawing::FillStyle_NONE; + return XML_noFill; } } // namespace |