diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2010-11-05 19:05:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@hemulen.(none)> | 2010-11-05 23:52:29 +0200 |
| commit | d4e0fabfcef115951546374f526ad1fe4a6edd04 (patch) | |
| tree | 5f13f1daea194f9a6ae8ed240e44dac9925216c6 /sd | |
| parent | ffa80846efb6ba23d46d5db035078ecfc448b164 (diff) | |
Apply missing bits from oox-pptx-export-update-to-ooo320.diff
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/epptooxml.hxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptexanimations.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 096056a41..a582bc6e7 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -85,7 +85,7 @@ public: virtual oox::vml::Drawing* getVmlDrawing() { return NULL; } virtual const oox::drawingml::Theme* getCurrentTheme() const { return NULL; } virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); } - virtual oox::drawingml::chart::ChartConverter& getChartConverter(); + virtual oox::drawingml::chart::ChartConverter* getChartConverter() { return NULL; } static const char* GetSideDirection( sal_uInt8 nDirection ); static const char* GetCornerDirection( sal_uInt8 nDirection ); diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 639e936e8..9ce1c572e 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -1030,7 +1030,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer exportAnimPropertyuInt32( rStrm, DFF_ANIM_NODE_TYPE, nPPTNodeType, TRANSLATE_NONE ); } } - sal_uInt32 nPresetId; + sal_uInt32 nPresetId = 0; sal_uInt32 nPresetSubType = 0; sal_uInt32 nAPIPresetClass = EffectPresetClass::CUSTOM; sal_uInt32 nPresetClass = DFF_ANIM_PRESS_CLASS_USER_DEFINED; diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 308b4fccb..47e8c451f 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -1943,11 +1943,6 @@ sal_Bool PowerPointExport::ImplCreateMainNotes() return TRUE; } -drawingml::chart::ChartConverter& PowerPointExport::getChartConverter() -{ - return *mxChartConv; -} - #define IMPL_NAME "com.sun.star.comp.Impress.oox.PowerPointExport" OUString SAL_CALL PowerPointExport_getImplementationName() throw() |