diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-08-12 08:03:34 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-08-12 08:03:34 +0000 |
| commit | 1b17427d0076e4d826cec916d33619f4c5d40ffa (patch) | |
| tree | 9b4425deee2de4182a2820240ba3198d333ad31f /svx | |
| parent | 022e59cac656d07cd90648d5315e1397e142fa2d (diff) | |
INTEGRATION: CWS jmf2 (1.28.642); FILE MERGED
2004/07/26 14:44:24 ka 1.28.642.1: #i3316#: media support for Gallery
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index bec568479ed7..0882412dd3ba 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -2,9 +2,9 @@ * * $RCSfile: galtheme.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: hr $ $Date: 2003-03-27 15:03:03 $ + * last change: $Author: obo $ $Date: 2004-08-12 09:03:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,6 +76,7 @@ #include <vcl/cvtgrf.hxx> #include <svtools/itempool.hxx> #include <sfx2/docfile.hxx> +#include <avmedia/mediawindow.hxx> #include "svdograf.hxx" #include "fmpage.hxx" #include "codec.hxx" @@ -1160,7 +1161,7 @@ BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos ) else pNewObj = (SgaObject*) new SgaObjectBmp( aGraphic, rURL, aFormat ); } - else if( GalleryIsSoundFile( rURL ) ) + else if( ::avmedia::MediaWindow::isMediaURL( rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) ) pNewObj = (SgaObject*) new SgaObjectSound( rURL ); if( pNewObj && InsertObject( *pNewObj, nInsertPos ) ) |