diff options
| author | Sun Ying <sunying@apache.org> | 2012-09-10 01:56:28 +0000 |
|---|---|---|
| committer | Sun Ying <sunying@apache.org> | 2012-09-10 01:56:28 +0000 |
| commit | fbb7e8d8957877922f2f3a971e88685589f43939 (patch) | |
| tree | 9f9185b31f501a99249100c5b95188de6ecbcdc4 /sd | |
| parent | 5e7f4d4db2fd12346742e366f48f91053227471b (diff) | |
#119753# fix audio video object lost when save .ppt file
Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li
Notes
Notes:
merged as: c05c16635b15a47591faa737947c2dce3dcb863e
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 15 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index a71371b38d8b..947a76cd41f8 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -5251,7 +5251,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a mnAngle = 0; mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); - + if ( aPropOpt.CreateMediaGraphicProperties( mXShape ) ) + aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); ::com::sun::star::uno::Any aAny; if ( PropValue::GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ), sal_True ) ) { @@ -5302,6 +5303,18 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a << (sal_uInt16)EPP_ExObjRefAtom << (sal_uInt32)4 << nRefId; + // write EPP_InteractiveInfo container for no_action + *pClientData << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) << (sal_uInt32)24; + *pClientData << (sal_uInt16)0 + << (sal_uInt16)EPP_InteractiveInfoAtom + << (sal_uInt32)16 + << (sal_uInt32) 0 + << (sal_uInt32) 0 + << (sal_uInt8) 6 + << (sal_uInt8) 0 + << (sal_uInt8) 0 + << (sal_uInt8) 0 + << (sal_uInt32) 0; } } } diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index db3cf29b881a..a470bcb3375f 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2051,6 +2051,8 @@ String ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aStr, aRetVal ) ) { aRetVal = INetURLObject( aRetVal ).GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); + }else{ + aRetVal = aStr; } } } |