diff options
author | Sun Ying <sunying@apache.org> | 2012-09-10 01:56:28 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-27 10:23:07 +0100 |
commit | c05c16635b15a47591faa737947c2dce3dcb863e (patch) | |
tree | f98b4c7fca28107c54da681cce2e13f62d40a62f /include/filter/msfilter | |
parent | cast double to sal_Int64 can throw EXCEPTION_FLT_INVALID_OPERATION on Windows (diff) | |
download | core-c05c16635b15a47591faa737947c2dce3dcb863e.tar.gz core-c05c16635b15a47591faa737947c2dce3dcb863e.zip |
Resolves: #i119753# fix audio video object lost when save .ppt file
Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li
(cherry picked from commit fbb7e8d8957877922f2f3a971e88685589f43939)
Conflicts:
filter/inc/filter/msfilter/escherex.hxx
filter/source/msfilter/escherex.cxx
Change-Id: I545a9e95c23cfba0cc918c9c4243528570734b2d
Diffstat (limited to 'include/filter/msfilter')
-rw-r--r-- | include/filter/msfilter/escherex.hxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 9ccf4350e50b..c4807e80875d 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1231,6 +1231,13 @@ public: sal_Bool CreateOLEGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXOleObject ); + sal_Bool CreateGraphicProperties( + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, + const GraphicObject& rGraphicObj + ); + sal_Bool CreateMediaGraphicProperties( + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXMediaObject + ); /** Creates a complex ESCHER_Prop_fillBlip containing the BLIP directly (for Excel charts). */ sal_Bool CreateEmbeddedBitmapProperties( |