diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2012-03-05 19:09:45 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2012-03-05 19:11:04 +0530 |
| commit | d082cb2060bbfab7d630b63423b90e449b36150f (patch) | |
| tree | 4798cef4ad3073932e2103f79fa2197188bb13bd /oox | |
| parent | Convert ImplPropertyTable from tools/table.hxx to std::map (diff) | |
| download | core-d082cb2060bbfab7d630b63423b90e449b36150f.tar.gz core-d082cb2060bbfab7d630b63423b90e449b36150f.zip | |
n747499: Wav/Audio files import - stub.
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/oox/drawingml/fillproperties.hxx | 4 | ||||
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 4 | ||||
| -rw-r--r-- | oox/source/drawingml/graphicshapecontext.cxx | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/oox/inc/oox/drawingml/fillproperties.hxx b/oox/inc/oox/drawingml/fillproperties.hxx index 9f7c1541172f..b528eaeb4cb5 100644 --- a/oox/inc/oox/drawingml/fillproperties.hxx +++ b/oox/inc/oox/drawingml/fillproperties.hxx @@ -34,6 +34,7 @@ #include <com/sun/star/geometry/IntegerRectangle2D.hpp> #include "oox/drawingml/color.hxx" #include "oox/helper/helper.hxx" +#include "oox/drawingml/embeddedwavaudiofile.hxx" namespace oox { class GraphicHelper; @@ -135,7 +136,8 @@ struct FillProperties struct GraphicProperties { - BlipFillProperties maBlipProps; /// Properties for the graphic. + BlipFillProperties maBlipProps; /// Properties for the graphic. + EmbeddedWAVAudioFile maAudio; /// Audio file details /** Overwrites all members that are explicitly set in rSourceProps. */ void assignUsed( const GraphicProperties& rSourceProps ); diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index ad6cf4b112c7..0a49985c732c 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -444,6 +444,10 @@ void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelpe sal_Int16 nContrast = getLimitedValue< sal_Int16, sal_Int32 >( maBlipProps.moContrast.get( 0 ) / PER_PERCENT, -100, 100 ); if( nContrast != 0 ) rPropMap[ PROP_AdjustContrast ] <<= nContrast; + + // TODO: Audio content, yet to be implemented + if( !maAudio.msEmbed.isEmpty() ) + rPropMap[ PROP_Sound ] <<= maAudio.msEmbed; } // ============================================================================ diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index 016fbf3af38a..f01854c77103 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -76,6 +76,9 @@ Reference< XFastContextHandler > GraphicShapeContext::createFastChildContext( sa case XML_blipFill: xRet.set( new BlipFillContext( *this, xAttribs, mpShapePtr->getGraphicProperties().maBlipProps ) ); break; + case XML_wavAudioFile: + getEmbeddedWAVAudioFile( getRelations(), xAttribs, mpShapePtr->getGraphicProperties().maAudio ); + break; } if ((getNamespace( aElementToken ) == NMSP_vml) && mpShapePtr) |