diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-05-22 16:05:23 +0200 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-05-23 10:04:00 +0200 |
| commit | b5f6a5cfc517ecd8aa6ba96471d854b07b92ebaa (patch) | |
| tree | c13eb4badf6272158be9adae54099632a1b9fbb7 /include/oox | |
| parent | 2e68a1468c035fc3bb4d02ad0b3187872fe1e67b (diff) | |
ooxml: Do not repeat wdp files in artistic effects
When two pictures apply different effects to the same picture, it is
only saved once in the original document. Added a cache to DrawingML
to know if the picture has already been exported, and added a test
for it.
Change-Id: Ia25f3d8f2f46d61f18aefc22fdfdbcdc72f2d916
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/export/drawingml.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 77d54b48b014..e97f05da8cf5 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -83,6 +83,7 @@ public: private: static int mnImageCounter; static int mnWdpImageCounter; + static std::map<OUString, OUString> maWdpCache; /// To specify where write eg. the images to (like 'ppt', or 'word' - according to the OPC). DocumentType meDocumentType; @@ -178,7 +179,7 @@ public: void WriteShapeEffect( const OUString& sName, const css::uno::Sequence< css::beans::PropertyValue >& aEffectProps ); void WriteShape3DEffects( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); void WriteArtisticEffect( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); - OString WriteWdpPicture( const ::com::sun::star::uno::Sequence< sal_Int8 >& rPictureData ); + OString WriteWdpPicture( const OUString& rFileId, const ::com::sun::star::uno::Sequence< sal_Int8 >& rPictureData ); static void ResetCounters(); |